Commit Graph

771 Commits

Author SHA1 Message Date
caoqianming 90ddb45efe wf 自定义deptSelect标签 2022-01-06 09:39:30 +08:00
caoqianming 19c3a9579d Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-06 09:34:29 +08:00
caoqianming ab0c9e226f 修改消耗与产出不一致的bug 2022-01-06 09:34:21 +08:00
shilixia f0a3427422 ceshi 2022-01-06 08:40:42 +08:00
shilixia 9fd1e20008 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-06 08:34:53 +08:00
shilixia c8589cb158 xialiao 2022-01-06 08:34:46 +08:00
caoqianming a1e1d0b9b4 updatecuttinglist bug 2022-01-05 09:35:51 +08:00
caoqianming 9ad37f0cef 下料清单queryset 2022-01-05 09:26:50 +08:00
caoqianming ccd2d2e375 下料清单完成 2022-01-05 09:20:45 +08:00
caoqianming bd6286931f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-04 17:06:24 +08:00
caoqianming 262895d6e6 update_cutting_list_with_operation bug 2022-01-04 17:06:12 +08:00
shijing da1bbf36c8 0104 2022-01-04 17:02:55 +08:00
shijing 9fa9b34968 0104 2022-01-04 17:01:20 +08:00
caoqianming bf711ec9c2 update_cutting_list_with_operation bug 2022-01-04 16:50:37 +08:00
caoqianming 7370544395 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-04 16:43:42 +08:00
caoqianming 4538c32834 下料清单初步完成 2022-01-04 16:43:32 +08:00
shilixia 1bc22240b7 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-04 09:44:45 +08:00
shilixia 3b1fefc696 jianyantianjiaqiyong 2022-01-04 09:44:39 +08:00
caoqianming 8f1746f8a6 techdoc 增加enabled查询条件 2022-01-04 09:22:54 +08:00
caoqianming 6b5b5e9911 不合格审理返回decision_2 bug 2021-12-31 16:44:53 +08:00
shijing 801b41221e Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-31 13:20:53 +08:00
shijing c47b65a625 dashBoard 2021-12-31 13:20:45 +08:00
shilixia ba2b0ad4a6 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-31 13:19:27 +08:00
shilixia a0186dbdbb guochengjianyan 2021-12-31 13:19:21 +08:00
caoqianming a1c86557f0 下料清单接口 2021-12-31 11:31:01 +08:00
caoqianming 7861b5419e wproductticket list返回增加order product 2021-12-31 10:45:21 +08:00
caoqianming 895ffbe394 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-31 10:26:15 +08:00
caoqianming e15ad98c92 操作提交后更新进度 2021-12-31 10:26:07 +08:00
shilixia d031f16be7 ziliangguanli 2021-12-31 09:05:00 +08:00
shilixia fa867475c3 xial 2021-12-31 08:42:06 +08:00
shijing f44b416070 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-30 17:13:46 +08:00
shijing 319b228508 1230 2021-12-30 17:13:32 +08:00
caoqianming 2ad60626e5 不合格品审理工单列表接口 2021-12-30 16:35:19 +08:00
shilixia d3401e3fe9 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-30 14:17:37 +08:00
shilixia 5c4c5c7688 xiala 2021-12-30 14:17:29 +08:00
caoqianming 42fa7022de 更新日志 2021-12-30 10:37:33 +08:00
caoqianming 2fe8e5814c operation type div 添加日志更新进度 2021-12-30 10:35:18 +08:00
caoqianming 333e08b223 补全日志 2021-12-30 10:28:05 +08:00
caoqianming 6e80643db1 pick_half bug 2021-12-30 09:41:26 +08:00
caoqianming bccf495ebd update_plan_process_json 2021-12-30 09:37:43 +08:00
caoqianming 6d2fa1d5af update_plan_process_json 2021-12-30 09:35:23 +08:00
caoqianming 846ce83a91 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-30 09:32:55 +08:00
caoqianming 2e5771dc6f add_wproduct_flow_log 2021-12-30 09:32:47 +08:00
shijing e2ee06e21b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-29 17:02:30 +08:00
shijing 3ce616de61 1229 2021-12-29 17:02:21 +08:00
caoqianming ba2e583b26 fix conflict 2021-12-29 15:28:51 +08:00
caoqianming 17b7345e95 前端修改 2021-12-29 15:26:17 +08:00
caoqianming 6e7246dd71 前端修改 2021-12-29 15:25:28 +08:00
caoqianming 723b34a87f 增加product_ srm serializer 2021-12-29 15:24:39 +08:00
shilixia 0ddff915b8 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-29 14:56:38 +08:00