Commit Graph

988 Commits

Author SHA1 Message Date
zhoukeda
6ec90d3dbe 物料签收添加子载具,扫码投料bug 2023-07-26 15:19:09 +08:00
zhoukeda
acf1d9f94a 注塑任务单以pps开头 注塑挤出排产已排产数量bug 2023-07-26 10:03:09 +08:00
zhoukeda
134c57245c 扫码投料bug 2023-07-26 09:33:44 +08:00
zhoukeda
b727fdb574 Merge remote-tracking branch 'origin/dev' into dev 2023-07-26 09:05:33 +08:00
zhoukeda
29c033eae2 排产算预计结束时间bug 2023-07-26 09:05:25 +08:00
alex
9a5b9d8f9d 优化更新空载具接口及函数 2023-07-26 09:04:02 +08:00
alex
9b324ec606 wmsCarryService返回值修改 2023-07-25 13:45:02 +08:00
alex
08694f7845 1 2023-07-25 10:18:35 +08:00
alex
efa35b2f1a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-25 10:16:51 +08:00
alex
a8646258ac 1 2023-07-25 10:16:48 +08:00
alex
0f26a792b4 优化生成任务链单号,代码将4层循环优化为3层 2023-07-25 10:16:41 +08:00
zhoukeda
ed7f202487 Merge remote-tracking branch 'origin/dev' into dev 2023-07-25 09:32:08 +08:00
zhoukeda
c55bb77b98 任务单中断操作状态由关闭改为暂停 2023-07-25 09:32:01 +08:00
FanLian
1a01ea378e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-25 09:25:48 +08:00
FanLian
e81550fd8f dijkstra算法修正 2023-07-25 09:25:37 +08:00
zhoukeda
9872642cc1 生产bom投入产出物料添加单位id 2023-07-25 09:08:19 +08:00
zhoukeda
b8180d941f 取消提报数量大于等于任务数改状态 2023-07-24 13:52:21 +08:00
zhoukeda
1b3d30d204 Merge remote-tracking branch 'origin/dev' into dev 2023-07-24 11:24:16 +08:00
zhoukeda
ee2e9ffc3d 增加完成校验,自检报废记录添加报废人 2023-07-24 11:24:08 +08:00
alex
89baed0d9a 1 2023-07-24 11:16:10 +08:00
alex
9621ccac0e 任务执行,代码逻辑优化 2023-07-24 11:15:55 +08:00
alex
fd2bbc465a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-24 10:03:50 +08:00
alex
c250cf01f8 优化齐套出库,更新空载具,并行处理逻辑 2023-07-24 10:03:40 +08:00
zhoukeda
9dcf772a08 Merge remote-tracking branch 'origin/dev' into dev 2023-07-24 09:09:30 +08:00
zhoukeda
b545b2df8e 暂停状态无法提报报废 2023-07-24 09:09:22 +08:00
alex
5e2bfc7ad1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-21 17:47:52 +08:00
alex
1dc37a61ba 预任务执行,任务链编号赋值代码优化 2023-07-21 17:47:48 +08:00
zhoukeda
978505557c 1 2023-07-21 17:41:46 +08:00
zhoukeda
17e510f480 Merge remote-tracking branch 'origin/dev' into dev 2023-07-21 17:40:49 +08:00
zhoukeda
1fc3469fad 齐套接口返回成功后再操作数据库,生产工单列表优化,提报完工数不能大于任务单数 完成后修改状态 2023-07-21 17:40:42 +08:00
alex
5538e3b897 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-21 17:35:16 +08:00
alex
f0624b0193 调整载具查询返回接口,子载具编号赋值逻辑 2023-07-21 17:35:11 +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