Commit Graph

2645 Commits

Author SHA1 Message Date
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
zhou keda
90db5740ec bug 2024-09-16 15:15:42 +08:00
zhou keda
44812663f0 bug 2024-09-15 18:36:23 +08:00
zhou keda
b400843b6a Merge remote-tracking branch 'origin/dev' into dev 2024-09-15 18:06:12 +08:00
zhou keda
6c4cf4ccd4 自动签收修改 2024-09-15 18:05:04 +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
03ab07ffed Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-15 00:59:59 +08:00
majian
71f390cade 现场问题处理 2024-09-15 00:59:43 +08:00
zhou keda
88941072d9 bug 2024-09-14 21:42:54 +08:00
zhou keda
60f8499034 Merge remote-tracking branch 'origin/dev' into dev 2024-09-14 19:17:25 +08:00
zhou keda
7af6866e49 投料列表日志 2024-09-14 19:17:17 +08:00
majian
e3452074aa 现场问题处理 2024-09-14 18:50:52 +08:00
zhou keda
e98078c36d pda生产任务单列表 产线主管可查看 2024-09-14 17:10:18 +08:00
zhou keda
2da4652a9c 投料暂时去掉校验 2024-09-14 17:05:59 +08:00
zhou keda
5689b57b79 暂时去掉签收检验 2024-09-14 17:02:50 +08:00
zhou keda
d2848af4eb bug 2024-09-14 16:39:47 +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
ab74ee1d46 bug 2024-09-14 10:43:53 +08:00
zhou keda
b641001593 bug 2024-09-14 10:17:13 +08:00
majian
2511e4f099 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-13 21:50:33 +08:00
zhou keda
b8f188b90f 退料接口 2024-09-13 19:59:41 +08:00
zhou keda
4483bbda3c bug 2024-09-13 17:20:15 +08:00
majian
ee9b7c4324 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-13 16:53:29 +08:00
zhou keda
e960d5be8c 称重bug 2024-09-13 16:17:49 +08:00
zhou keda
0066b7166b 自动签收bug 2024-09-13 15:40:05 +08:00
zhou keda
d957ffdde2 喷码修改 2024-09-13 15:39:22 +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
zhou keda
e086247d50 生产bom优化 2024-09-12 10:12:47 +08:00
majian
df00f0b1e2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-12 09:05:33 +08:00
zhou keda
501f5c1ca6 bug 2024-09-12 08:59:11 +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
421ef28f38 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-09-11 15:01:17 +08:00