Commit Graph

70 Commits

Author SHA1 Message Date
alex
ceed112536 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-21 13:49:54 +08:00
alex
dc4b2283c3 打印条码,代码逻辑调整 2023-06-21 13:49:49 +08:00
taomin0419
672596d44f 1 2023-06-21 11:43:46 +08:00
taomin0419
59abac8ccd PDA一般入库修改,PC载具绑定,PDAFeeding bug修改 2023-06-21 11:42:18 +08:00
alex
1183ce5a15 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-21 10:21:20 +08:00
alex
798abfe5b0 生成预任务时,新增任务属性逻辑判断 2023-06-21 10:21:15 +08:00
FanLian
efb68b9ad7 修改loc 2023-06-21 09:41:33 +08:00
alex
4b8f14d215 1 2023-06-21 09:11:33 +08:00
taomin0419
4ad5cca7ab Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-20 20:18:30 +08:00
taomin0419
99d89cc12d 入库申请代码调整,WmsInstockD line_status改为string类型 2023-06-20 20:18:25 +08:00
FanLian
ee2d6f7c6f 1 2023-06-20 17:29:27 +08:00
alex
88eacad38a 载具更换接口失效问题调整 2023-06-20 16:59:27 +08:00
FanLian
d20bb1d0f5 更换moduleID 2023-06-20 16:33:35 +08:00
hlb
d082c464c9 修改空载具出库回更状态 2023-06-20 14:27:02 +08:00
taomin0419
fda995e172 1 2023-06-20 13:39:45 +08:00
taomin0419
f616141df9 添加PDA寄存入库 2023-06-20 13:38:29 +08:00
alex
a52a51dc4b 1 2023-06-20 11:52:58 +08:00
alex
3debbe81e5 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-20 11:51:18 +08:00
alex
95997b1487 Wms出库申请模块代码提交 2023-06-20 11:51:15 +08:00
hlb
c8e1423da9 预任务申请 所有出库任务 增加是否签收判断 2023-06-20 11:39:36 +08:00
alex
c33feb8b7f 调整任务完成,代码逻辑 2023-06-19 16:55:33 +08:00
alex
8bcc7958c9 调整,wms通用逻辑代码 2023-06-19 15:01:37 +08:00
alex
076cd0c641 空载具出库代码调整 2023-06-19 08:44:06 +08:00
alex
ba8a034be7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 17:11:53 +08:00
alex
168d2220ca 入库申请模块代码提交 2023-06-16 17:11:50 +08:00
zhoukeda
c5c835ef93 Merge remote-tracking branch 'origin/dev' into dev 2023-06-16 17:00:02 +08:00
zhoukeda
3cb377cb86 生产投料 2023-06-16 16:59:53 +08:00
alex
6c57264782 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 15:10:16 +08:00
alex
034d5746de wms扫码入库逻辑代码提交 2023-06-16 15:10:11 +08:00
zhoukeda
3d60c3b912 bug 2023-06-16 14:38:34 +08:00
FanLian
78f726d139 载具解绑 2023-06-16 13:48:36 +08:00
FanLian
17ab663e10 更新载具绑定,修改载具更换 2023-06-16 11:24:52 +08:00
alex
c5ed02772d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 08:58:21 +08:00
alex
489f01cf7f 载具入库将PreTaskId改为RequireId 2023-06-16 08:58:16 +08:00
FanLian
37e0177229 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 08:55:22 +08:00
FanLian
22f80ca26e 1 2023-06-16 08:55:16 +08:00
hlb
04f2d5c551 1 2023-06-15 19:52:22 +08:00
alex
50dc30f76a 1 2023-06-15 19:36:41 +08:00
alex
64c32eaff8 1 2023-06-15 18:45:22 +08:00
alex
e7f2337eeb wms调整插入操作记录逻辑代码 2023-06-15 18:44:45 +08:00
hlb
c14cd8e6af 异常取消 2023-06-15 17:35:13 +08:00
hlb
3000b395d2 增加任务已取消状态 2023-06-15 16:52:27 +08:00
alex
31a5ad8b1e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 16:21:15 +08:00
alex
06aeced8af 扫码打印接口提交 2023-06-15 16:21:11 +08:00
hlb
06e9472faf 增加PDA 库内 2023-06-15 16:19:48 +08:00
alex
7d3ada5145 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 14:48:59 +08:00
alex
ea0875ab43 1 2023-06-15 14:48:55 +08:00
hlb
83d46baaa0 更新业务类型,任务类型静态数据 2023-06-15 12:02:49 +08:00
FanLian
ecfb74b0e7 1 2023-06-15 11:13:57 +08:00
FanLian
67b7631ad1 cssaasdadsad 2023-06-15 11:11:07 +08:00