Commit Graph

2090 Commits

Author SHA1 Message Date
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
zhou keda
bcfdf31497 bug 2024-06-26 15:12:15 +08:00
majian
1089bd7f5a 同步料架的载具位置,bug处理,日志完善 2024-06-26 14:27:32 +08:00
majian
4ff5b9b9d7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-26 14:25:50 +08:00
zhou keda
5b7e724d58 bug 2024-06-26 14:23:34 +08:00
zhou keda
dce72c4899 BUG 2024-06-26 14:00:36 +08:00
majian
b19eb51755 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-26 11:52:00 +08:00
zhou keda
ece89a101e 空载具出库优化 2024-06-26 09:58:11 +08:00
majian
1d344b4751 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-26 09:23:24 +08:00
zhou keda
4bf889a26a BUG 2024-06-26 09:19:40 +08:00
majian
c23ad90963 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-25 17:17:19 +08:00
majian
47d4335e01 原材料条码,日志修改 2024-06-25 17:17:09 +08:00
zhou keda
f1ee8abcef 自动签收 2024-06-25 17:13:21 +08:00
majian
fd75a23321 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-25 14:34:01 +08:00
zhou keda
1906fc9ad3 自动生产提报 2024-06-25 14:23:53 +08:00
majian
b9666d03ea 配置修改 2024-06-25 11:39:42 +08:00
majian
1b078cc0cd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-25 11:38:19 +08:00