jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,827 Commits 134 Branches 31 Tags
23afbc14c936cc0744ed252eb32eb73e5c8b69aa
Commit Graph

127 Commits

Author SHA1 Message Date
yuxianghui
5b43cceb94 计划模块的【制造订单生产计划】页面菜单名称改为【CNC产线计划排程】 2024-12-04 11:56:38 +08:00
胡尧
9a9e47b4ff 解决精坯料计算精度问题，排程加上预留时间 2024-11-29 08:59:52 +08:00
胡尧
942aa469e3 修改排程逻辑 2024-11-28 15:21:54 +08:00
胡尧
d57cc59115 修改排程逻辑 2024-11-28 15:20:56 +08:00
胡尧
96171013d6 修改排程 2024-11-28 15:10:45 +08:00
胡尧
d4ba58b55a 修改排程单的问题 2024-11-28 10:17:03 +08:00
胡尧
087bb0e8fe 取消制造订单排程时，将其下所有子制造订单改为已排状态的逻辑 2024-11-26 11:51:09 +08:00
胡尧
fabcca1188 排程单过滤掉关联制造订单处于草稿跟工艺设计状态 2024-11-19 14:15:29 +08:00
胡尧
f99a35932f 修改坯料冗余 2024-11-19 11:56:49 +08:00
胡尧
73aa4af118 增加依赖 2024-11-18 10:54:48 +08:00
胡尧
bc0b8bdecb 增加坯料冗余量，调整坯料客供料的名称 2024-11-18 09:44:50 +08:00
胡尧
9410ca82db 解决冲突 2024-11-15 15:30:35 +08:00
胡尧
73c986cd50 增加制造类型字段，增加依赖 2024-11-15 15:29:04 +08:00
胡尧
153f599fe8 Accept Merge Request #1513: (feature/sale_order_route_pick -> develop) 
Merge Request: 给坯料模板增加按订单补给

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1513?initial=true
 2024-11-15 09:13:16 +08:00
胡尧
f6f9d14f0a 给坯料模板增加按订单补给 2024-11-15 09:12:34 +08:00
胡尧
00f986cdb5 Accept Merge Request #1511: (feature/sale_order_route_pick -> develop) 
Merge Request: 增加加工类型

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1511?initial=true
 2024-11-14 16:53:19 +08:00
胡尧
5dc5c814c8 增加加工类型 2024-11-14 16:52:58 +08:00
胡尧
c64ede58fd Accept Merge Request #1510: (feature/sale_order_route_pick -> develop) 
Merge Request: 增加是否线下加工日志

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1510?initial=true
 2024-11-14 16:36:46 +08:00
胡尧
6e17bb933f 增加是否线下加工日志 2024-11-14 16:36:02 +08:00
胡尧
cf7756f51e Accept Merge Request #1508: (feature/sale_order_route_pick -> develop) 
Merge Request: 增加制造类型

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1508?initial=true
 2024-11-14 15:15:22 +08:00
胡尧
a75269b3a3 增加制造类型 2024-11-14 15:14:57 +08:00
胡尧
6b184d7df3 Accept Merge Request #1507: (feature/sale_order_route_pick -> develop) 
Merge Request: 将数据初始化由产品辩题改为为模板

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1507?initial=true
 2024-11-14 15:04:50 +08:00
胡尧
daba7d5155 将数据初始化由产品辩题改为为模板 2024-11-14 15:02:11 +08:00
yuxianghui
7565094077 Merge branch 'feature/工单工序优化_y' into feature/单据页面优化 2024-11-13 13:40:25 +08:00
yuxianghui
ac2708404a 处理sf工厂单据页面优化需求 2024-11-13 13:39:41 +08:00
胡尧
d68a9249c6 解决冲突 2024-11-11 16:32:54 +08:00
yuxianghui
5dae0ea973 1、sf视图展示界面优化 2024-11-11 14:52:44 +08:00
胡尧
1b87a81a5a 多供货方式选择 2024-11-11 11:06:56 +08:00
胡尧
1467dbf88c 修改排程逻辑 2024-10-28 09:44:52 +08:00
胡尧
aa1353cf99 修改排程逻辑 2024-10-28 09:38:50 +08:00
胡尧
3f84972bfd 删除多余代码 2024-10-24 13:57:26 +08:00
胡尧
ed15958319 解决报错 2024-10-24 11:29:36 +08:00
胡尧
0b70447333 修改排程逻辑 2024-10-24 09:47:20 +08:00
胡尧
1026c0edd0 修改排程逻辑 2024-10-24 09:18:21 +08:00
胡尧
a28d20b3bf 修改排程逻辑 2024-10-23 15:30:05 +08:00
hujiaying
50bb50f5ab 修改计划排程，超过小时产能提示产线的小时产能以及超出的件数 2024-10-10 16:47:25 +08:00
胡尧
94f57629e5 增加空料架配送菜单权限 2024-10-09 17:23:03 +08:00
管欢
ec66ea76ba Accept Merge Request #1330: (feature/org_info_synchronous -> develop) 
Merge Request: 用户新增企业微信id

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1330
 2024-09-23 13:36:06 +08:00
guanhuan
56f1ba0f25 用户新增企业微信id 2024-09-20 14:24:50 +08:00
胡嘉莹
8946b44280 Accept Merge Request #1313: (feature/update_production_line -> develop) 
Merge Request: 修改计划排程，新增处理排程计划订单交货时间为null数据处理的方法

Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1313
 2024-09-18 17:44:45 +08:00
hujiaying
4acae01009 修改计划排程，新增处理排程计划订单交货时间为null数据处理的方法 2024-09-18 15:34:04 +08:00
胡嘉莹
8a9f6ab34f Accept Merge Request #1311: (feature/update_production_line -> 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/1311
 2024-09-18 14:14:50 +08:00
hujiaying
8aca6ce084 修改计划排程甘特图界面不显示已经排程的制造订单 2024-09-18 14:03:04 +08:00
胡嘉莹
fbce132173 Accept Merge Request #1308: (feature/update_production_line -> 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/1308
 2024-09-14 17:45:18 +08:00
hujiaying
7502792438 修改计划排程列表进入待排程的制造订单详情进行排程-报错 2024-09-14 17:26:24 +08:00
hujiaying
9efb13cf01 修改排程计划开始时间修改 2024-09-14 16:34:47 +08:00
胡嘉莹
85186f94f5 Accept Merge Request #1302: (feature/update_production_line -> develop) 
Merge Request: 优化计划开始时间默认往后延迟10分钟

Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1302
 2024-09-14 14:31:56 +08:00
hujiaying
f8a12b1fe3 优化计划开始时间默认往后延迟10分钟 2024-09-13 17:37:57 +08:00
mgw
f6a9c97e7f 优化产量部分 2024-09-11 08:51:01 +08:00
hujiaying
3ed338ed64 修改计划-生产订单列表只显示制造订单 2024-09-10 14:50:24 +08:00