zhoukeda
|
1fc3469fad
|
齐套接口返回成功后再操作数据库，生产工单列表优化，提报完工数不能大于任务单数 完成后修改状态
|
2023-07-21 17:40:42 +08:00 |
|
zhoukeda
|
60d9f17017
|
回滚生产入库状态
|
2023-07-21 17:10:30 +08:00 |
|
zhoukeda
|
8a1ce002fb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-21 17:09:09 +08:00 |
|
zhoukeda
|
2141a1bedb
|
修改生产入库状态描述
|
2023-07-21 17:08:20 +08:00 |
|
zhoukeda
|
9802bea65a
|
生产入库状态修改
|
2023-07-21 17:06:51 +08:00 |
|
qianjiawei
|
42c57ed97f
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 17:02:55 +08:00 |
|
qianjiawei
|
470ae8e8f6
|
1
|
2023-07-21 17:02:50 +08:00 |
|
alex
|
c4ffd8e53c
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 16:56:10 +08:00 |
|
alex
|
878d012aa8
|
1
|
2023-07-21 16:56:07 +08:00 |
|
FanLian
|
331eeb0320
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 16:55:45 +08:00 |
|
FanLian
|
5a050022e3
|
载具查询返回逻辑更改
|
2023-07-21 16:55:40 +08:00 |
|
qianjiawei
|
bc529685e0
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 16:50:11 +08:00 |
|
qianjiawei
|
c73e1efb7e
|
1
|
2023-07-21 16:50:05 +08:00 |
|
zhoukeda
|
d6e7514abc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-21 16:47:42 +08:00 |
|
zhoukeda
|
4c2cef5fe6
|
mes物料签收后调用wms载具签收接口
|
2023-07-21 16:47:32 +08:00 |
|
FanLian
|
00d525a6e4
|
签收逻辑更改
|
2023-07-21 16:27:07 +08:00 |
|
FanLian
|
425d662c2c
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 16:04:01 +08:00 |
|
FanLian
|
c602f12eec
|
齐套出库单缺少location_id
|
2023-07-21 16:03:55 +08:00 |
|
qianjiawei
|
803c2edeba
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 15:16:29 +08:00 |
|
qianjiawei
|
9b779d5407
|
1
|
2023-07-21 15:16:22 +08:00 |
|
alex
|
bd4157609a
|
解决bug
|
2023-07-21 14:58:58 +08:00 |
|
alex
|
0cb51f68b5
|
1
|
2023-07-21 14:57:44 +08:00 |
|
FanLian
|
6e328db737
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 14:54:49 +08:00 |
|
FanLian
|
8ac457c339
|
1
|
2023-07-21 14:54:43 +08:00 |
|
alex
|
3dbfb15ac3
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 14:17:29 +08:00 |
|
alex
|
ddb5f7c826
|
wms 通用函数预任务执行，给任务链组号赋值
|
2023-07-21 14:17:23 +08:00 |
|
FanLian
|
9bf342031b
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-21 14:17:13 +08:00 |
|
FanLian
|
843a3abeda
|
1
|
2023-07-21 14:17:07 +08:00 |
|
FanLian
|
87d4cb949b
|
载具清空
|
2023-07-21 14:16:57 +08:00 |
|
zhoukeda
|
9b14c845e6
|
齐套出库
|
2023-07-21 13:29:06 +08:00 |
|
alex
|
cba5adf5f3
|
齐套搭配方案，查询接口代码调整
|
2023-07-21 10:31:19 +08:00 |
|
FanLian
|
7bb60e3018
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 17:59:57 +08:00 |
|
FanLian
|
f4134375f6
|
bug
|
2023-07-20 17:59:52 +08:00 |
|
qianjiawei
|
e22f7f277e
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 17:36:35 +08:00 |
|
qianjiawei
|
cb5deef407
|
1
|
2023-07-20 17:36:28 +08:00 |
|
alex
|
1afc6f6039
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 15:50:37 +08:00 |
|
alex
|
e67beb20f7
|
调整齐套出库，拼接查询表达式代码
|
2023-07-20 15:50:33 +08:00 |
|
FanLian
|
70b78d9756
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 15:49:20 +08:00 |
|
FanLian
|
210a929685
|
齐套分拣表达式错误修改
|
2023-07-20 15:49:15 +08:00 |
|
qianjiawei
|
d05e71ffed
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 15:45:26 +08:00 |
|
qianjiawei
|
f0e415a3dd
|
1
|
2023-07-20 15:45:20 +08:00 |
|
FanLian
|
75f7d51424
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 15:07:03 +08:00 |
|
FanLian
|
473059adda
|
MES生产入库接口bug
|
2023-07-20 15:06:56 +08:00 |
|
alex
|
d1ee658d13
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 14:42:37 +08:00 |
|
alex
|
bf76a84621
|
1、解决在线开发明细最后一条删除不了的bug
2、解决在线开发明细新增时报主键重复的bug
|
2023-07-20 14:42:31 +08:00 |
|
zhoukeda
|
818e259205
|
调wms接口返回成功后再操作数据库
|
2023-07-20 14:06:35 +08:00 |
|
zhoukeda
|
716c1f5d14
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-20 14:04:29 +08:00 |
|
zhoukeda
|
74b13dcfbd
|
生产排产算预计结束时间
|
2023-07-20 14:04:21 +08:00 |
|
alex
|
46e280bf4c
|
1
|
2023-07-20 10:37:45 +08:00 |
|
alex
|
7cc193c978
|
调整Mes->Wms 出库申请接口，carry_id为空的bug
|
2023-07-20 09:53:20 +08:00 |
|