Commit Graph

1321 Commits

Author SHA1 Message Date
majian
bb5edae74b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-19 15:29:47 +08:00
majian
ebf2ec825e 1 2024-09-19 15:29:36 +08:00
zhou keda
4b83ad62fc Merge remote-tracking branch 'origin/dev' into dev 2024-09-19 15:28:20 +08:00
zhou keda
b6494a4cd8 bug 2024-09-19 15:28:12 +08:00
majian
91717eb7f1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
2024-09-19 15:13:11 +08:00
majian
f104b58d82 电梯 2024-09-19 12:55:17 +08:00
zhou keda
4ec0362634 其它出库单位bug 2024-09-19 12:37:57 +08:00
zhou keda
fd3bbf6e55 bug 2024-09-18 18:41:36 +08:00
majian
e1299829ef Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-18 18:40:45 +08:00
majian
d835c96f2f 盘点对接以及现场问题处理 2024-09-18 18:40:29 +08:00
zhou keda
28b72d5e98 bug 2024-09-18 18:12:12 +08:00
zhou keda
d30db6073f bug 2024-09-18 17:31:35 +08:00
zhou keda
1aac1c131f bug 2024-09-18 16:10:52 +08:00
zhou keda
d213090e6b bug 2024-09-18 14:59:42 +08:00
zhou keda
83b68f3c43 Merge remote-tracking branch 'origin/dev' into dev 2024-09-18 14:55:18 +08:00
zhou keda
001ead68b9 bug 2024-09-18 14:55:09 +08:00
majian
50c5865fda Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-18 13:53:53 +08:00
majian
4245c26097 现场问题处理 2024-09-18 13:53:44 +08:00
zhou keda
b40f674641 bug 2024-09-18 13:53:02 +08:00
zhou keda
68f9b871fa bug 2024-09-18 11:08:46 +08:00
zhou keda
c8e39af8ea bug 2024-09-18 10:07:02 +08:00
majian
fc5dbd0e6c 1 2024-09-16 17:27:13 +08:00
majian
50b29b974e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
2024-09-16 17:22:56 +08:00
majian
753f7fc9d0 跨层签收同步其它出库 2024-09-16 17:13:39 +08:00
zhou keda
2ca29a3a14 bug 2024-09-16 16:29:01 +08:00
majian
d49d666cef 转库工位 2024-09-15 15:45:02 +08:00
majian
8f0cceadde Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-15 15:07:28 +08:00
majian
f3f7df190d 1 2024-09-15 15:07:01 +08:00
zhou keda
9da0a173ae bug 2024-09-15 15:02:09 +08:00
majian
742a719e42 转库单已转数量 2024-09-15 14:30:29 +08:00
zhou keda
c1df32cdea erp默认用户 2024-09-15 10:45:17 +08:00
zhou keda
762142c12f Merge remote-tracking branch 'origin/dev' into dev 2024-09-15 10:08:59 +08:00
zhou keda
556eec4227 bug 2024-09-15 10:08:46 +08:00
majian
71f390cade 现场问题处理 2024-09-15 00:59:43 +08:00
majian
e3452074aa 现场问题处理 2024-09-14 18:50:52 +08:00
zhou keda
b883609f12 bug 2024-09-14 16:04:41 +08:00
zhou keda
81c33d81ad Merge remote-tracking branch 'origin/dev' into dev 2024-09-14 14:06:43 +08:00
zhou keda
d7e132136d 仓库bug 2024-09-14 14:06:24 +08:00
majian
1c33f62991 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
2024-09-14 14:02:14 +08:00
majian
7d44c723e4 现在问题处理 2024-09-14 11:58:14 +08:00
zhou keda
b641001593 bug 2024-09-14 10:17:13 +08:00
majian
7d8310b6e7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-13 12:31:33 +08:00
zhou keda
447c490ecd bug 2024-09-13 11:54:31 +08:00
majian
1173fb4e2a 盘点单 2024-09-12 17:17:21 +08:00
majian
c1b4d60778 现场问题处理 2024-09-12 14:07:03 +08:00
majian
6f1418cf6c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-11 18:06:17 +08:00
zhou keda
25636c4b75 bug 2024-09-11 17:46:33 +08:00
majian
fd51d07fc8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-10 17:42:56 +08:00
majian
fc57a19cf8 现场问题处理,电梯逻辑处理 2024-09-10 17:42:47 +08:00
zhou keda
ea9d330724 BUG 2024-09-10 17:41:41 +08:00