Commit Graph

1655 Commits

Author SHA1 Message Date
fei.pan
9e42729e04 修复最新简化集合方式的报错 2023-11-16 15:15:00 +08:00
fei.pan
dca3712828 修复表达式简化的错误 2023-11-16 14:58:54 +08:00
fei.pan
a5f3d473e6 修复排序错误 2023-11-16 14:55:37 +08:00
hlb
5b49890a4f 修改类型 批次盘点-区域盘点 2023-11-16 14:51:58 +08:00
hlb
5bab741657 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 14:50:33 +08:00
hlb
9bf7d055d5 修改物料盘点和批次盘点条件 2023-11-16 14:50:22 +08:00
zhoukeda
79b5bec1be 1 2023-11-16 14:36:58 +08:00
hlb
24d8377f33 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 14:06:38 +08:00
yang.lee
1cf5b63c57 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 14:06:32 +08:00
yang.lee
70b8700cc3 将自定义日志属性移动到BaseWareHouseService 2023-11-16 14:06:27 +08:00
hlb
e1920db0bb 发货和收货确认后生成单据时增加审核状态和同步状态 2023-11-16 14:06:21 +08:00
qianjiawei
6d930b53e5 BUG 2023-11-16 13:50:51 +08:00
qianjiawei
18c1b89569 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 13:36:28 +08:00
qianjiawei
8860044e92 模具质检BUG 2023-11-16 13:36:15 +08:00
yang.lee
b187c92e41 1 2023-11-16 11:56:40 +08:00
yang.lee
86c0c0ee3a 修复bug 2023-11-16 11:53:47 +08:00
yang.lee
68195fe844 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-16 11:53:39 +08:00
yang.lee
ff37e58ef8 修复bug 2023-11-16 11:53:19 +08:00
zhoukeda
6b642324f7 1 2023-11-16 09:49:15 +08:00
zhoukeda
e29d74844c 任务单操作记录列表修改 2023-11-16 09:26:53 +08:00
yang.lee
98d0fd1004 1 2023-11-15 14:30:26 +08:00
yang.lee
f825db530e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-15 14:29:46 +08:00
yang.lee
4f0211ee3a wms删除无用代码类 2023-11-15 14:29:39 +08:00
fei.pan
60d938b750 清除common.props 2023-11-15 14:20:43 +08:00
fei.pan
9c03ef2bcc 完善模型通用接口的无限层级一对一和单层级一对多 2023-11-15 13:43:24 +08:00
zhoukeda
d800987307 Merge remote-tracking branch 'origin/dev' into dev 2023-11-15 11:30:02 +08:00
zhoukeda
d9182f89b7 生产bom复制 2023-11-15 11:29:53 +08:00
zhoukeda
6702dac9c3 工单查询多几个条件 2023-11-15 11:07:38 +08:00
yang.lee
15cabb865e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-15 10:16:42 +08:00
yang.lee
d606315f94 1、调整盘点任务动态生成查询条件
2、LambdaExpressionExtensions 新增表达式树扩展
2023-11-15 10:16:34 +08:00
hlb
e13f1fd3d2 重写在库物料维护 2023-11-15 09:25:58 +08:00
yang.lee
5714e38ffc 修改盘点任务代码 2023-11-14 18:00:32 +08:00
zhoukeda
9ea879f865 Merge remote-tracking branch 'origin/dev' into dev 2023-11-14 17:49:45 +08:00
zhoukeda
f746f7c258 子表信息可以传ids查询 2023-11-14 17:49:35 +08:00
yang.lee
e940fd8a31 1 2023-11-14 15:49:03 +08:00
yang.lee
347d8676fb 调整盘点任务,新建重写的逻辑代码 2023-11-14 15:44:33 +08:00
yang.lee
1535d1532c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-14 15:21:22 +08:00
yang.lee
3f6deb4204 调整获取随机数方式 2023-11-14 15:21:18 +08:00
hlb
8dc10ee1df Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-14 14:56:48 +08:00
hlb
3fdf4c9516 修改判断条件 2023-11-14 14:56:40 +08:00
yang.lee
cd7d12a301 出库申请,分拣出时业务回更,调用载具移入不await 2023-11-14 10:28:09 +08:00
hlb
8e3f2ec579 更新任务实际完成时间 2023-11-14 09:26:21 +08:00
yang.lee
63d1ef3bbf 预任务执行,如果电梯任务,预Agv任务存在相同目标库位,删除Agv任务保证电梯任务先行 2023-11-13 18:32:13 +08:00
yang.lee
dc8f34e71b 调整 第三方设备类型枚举顺序, 2023-11-13 15:55:00 +08:00
hlb
ffc097a3c3 空载具出库为单载具新增 2023-11-13 15:33:17 +08:00
hlb
8ee8fe995e 修改任务起始值 2023-11-13 15:23:09 +08:00
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
48a5512d0c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-13 15:17:33 +08:00
yang.lee
171dd26dbc 根据盘点类型获取任务明细,删除注释代码 2023-11-13 15:17:28 +08:00