Commit Graph

539 Commits

Author SHA1 Message Date
FanLian
05cfde1e8d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-21 17:35:37 +08:00
alex
fbabad9a5e 1 2023-06-21 17:35:27 +08:00
FanLian
6dcacc38e5 复用载具更换类,修改PDA投料 2023-06-21 17:34:51 +08:00
alex
506daed631 删除注释代码 2023-06-21 17:24:09 +08:00
FanLian
41c63357cc Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-21 17:20:27 +08:00
FanLian
f71fba07d0 复用载具更换类 2023-06-21 17:20:22 +08:00
zhoukeda
e563920a39 生产bom工序表添加工艺路线子表id,esop 2023-06-21 17:19:27 +08:00
alex
eb0909fd28 1 2023-06-21 17:06:12 +08:00
alex
9fb10e2c76 载具更换时,将modify_id,modify_time 置空 2023-06-21 17:06:00 +08:00
alex
4c04769a3f 将数量的数据类型全部改为decimal 2023-06-21 16:30:37 +08:00
alex
03c9911e00 1 2023-06-21 16:24:29 +08:00
alex
eff0778780 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-21 16:17:56 +08:00
alex
4efafd2f34 wms_temp_code codeqty改为barcode_qty 2023-06-21 16:17:51 +08:00
FanLian
8d5ee4c0d7 修改注释 2023-06-21 16:15:29 +08:00
FanLian
1d7dbe3b1a PDA绑定和PDA载具更换修改 2023-06-21 16:06:55 +08:00
FanLian
f056b88938 载具更换增加create 2023-06-21 15:56:38 +08:00
FanLian
ad40b89ddb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-21 15:28:48 +08:00
FanLian
61c56fdb14 更改PDA载具绑定,解绑 2023-06-21 15:28:43 +08:00
alex
3817c5ada4 1 2023-06-21 15:15:37 +08:00
alex
fcb3a321ae 1 2023-06-21 14:01:54 +08:00
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
qianjiawei
4c02911d55 1 2023-06-21 13:35:51 +08:00
FanLian
8808b48e78 载具解绑修改 2023-06-21 11:49:24 +08:00
taomin0419
e768d559e2 1 2023-06-21 11:43:54 +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
zhoukeda
1e555f372f bug 2023-06-21 11:17:32 +08:00
zhoukeda
c4434ce477 Merge remote-tracking branch 'origin/dev' into dev 2023-06-21 10:21:26 +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
zhoukeda
785102ddab bug 2023-06-21 10:21:17 +08:00
alex
798abfe5b0 生成预任务时,新增任务属性逻辑判断 2023-06-21 10:21:15 +08:00
FanLian
efb68b9ad7 修改loc 2023-06-21 09:41:33 +08:00
alex
c2badd9a44 1 2023-06-21 09:12:12 +08:00
alex
cbcdd70877 1 2023-06-21 09:12:02 +08:00
alex
4b8f14d215 1 2023-06-21 09:11:33 +08:00
FanLian
9744b34a70 1 2023-06-21 08:50:22 +08:00
FanLian
d0e4eade13 0 2023-06-21 08:44:41 +08:00
FanLian
0bda809ac0 1 2023-06-21 08:43:28 +08:00
FanLian
5064f816f6 1 2023-06-21 08:42:18 +08:00
FanLian
b14ca02b7f 1 2023-06-21 08:42:00 +08:00
taomin0419
3485b72044 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-21 08:37:56 +08:00
taomin0419
1413f2e464 返回报错处理 2023-06-21 08:37:51 +08:00
alex
c84459abe3 1 2023-06-20 20:20:07 +08:00
alex
536711a695 1 2023-06-20 20:19:22 +08:00
alex
32d360d774 1 2023-06-20 20:19:08 +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
9eca3d558e 1 2023-06-20 20:11:26 +08:00
FanLian
adf90ce7e1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-20 20:10:39 +08:00