Commit Graph

1807 Commits

Author SHA1 Message Date
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
hlb
f8f3f29a2a 去除规格和箱号条件 2023-12-01 21:54:29 +08:00
qianjiawei
f74d54543f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-01 16:21:29 +08:00
qianjiawei
fdefdeba97 模具保养 2023-12-01 16:21:23 +08:00
zhoukeda
72fc5f09b7 Merge remote-tracking branch 'origin/dev' into dev 2023-11-30 16:59:12 +08:00
zhoukeda
061cc493d4 andon 2023-11-30 16:59:03 +08:00
qianjiawei
955c47da6f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-30 16:31:05 +08:00
qianjiawei
defbe1243c 模具维修 2023-11-30 16:30:52 +08:00
yang.lee
7033db95e6 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-30 15:26:00 +08:00
yang.lee
08888ac4c2 wms电梯设定,新增开关电梯控制接口 2023-11-30 15:25:44 +08:00
qianjiawei
325e1c8f07 设备保养点巡检复核增加附件上传 2023-11-30 14:02:58 +08:00
qianjiawei
297f90bd0c 备件领用bug 2023-11-29 16:56:59 +08:00
qianjiawei
ba7d9813b4 设备入库领用 2023-11-29 11:44:01 +08:00
qianjiawei
fc7bbf7496 1 2023-11-28 16:53:35 +08:00
qianjiawei
61e476771f 设备维修 2023-11-28 14:32:10 +08:00
qianjiawei
2389ccbe45 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-28 14:24:26 +08:00
qianjiawei
c36679d418 设备点巡检保养维修 2023-11-28 14:24:20 +08:00
hlb
ddba5735cf Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-28 11:41:48 +08:00
hlb
18694b48a0 增加规格型号和箱号 2023-11-28 11:41:32 +08:00
yang.lee
0fbc485cc3 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-28 11:27:32 +08:00
yang.lee
92397afcc0 调整函数,支持按份数批量打印 2023-11-28 11:27:23 +08:00