Commit Graph

435 Commits

Author SHA1 Message Date
majian
49f9e7b01c 齐套出库 2024-06-04 15:48:13 +08:00
majian
2c545e9b7f 齐套出库 2024-06-02 21:27:20 +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
7bcb2f63eb bug处理 料箱出7号线逻辑 2024-05-30 09:44:01 +08:00
majian
450ea471b7 生产入库接口 2024-05-28 09:56:27 +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
majian
2a66f244dd 空载具出库数量控制修改 2024-05-23 11:56:52 +08:00
majian
af6a562211 二楼料箱下到一楼生成ctu任务和空载具入库单 2024-05-23 00:33:23 +08:00
majian
c40ce51e77 原材料转库、出库签收 2024-05-21 15:00:13 +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
929b5378bc 优化 2024-05-17 15:24:28 +08:00
majian
9effa30fb0 二楼自动下发中储仓任务 2024-05-15 12:26:32 +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
qianjiawei
501a39dda5 1 2024-03-14 17:28:33 +08:00
qianjiawei
bee26d9a92 bug 2024-01-30 16:55:51 +08:00
qianjiawei
e8d9f9af81 bug 2023-12-20 16:58:40 +08:00
qianjiawei
296c618bf5 11 2023-12-18 17:17:48 +08:00
qianjiawei
afaf05e5a4 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-15 16:37:26 +08:00
qianjiawei
0cca20b0ff ctu存放 2023-12-15 16:37:13 +08:00
yang.lee
1a5e38b9d9 任务预任务,新增批量删除工嗯呢 2023-12-15 10:50:53 +08:00
yang.lee
6ce793ea5c 1 2023-12-15 10:00:19 +08:00
qianjiawei
690167b1a2 ctu 2023-12-15 09:49:44 +08:00
yang.lee
89e7f0dd50 空载具入库,获取目标库位集合代码还原,用于测试CTU 2023-12-13 14:05:44 +08:00
yang.lee
886f3a1661 解决冲突 2023-12-12 14:29:34 +08:00
yang.lee
fbdc7de3b9 电梯代码优化 2023-12-12 14:28:38 +08:00
qianjiawei
581242f547 wms接入redis 2023-12-12 13:56:55 +08:00
qianjiawei
8712508b84 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-11 17:30:48 +08:00
qianjiawei
d4d62c3e09 erp接口 2023-12-11 17:30:42 +08:00
yang.lee
d61989417f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-11 13:53:04 +08:00
yang.lee
0dd220ee4f 1、库位导入代码调整
2、电梯通信代码调整
2023-12-11 13:52:54 +08:00
qianjiawei
3a7a0dd572 ERP对接WMS接口 2023-12-08 17:05:10 +08:00
yang.lee
104462c352 去除日志分割线,看着眼花 2023-12-06 11:48:00 +08:00
yang.lee
6055f28734 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-04 15:53:54 +08:00
yang.lee
7b6920a844 修改打印载具条码份数默认值 2023-12-04 15:53:45 +08:00
hlb
e9f773e5e5 在库物料导入 2023-12-02 22:05:35 +08:00
yang.lee
7033db95e6 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-30 15:26:00 +08:00
yang.lee
08888ac4c2 wms电梯设定,新增开关电梯控制接口 2023-11-30 15:25:44 +08:00
hlb
ddba5735cf Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-28 11:41:48 +08:00
hlb
18694b48a0 增加规格型号和箱号 2023-11-28 11:41:32 +08:00
yang.lee
92397afcc0 调整函数,支持按份数批量打印 2023-11-28 11:27:23 +08:00
yang.lee
c622f14aa5 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-27 15:01:58 +08:00