Commit Graph

1827 Commits

Author SHA1 Message Date
qianjiawei
296c618bf5 11 2023-12-18 17:17:48 +08:00
yang.lee
dc784077f0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-17 20:30:41 +08:00
yang.lee
0888719b39 入库申请,新增条码打印功能 2023-12-17 20:30:24 +08:00
qianjiawei
afaf05e5a4 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-15 16:37:26 +08:00
qianjiawei
0cca20b0ff ctu存放 2023-12-15 16:37:13 +08:00
yang.lee
1a5e38b9d9 任务预任务,新增批量删除工嗯呢 2023-12-15 10:50:53 +08:00
yang.lee
6ce793ea5c 1 2023-12-15 10:00:19 +08:00
yang.lee
2f92764cbe 解决冲突代码 2023-12-15 09:55:25 +08:00
yang.lee
838ad24660 电梯代码调整 2023-12-15 09:50:54 +08:00
qianjiawei
690167b1a2 ctu 2023-12-15 09:49:44 +08:00
qianjiawei
24c74d2888 ctu 2023-12-14 09:33:04 +08:00
yang.lee
c23134729e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-13 14:05:57 +08:00
yang.lee
89e7f0dd50 空载具入库,获取目标库位集合代码还原,用于测试CTU 2023-12-13 14:05:44 +08:00
qianjiawei
30fda98af2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-12 15:23:37 +08:00
qianjiawei
5263874f6b ctu 2023-12-12 15:23:29 +08:00
yang.lee
886f3a1661 解决冲突 2023-12-12 14:29:34 +08:00
yang.lee
fbdc7de3b9 电梯代码优化 2023-12-12 14:28:38 +08:00
qianjiawei
581242f547 wms接入redis 2023-12-12 13:56:55 +08:00
qianjiawei
8712508b84 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-11 17:30:48 +08:00
qianjiawei
d4d62c3e09 erp接口 2023-12-11 17:30:42 +08:00
yang.lee
5fde13ece9 库位导入功能代码调整 2023-12-11 15:06:43 +08:00
yang.lee
d61989417f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-11 13:53:04 +08:00
yang.lee
0dd220ee4f 1、库位导入代码调整
2、电梯通信代码调整
2023-12-11 13:52:54 +08:00
tao.zhang
67206206e4 ceishi 2023-12-11 09:36:29 +08:00
tao.zhang
7a9820e7b7 1 2023-12-11 09:35:41 +08:00
tao.zhang
08d0385438 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-11 09:34:26 +08:00
tao.zhang
5012f1b08d 1 2023-12-11 09:34:16 +08:00
zhou keda
85884c800a Merge remote-tracking branch 'origin/dev' into dev 2023-12-11 09:28:21 +08:00
zhou keda
e03fda5ae1 erp物料新增保存接口 2023-12-11 09:28:12 +08:00
tao.zhang
f2f3813494 测试服务报错原因 2023-12-11 09:21:16 +08:00
qianjiawei
3a7a0dd572 ERP对接WMS接口 2023-12-08 17:05:10 +08:00
zhou keda
ad65e9fd0d bug 2023-12-06 16:28:53 +08:00
zhou keda
f5c3392819 Merge remote-tracking branch 'origin/dev' into dev 2023-12-06 14:32:45 +08:00
zhou keda
71ff32b909 bug 2023-12-06 14:32:33 +08:00
yang.lee
c8d5847941 1 2023-12-06 11:49:21 +08:00
yang.lee
7f03f1ca26 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-06 11:48:09 +08:00
yang.lee
104462c352 去除日志分割线,看着眼花 2023-12-06 11:48:00 +08:00
qianjiawei
5c099f7ee9 设备保养pda接口修改 2023-12-06 11:38:39 +08:00
zhoukeda
1ee00e692a 1 2023-12-05 14:14:58 +08:00
zhoukeda
a07768b4af Merge remote-tracking branch 'origin/dev' into dev 2023-12-04 17:01:48 +08:00
zhoukeda
3ace768283 1 2023-12-04 17:01:38 +08:00
yang.lee
6055f28734 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-04 15:53:54 +08:00
yang.lee
7b6920a844 修改打印载具条码份数默认值 2023-12-04 15:53:45 +08:00
hlb
e9f773e5e5 在库物料导入 2023-12-02 22:05:35 +08:00
yang.lee
2d47e18d45 1 2023-12-01 22:42:28 +08:00
yang.lee
e5150d209e 1 2023-12-01 22:42:15 +08:00
hlb
9b811fcfaf cs 2023-12-01 22:37:39 +08:00
yang.lee
08402d0679 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-01 22:16:49 +08:00
yang.lee
33e4028853 1、调整电梯逻辑代码
2、新增内部测试类
2023-12-01 22:16:39 +08:00
hlb
8070b99cd3 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-01 21:54:45 +08:00