Commit Graph

1944 Commits

Author SHA1 Message Date
majian
dd86185625 bug 2024-06-13 10:28:22 +08:00
zhou keda
89cfac6564 生产提报修改 2024-06-13 08:44:43 +08:00
zhou keda
9c6e353291 优化 2024-06-12 17:02:46 +08:00
zhou keda
2b83c08c3a 注塑定点优化 2024-06-12 14:00:10 +08:00
zhou keda
c4bc95b2d6 关联表单查询优化 2024-06-12 12:03:13 +08:00
zhou keda
22639a725c 注塑定点配送增加设备状态判定 2024-06-12 09:44:33 +08:00
majian
96fd8ab5a8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-11 14:37:07 +08:00
zhou keda
b037bd1e91 bug 2024-06-11 14:23:24 +08:00
majian
94065c4920 电梯锁优化 2024-06-11 13:41:56 +08:00
zhou keda
598d40af6d bug 2024-06-11 10:42:07 +08:00
majian
51bfc0d99c bug修复 2024-06-07 17:30:47 +08:00
majian
3549274b72 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-07 15:59:42 +08:00
zhou keda
39f16568a0 bug 2024-06-07 15:56:44 +08:00
majian
05f4f2e7cd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-07 14:27:35 +08:00
zhou keda
a27442f652 生产提报获取下料库位 2024-06-07 14:23:28 +08:00
majian
703c178f98 合并 2024-06-07 11:02:03 +08:00
zhou keda
157662be5d 称重,注塑定点配送修改 2024-06-07 10:51:57 +08:00
zhou keda
9de6296b6f 发布带完整日志信息 2024-06-07 09:04:14 +08:00
majian
47c0559d5c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-06 16:57:12 +08:00
zhou keda
f5e3eebe22 bug 2024-06-06 16:54:48 +08:00
majian
5ee091d2f5 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
	ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
2024-06-06 16:44:49 +08:00
majian
439e000bd1 bug处理,二楼空载具料架入库 2024-06-06 16:42:31 +08:00
zhou keda
97f53babe1 bug 2024-06-06 16:39:29 +08:00
zhou keda
9b4a904b9b bug 2024-06-06 16:39:05 +08:00
zhou keda
9e177b69f7 bug 2024-06-06 15:25:51 +08:00
zhou keda
46023f56c1 删除该组织和设备关联数据 2024-06-05 16:37:42 +08:00
majian
49f9e7b01c 齐套出库 2024-06-04 15:48:13 +08:00
zhou keda
0fec54597d 优化 2024-06-03 14:20:48 +08:00
zhou keda
dc39290638 Merge remote-tracking branch 'origin/dev' into dev 2024-06-03 12:19:04 +08:00
zhou keda
d66f9389e7 喷码返回参数 2024-06-03 12:18:52 +08:00
majian
75e395c6b9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-06-02 21:27:38 +08:00
majian
2c545e9b7f 齐套出库 2024-06-02 21:27:20 +08:00
zhou keda
b34d1c9a38 优化 2024-05-31 10:57:14 +08:00
zhou keda
db40c03da6 优化 2024-05-31 10:52:36 +08:00
zhou keda
a7b30c94f4 Merge remote-tracking branch 'origin/dev' into dev 2024-05-30 14:51:49 +08:00
zhou keda
94a71fa60c 生产提报修改 2024-05-30 14:51:41 +08:00
majian
892d758dbf 载具绑定物料 2024-05-30 11:32:45 +08:00
majian
260dd5d195 载具绑定物料接口 2024-05-30 11:19:11 +08:00
majian
745599875d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-05-30 09:44:30 +08:00
majian
7bcb2f63eb bug处理 料箱出7号线逻辑 2024-05-30 09:44:01 +08:00
zhou keda
da4f8322bc Merge remote-tracking branch 'origin/dev' into dev 2024-05-28 14:02:53 +08:00
zhou keda
3afa57a2d0 优化调整 2024-05-28 14:02:44 +08:00
majian
c4aa174ff9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-05-28 09:56:47 +08:00
majian
450ea471b7 生产入库接口 2024-05-28 09:56:27 +08:00
zhou keda
7fe6784007 优化调整 2024-05-28 09:29:28 +08:00
majian
6674d10880 优化 2024-05-25 15:32:25 +08:00
zhou keda
ac8e09c6e1 Merge remote-tracking branch 'origin/dev' into dev 2024-05-24 16:25:17 +08:00
zhou keda
33471e4568 bug 2024-05-24 16:25:09 +08:00
majian
fc74b3381f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
	BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
2024-05-24 14:33:09 +08:00
majian
36622b35cf 原材料转库逻辑变更 2024-05-24 14:24:21 +08:00