Commit Graph

860 Commits

Author SHA1 Message Date
hlb
82909e116d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-13 15:18:42 +08:00
hlb
1ac220b170 修改 路径算法, 当出现多个载具同时出库,可能需要进入电梯时,需要均匀分配电梯 2023-11-13 15:18:28 +08:00
yang.lee
171dd26dbc 根据盘点类型获取任务明细,删除注释代码 2023-11-13 15:17:28 +08:00
yang.lee
18c3eb7183 +1 2023-11-13 12:06:33 +08:00
yang.lee
386292f710 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-13 12:02:57 +08:00
yang.lee
149402ac43 调整根据盘点类型获取任务明细代码 2023-11-13 12:02:52 +08:00
hlb
3c4147c963 去除获取未下发预任务的锁定条件 2023-11-13 11:15:25 +08:00
yang.lee
30743623cd 新增盘点任务,根据盘点类型获取任务明细信息 2023-11-13 10:49:29 +08:00
hlb
88bc41885f 获取未下发的预任务,增加目标库位锁定状态 2023-11-10 16:40:30 +08:00
yang.lee
0881843ff9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-10 16:36:13 +08:00
yang.lee
e56d58a97c carry查询 新增物料名称 2023-11-10 16:36:06 +08:00
hlb
7a94129e35 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-10 14:53:41 +08:00
hlb
113f67b168 盘点任务增加盘点签收配置 2023-11-10 14:53:33 +08:00
yang.lee
86b766500b 优化采购收货,销售发货同步mes数据代码 2023-11-10 11:02:48 +08:00
yang.lee
92a3e9904f +1 2023-11-10 10:41:37 +08:00
yang.lee
ae2446eef0 修改 反审核值 2023-11-10 10:01:08 +08:00
yang.lee
e7d9ad29ff 删除Tnb.WarehouseMgr.csproj 文件无用标签 2023-11-09 16:55:47 +08:00
yang.lee
665286f997 任务结束时调用 ,预任务执行 2023-11-09 16:27:30 +08:00
yang.lee
869c05c790 删除预任务生成执行后,目标库位占用赋值 2023-11-09 15:56:50 +08:00
yang.lee
7e0a89b0a2 过滤预任务新增库位不能占用条件 2023-11-09 15:31:05 +08:00
yang.lee
00c11a4515 调整预任务生成代码逻辑 2023-11-09 15:20:27 +08:00
yang.lee
d757785f0b EnumTaskChainType新增,电梯,输送线 2023-11-09 11:48:45 +08:00
yang.lee
49dcc79b6a Agv任务状态返回,出发预任务执行函数 2023-11-09 11:03:52 +08:00
yang.lee
79c066ec2d 调整预任务获取条件过滤 2023-11-09 10:42:49 +08:00
yang.lee
9afe7d94c1 +1 2023-11-09 10:09:05 +08:00
yang.lee
fc54814fae 1 2023-11-09 10:04:35 +08:00
yang.lee
e9259ce8ad 预任务执行,Agv及电梯任务根据配置执行 2023-11-09 10:03:30 +08:00
yang.lee
68efc42e31 解决未实现指定接口约束问题 2023-11-09 08:59:13 +08:00
yang.lee
449303161e +1 2023-11-08 17:35:57 +08:00
yang.lee
cb359b4ef9 调整出库申请代码逻辑 2023-11-08 17:07:50 +08:00
yang.lee
6bb3db57aa +1 2023-11-08 16:48:15 +08:00
yang.lee
225a00c9e2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 16:48:05 +08:00
yang.lee
e9b33e1bd6 +1 2023-11-08 16:47:58 +08:00
hlb
b6129ee807 修改空载具出库判断 2023-11-08 16:41:33 +08:00
yang.lee
60ff5d69bb +1 2023-11-08 16:38:50 +08:00
yang.lee
e808092ad8 采购收货,销售发货新增对外接口 2023-11-08 16:36:42 +08:00
yang.lee
7980e342c0 新增Mes检验结束后,回调通知功能 2023-11-08 16:24:47 +08:00
yang.lee
6521b98cc8 调整出库申请代码逻辑 2023-11-08 15:54:51 +08:00
yang.lee
7f15f7c59f 采购收货、销售发货,新增审核、反审核功能 2023-11-08 10:38:52 +08:00
yang.lee
59933a17cd 1 2023-11-07 18:02:19 +08:00
yang.lee
ea44abf6af 采购收货,销售发货业务代码提交 2023-11-07 18:01:59 +08:00
yang.lee
143f636b21 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-07 09:05:44 +08:00
yang.lee
d02b310820 1 2023-11-07 09:05:37 +08:00
fei.pan
1dbb17f103 执行代码清理,修复warning 2023-11-06 19:59:12 +08:00
fei.pan
c6b8dfc861 去除引用common.props 2023-11-06 19:35:59 +08:00
yang.lee
904135fdec Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-03 22:12:11 +08:00
yang.lee
537e54b565 与任务执行,新增信号量锁,解决并发环境下数据的一致性问题 2023-11-03 22:12:01 +08:00
FanLian
a35aea7f13 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-03 11:38:04 +08:00
FanLian
7a1dbf4e97 删除齐套出库接口的seq字段 2023-11-03 11:37:58 +08:00
yang.lee
b13574530d 将依赖事件总线的发布订阅模式,改为直接调用的形式 2023-11-02 15:58:15 +08:00