Commit Graph

335 Commits

Author SHA1 Message Date
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
zhou keda
86d07260af 优化调整 2024-05-24 14:21:14 +08:00
majian
f4517624e9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-05-23 00:33:42 +08:00
majian
af6a562211 二楼料箱下到一楼生成ctu任务和空载具入库单 2024-05-23 00:33:23 +08:00
zhou keda
5eb89b8da5 优化 2024-05-22 16:59:27 +08:00
zhou keda
90b567f653 提报获取重量 2024-05-22 16:37:56 +08:00
zhou keda
a53623823c Merge remote-tracking branch 'origin/dev' into dev 2024-05-21 17:22:18 +08:00
zhou keda
d013cbaa90 优化 2024-05-21 17:22:09 +08:00
majian
c40ce51e77 原材料转库、出库签收 2024-05-21 15:00:13 +08:00
zhou keda
ccb52b157d 调整 2024-05-21 14:48:31 +08:00
zhou keda
565fa22e45 注塑定点配送 2024-05-21 10:54:30 +08:00
zhou keda
0354f661f8 Merge remote-tracking branch 'origin/dev' into dev 2024-05-21 10:25:30 +08:00
zhou keda
58521fa3ea bug 2024-05-21 10:25:22 +08:00
majian
70b07eba61 原材料仓叠盘机 2024-05-21 09:29:44 +08:00
majian
86041e540a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2024-05-21 09:26:29 +08:00
majian
082feb0dd3 原材料仓叠盘机 2024-05-21 09:25:52 +08:00
zhou keda
8537c29b49 注塑空载具出库优化 2024-05-21 09:21:33 +08:00
zhou keda
929b5378bc 优化 2024-05-17 15:24:28 +08:00
zhou keda
5debdf1a07 优化 2024-05-16 16:37:30 +08:00
zhou keda
5f2a6bcdda Merge remote-tracking branch 'origin/dev' into dev 2024-05-15 14:45:19 +08:00
zhou keda
50b8dedc7d bom中数量变成分子分母2个字段 2024-05-15 14:45:08 +08:00
majian
9effa30fb0 二楼自动下发中储仓任务 2024-05-15 12:26:32 +08:00
zhou keda
977f138445 排产加模具状态 工单加物料清单版本 2024-05-15 11:26:17 +08:00
zhou keda
fd6f2db9f2 喷码贴标测试接口 2024-05-15 09:43:01 +08:00
majian
eadaa50ef7 销售出库与拣货接口以及部分问题修复 2024-05-14 15:29:18 +08:00
majian
72ddc61591 二楼暂存仓逻辑完善,新增外协入库与盘点接收接口 2024-05-09 16:03:37 +08:00
majian
87d8da928a 二楼下升降机机械手边调度逻辑 2024-05-06 10:49:25 +08:00
majian
18ff3b29ed 添加上升降机边调度逻辑 2024-04-29 15:57:28 +08:00
majian
579f2d3a39 bug处理 2024-04-23 10:16:16 +08:00
majian
4fbc6c0267 合并 2024-04-11 17:31:32 +08:00
majian
5f16ca1abe bug 2024-04-11 15:04:11 +08:00
kang.luo
1f909839d6 改bug 2024-03-20 15:40:02 +08:00
qianjiawei
a405703a32 bug 2024-03-18 09:02:59 +08:00
qianjiawei
501a39dda5 1 2024-03-14 17:28:33 +08:00
qianjiawei
f37ad2bfa3 1 2024-03-08 17:54:08 +08:00
qianjiawei
02dafc3c74 bug 2024-02-02 10:29:12 +08:00
qianjiawei
bee26d9a92 bug 2024-01-30 16:55:51 +08:00
qianjiawei
878a800bc7 1 2024-01-29 15:55:11 +08:00
qianjiawei
7244fab4ac bug 2023-12-25 17:31:50 +08:00