 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 |
|
caoqianming
|
9b832719f5
|
执行操作决定bug
|
2021-12-28 10:49:17 +08:00 |
|
caoqianming
|
743b58ab0f
|
bug
|
2021-12-28 10:35:36 +08:00 |
|
caoqianming
|
10525639c4
|
wpm signals 执行操作决定
|
2021-12-28 10:33:39 +08:00 |
|
caoqianming
|
66e31ae4f2
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2021-12-28 10:27:08 +08:00 |
|
caoqianming
|
acfe00480e
|
生产计划detail接口
|
2021-12-28 10:27:00 +08:00 |
|
shijing
|
04f1521939
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2021-12-27 17:10:06 +08:00 |
|
shijing
|
90f02fd7bb
|
sssss
|
2021-12-27 17:09:56 +08:00 |
|
caoqianming
|
847e776568
|
update_plan_process_json bug
|
2021-12-27 15:53:32 +08:00 |
|
caoqianming
|
c9219ea495
|
bug修改
|
2021-12-27 15:52:05 +08:00 |
|
caoqianming
|
756f2efc56
|
wpm update 不触发singal/ pm process_json字段
|
2021-12-27 15:49:32 +08:00 |
|
caoqianming
|
15812bf048
|
更新计划按工序字段统计
|
2021-12-27 14:56:55 +08:00 |
|
caoqianming
|
c8c9cd4554
|
发起不合格审理单
|
2021-12-27 14:23:05 +08:00 |
|
caoqianming
|
7713cc045d
|
同步数据库
|
2021-12-27 13:18:30 +08:00 |
|
caoqianming
|
6ce9546c41
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2021-12-27 10:59:47 +08:00 |
|
caoqianming
|
6afd62dc93
|
wf ticket detail bug
|
2021-12-27 10:59:40 +08:00 |
|
shijing
|
ce635ff949
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2021-12-27 10:11:22 +08:00 |
|
shijing
|
71a0858126
|
retrial
|
2021-12-27 10:11:11 +08:00 |
|
caoqianming
|
6a1641115f
|
同步数据库
|
2021-12-27 09:49:23 +08:00 |
|
caoqianming
|
811fe24fc7
|
返工返修执行操作决定
|
2021-12-27 09:45:23 +08:00 |
|
caoqianming
|
6682d43022
|
自定义allfield
|
2021-12-24 14:37:59 +08:00 |
|
caoqianming
|
7c073a54cb
|
to_internal value fieldchoice bug
|
2021-12-24 14:25:56 +08:00 |
|
caoqianming
|
a5062a375e
|
更新动态产品表selled
|
2021-12-24 13:52:18 +08:00 |
|
caoqianming
|
78aea31725
|
field choice serializer write only
|
2021-12-24 13:49:52 +08:00 |