Commit Graph

2056 Commits

Author SHA1 Message Date
zhou keda
23a63c8737 删除多余表 2024-07-02 15:13:53 +08:00
zhou keda
db213c6050 删除多余表 2024-07-02 13:53:32 +08:00
zhou keda
e4fc54c9a5 bug 2024-07-01 17:19:17 +08:00
zhou keda
fd42810269 bug 2024-07-01 14:55:00 +08:00
zhou keda
46f7b4bf20 长管投料不解绑父载具 2024-07-01 11:19:08 +08:00
zhou keda
52f200d555 Merge remote-tracking branch 'origin/dev' into dev 2024-06-29 16:42:25 +08:00
zhou keda
c0a1efb77c bug 2024-06-29 16:42:15 +08:00
majian
d54656bc03 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-29 16:18:16 +08:00
zhou keda
4fb28a1fe3 生产提报日志优化 2024-06-29 16:16:55 +08:00
majian
fb2d15f4b9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-29 15:59:00 +08:00
zhou keda
d05b6a596c bug 2024-06-29 15:58:30 +08:00
majian
2577ebc090 退料判断物料种类 2024-06-29 15:58:27 +08:00
zhou keda
07cfa4a14f bug 2024-06-29 15:14:50 +08:00
zhou keda
f13b25fed5 Merge remote-tracking branch 'origin/dev' into dev 2024-06-29 14:00:46 +08:00
zhou keda
448bab4f25 bug 2024-06-29 14:00:35 +08:00
majian
958d1deb25 生产退料,暂存仓配送优化 2024-06-29 13:23:21 +08:00
majian
4d890e2ca2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-29 13:21:39 +08:00
zhou keda
3bda36ae02 bug 2024-06-29 13:19:01 +08:00
majian
baa12bff76 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-29 12:30:22 +08:00
zhou keda
3c52ad0d27 bug 2024-06-29 12:26:12 +08:00
majian
65f88dcf8a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-28 16:30:46 +08:00
zhou keda
cf241dcd56 bug 2024-06-28 16:27:30 +08:00
majian
f802feb2b9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-28 16:06:30 +08:00
zhou keda
8a9708ffc7 bug 2024-06-28 16:04:51 +08:00
majian
8f78a36e17 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-28 13:35:15 +08:00
zhou keda
9ebb37033c bug 2024-06-28 11:15:17 +08:00
zhou keda
8a13c5d593 生产投料 2024-06-28 11:09:03 +08:00
majian
6284ea4b56 退料到中储仓 2024-06-27 22:17:23 +08:00
zhou keda
df0be4e15d 组装下发列表传员工工位 2024-06-27 18:03:07 +08:00
zhou keda
42b3352c38 pda任务单列表优化 2024-06-27 17:53:06 +08:00
zhou keda
d2596984c8 pda任务单列表优化 2024-06-27 17:52:29 +08:00
zhou keda
c2e9499719 pda任务单列表优化 2024-06-27 17:51:18 +08:00
majian
91c451cfc5 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-27 17:14:20 +08:00
zhou keda
22b1b80b1e 生产提报日志优化 2024-06-27 17:11:06 +08:00
majian
28ef632767 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-27 16:44:05 +08:00
majian
9ea21e07cb bug 2024-06-27 16:43:51 +08:00
zhou keda
398f8f3696 bug 2024-06-27 16:42:39 +08:00
zhou keda
a45bb93e08 bug 2024-06-27 16:25:36 +08:00
zhou keda
d6144650cd bug 2024-06-27 16:23:52 +08:00
zhou keda
323d18c374 bug 2024-06-27 16:23:40 +08:00
majian
ea93613c82 日志完善 2024-06-27 15:58:09 +08:00
majian
e0aa944d7d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
	ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
2024-06-27 11:22:26 +08:00
majian
8177d05cd2 生产退料开发等 2024-06-27 11:15:07 +08:00
zhou keda
bccf2bca5a 注塑定点配送已下发也不发任务 2024-06-27 11:01:23 +08:00
zhou keda
fb9ba4b7a8 物料签收bug修改 2024-06-27 09:10:31 +08:00
majian
1765ebedc4 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-26 18:19:55 +08:00
zhou keda
560465974a bug 2024-06-26 17:12:43 +08:00
majian
c1c9000e0c 二楼物料呼叫取任务单添加条件 2024-06-26 16:56:52 +08:00
zhou keda
933744b618 BUG 2024-06-26 15:58:46 +08:00
zhou keda
ade240d8cf Merge remote-tracking branch 'origin/dev' into dev 2024-06-26 15:12:25 +08:00