jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,248 Commits 134 Branches 0 Tags
06981fb894055ea2ac1d976361e6632b17fe3898
Commit Graph

4248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hujiaying
8cff3d8377 sf销售订单详情新增是否带料，带料尺寸，修改bfm分配工厂，sf接收订单生成销售订单新增两个字段，并修改订单详情及订单详情表单新增字段显示 2024-10-18 16:39:15 +08:00
guanhuan
b132771c92 辅助文件上传 2024-10-18 14:32:20 +08:00
马广威
cbaf0d79c1 Accept Merge Request #1422: (feature/制造功能优化 -> develop) 
Merge Request: 增加设备oee处获取数据的定时器

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1422?initial=true
 2024-10-18 10:18:28 +08:00
mgw
953d675dcf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-10-18 10:17:38 +08:00
mgw
182eb83090 暂时屏蔽24数据 2024-10-18 10:17:22 +08:00
mgw
67a607b053 增加设备oee处获取数据的定时器 2024-10-18 10:05:55 +08:00
guanhuan
00a04af94f 加工精度 2024-10-18 09:30:20 +08:00
禹翔辉
33d23c28b1 Accept Merge Request #1421: (feature/工单状态优化 -> develop) 
Merge Request: 处理制造订单、工单的状态计算方法没有触发的问题

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1421
 2024-10-18 09:21:43 +08:00
yuxianghui
571fb29482 Merge branch 'feature/用刀校验优化' into feature/工单状态优化 2024-10-18 09:14:39 +08:00
yuxianghui
1dae20e055 处理制造订单、工单的状态计算方法没有触发的问题 2024-10-18 09:13:34 +08:00
hujiaying
6be9d44572 Merge remote-tracking branch 'origin/develop' into feature/临时分支 2024-10-18 08:40:57 +08:00
mgw
8a459e7e90 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-10-17 17:54:59 +08:00
mgw
4c486e53aa 设备oee界面数据准备 2024-10-17 17:54:32 +08:00
yuxianghui
19509a3ce2 1 2024-10-17 17:54:08 +08:00
胡嘉莹
4d424e90d3 Accept Merge Request #1420: (feature/临时分支 -> develop) 
Merge Request: 修改生成完工入库提醒，订单发货提醒跳转到表单详情

Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1420?initial=true
 2024-10-17 17:49:26 +08:00
hujiaying
9bbf613bcb 修改生成完工入库提醒，订单发货提醒跳转到表单详情 2024-10-17 17:39:43 +08:00
guanhuan
cc40d479a9 加工精度同步 2024-10-17 17:20:51 +08:00
禹翔辉
f5ea0ec153 Accept Merge Request #1419: (feature/用刀校验优化 -> develop) 
Merge Request: 优化手动返工时，cnc用刀校验逻辑

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1419?initial=true
 2024-10-17 17:04:12 +08:00
yuxianghui
ea6c0f7d0b Merge branch 'feature/程序用刀校验优化' into feature/用刀校验优化 2024-10-17 17:02:17 +08:00
yuxianghui
763009a3c0 1、优化手动返工时，cnc用刀校验逻辑 2024-10-17 17:01:20 +08:00
guanhuan
cf34ac5bbc 辅助文件上传 2024-10-17 16:31:13 +08:00
禹翔辉
0faedd35d7 Accept Merge Request #1418: (feature/程序用刀校验优化 -> develop) 
Merge Request: 修改调用创建cam程序用刀计划方法的判断条件

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1418
 2024-10-17 16:01:42 +08:00
yuxianghui
135b97d4f8 1 2024-10-17 16:00:44 +08:00
yuxianghui
61f3aff768 Merge branch 'feature/制造订单状态优化_3' into feature/程序用刀校验优化 2024-10-17 15:52:06 +08:00
yuxianghui
9e369f0150 修改调用创建cam程序用刀计划方法的判断条件 2024-10-17 15:51:00 +08:00
杨金灵
16d50f5bf2 Accept Merge Request #1417: (feature/工作中心添加质检权限 -> develop) 
Merge Request: 工作中心添加质检权限

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1417?initial=true
 2024-10-17 15:40:23 +08:00
jinling.yang
80f0454996 工作中心添加质检权限 2024-10-17 15:37:08 +08:00
jinling.yang
9b9d811594 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-10-17 15:33:51 +08:00
jinling.yang
008ae20329 Merge branch 'feature/检测结果添加质检权限' into develop 2024-10-17 15:33:29 +08:00
杨金灵
80b3b4b0f7 Accept Merge Request #1416: (feature/检测结果添加质检权限 -> develop) 
Merge Request: 检测结果添加质检权限

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1416
 2024-10-17 15:26:29 +08:00
jinling.yang
d64b480496 检测结果添加质检权限 2024-10-17 15:25:13 +08:00
禹翔辉
854ec8da4e Accept Merge Request #1415: (feature/制造订单状态优化_3 -> develop) 
Merge Request: 1

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1415?initial=true
 2024-10-17 14:43:48 +08:00
yuxianghui
d25b871854 1 2024-10-17 14:42:35 +08:00
禹翔辉
37aafe7b30 Accept Merge Request #1414: (feature/制造订单状态优化_3 -> develop) 
Merge Request: 1、优化手动获取编程的接口，添加获取编程完成之后进行用刀校验；2、处理 权限问题-工单详情缺少【时间跟踪】tab；3、用刀校验方法添加日志

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1414
 2024-10-17 14:29:32 +08:00
yuxianghui
26910f7b15 Merge branch 'feature/制造订单状态优化_2' into feature/制造订单状态优化_3 2024-10-17 14:25:05 +08:00
杨金灵
3ea2acd46e Accept Merge Request #1413: (feature/修复工单定时器 -> develop) 
Merge Request: 修复工单定时器

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1413?initial=true
 2024-10-17 14:23:36 +08:00
yuxianghui
303462ba9c Merge branch 'feature/制造订单状态优化_1' into feature/制造订单状态优化_2 2024-10-17 14:22:59 +08:00
jinling.yang
53fad50af6 修复工单定时器 2024-10-17 14:22:43 +08:00
yuxianghui
1245323b9d 1、优化手动获取编程的接口，添加获取编程完成之后进行用刀校验；2、处理 权限问题-工单详情缺少【时间跟踪】tab；3、用刀校验方法添加日志 2024-10-17 14:22:09 +08:00
杨金灵
4d8e86cff3 Accept Merge Request #1412: (feature/还原代码 -> develop) 
Merge Request: 还原代码

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1412
 2024-10-17 14:08:18 +08:00
jinling.yang
7bc7d2059c 还原代码 2024-10-17 14:06:16 +08:00
jinling.yang
f9c209e85c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-10-17 13:47:40 +08:00
jinling.yang
6ae783387c Merge branch 'feature/修复加工质检' into develop 2024-10-17 13:47:18 +08:00
杨金灵
7c0202afc6 Accept Merge Request #1411: (feature/修复加工质检 -> develop) 
Merge Request: 修复加工质检

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1411?initial=true
 2024-10-17 13:47:00 +08:00
jinling.yang
9ad582612b 还原注释代码 2024-10-17 13:43:43 +08:00
jinling.yang
d1db917432 修复加工质检 2024-10-17 11:58:54 +08:00
杨金灵
847293385d Accept Merge Request #1410: (feature/还原代码 -> develop) 
Merge Request: 还原代码

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1410?initial=true
 2024-10-17 11:34:40 +08:00
jinling.yang
4e8eccfd0b 还原代码 2024-10-17 11:33:20 +08:00
jinling.yang
5cb5306471 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-10-17 11:19:28 +08:00
jinling.yang
9a5b45b969 Merge branch 'feature/加工质检添加权限' into develop 2024-10-17 11:19:04 +08:00