Commit Graph

901 Commits

Author SHA1 Message Date
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
shilixia 561d712641 xial 2021-12-29 14:56:30 +08:00
caoqianming b5fdd13343 前端调整 2021-12-29 14:51:39 +08:00
caoqianming 445bed8e65 更改main_product为product 2021-12-29 14:48:06 +08:00
caoqianming a5af3cd71d main_count统一为count 2021-12-29 14:29:35 +08:00
caoqianming cede23d7e2 srm gantt增加product字段 2021-12-29 14:21:31 +08:00
caoqianming c24e659e0e production_plan state字段以及增加军检完成 2021-12-29 14:09:25 +08:00
shilixia 6e4914b6c8 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-29 14:02:05 +08:00
shilixia 8896cbd718 xiala 2021-12-29 14:01:54 +08:00
caoqianming c596e79350 genplan atomic 2021-12-29 10:16:54 +08:00
caoqianming 8a3de0accc update_process_json 2021-12-29 10:12:45 +08:00
caoqianming 3c474ea805 update_process_json 2021-12-29 10:10:33 +08:00
caoqianming d87ba48526 返工返修 工单 retest_result字段 2021-12-29 10:07:08 +08:00
caoqianming 644f78a29e Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-29 09:17:13 +08:00
caoqianming 8563a0c7f9 pm相关表增加count_notok字段, update_wproduct_log 2021-12-29 09:17:04 +08:00
shijing 95a9fa86dc Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-28 17:07:22 +08:00
shijing d5c3e627b4 1228 2021-12-28 17:07:12 +08:00
caoqianming 0b989f79b1 根据产品日志更新生产进度 2021-12-28 15:56:50 +08:00
caoqianming d62a09a00c 同步wpm数据库 2021-12-28 15:48:54 +08:00
caoqianming 004030e9df 根据产品变动日志更新生产进度 2021-12-28 15:37:29 +08:00
caoqianming b76eeefe37 增加wproduct日志表,增加production_plan的查询条件 2021-12-28 14:31:59 +08:00