Commit Graph

1019 Commits

Author SHA1 Message Date
FanLian
52f709c41a 修改电梯判空 2023-07-31 09:18:45 +08:00
FanLian
b47392f61b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-31 08:38:32 +08:00
FanLian
fe4e0d90b7 调整格式 2023-07-31 08:38:26 +08:00
zhoukeda
c18b937dc1 生产相关列表倒叙,生产工单列表重写 2023-07-28 16:26:27 +08:00
FanLian
a78186d7b0 修改分拣出库相关代码 2023-07-28 13:40:20 +08:00
alex
703eda463e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-28 11:13:56 +08:00
alex
11216f3ab5 载具查询接口,新增判空条件判断 2023-07-28 11:13:51 +08:00
zhoukeda
ae80a0a971 提报数量限制 2023-07-28 09:55:13 +08:00
FanLian
ec0697d5f8 简化 2023-07-27 17:30:14 +08:00
FanLian
8f9ac6af90 平均分配调整 2023-07-27 17:27:36 +08:00
FanLian
e110a80d62 电梯平均分配优化 2023-07-27 17:24:16 +08:00
FanLian
720ef178dd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-27 17:05:14 +08:00
FanLian
82870e63f9 增加电梯状态判断 2023-07-27 17:05:10 +08:00
alex
4269e75382 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-27 17:02:18 +08:00
alex
7c0207e9e0 1 2023-07-27 17:01:47 +08:00
FanLian
0a2d23f268 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-27 16:45:20 +08:00
FanLian
cd880569bf 任务完成时电梯任务数量减少,预任务生成时电梯任务数量增加 2023-07-27 16:45:15 +08:00
alex
8f4f46be28 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-27 15:33:06 +08:00
alex
f3dda4a39d 盘点任务,全库盘功能代码提交 2023-07-27 15:33:01 +08:00
FanLian
c54d4e6a4e 1 2023-07-27 14:52:57 +08:00
FanLian
b8994bbfc2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-27 14:52:42 +08:00
FanLian
37e6b362e1 修改错误 2023-07-27 14:52:38 +08:00
zhoukeda
ffc9e9678d Merge remote-tracking branch 'origin/dev' into dev 2023-07-27 14:33:59 +08:00
zhoukeda
47d685738e 组装任务管理,所有子任务是一个状态改父级状态 2023-07-27 14:33:28 +08:00
FanLian
4f841116bc Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-27 14:30:36 +08:00
FanLian
5cbe089b10 1.增加电梯的路径判断与平均分配
2.载具查询异常抛出
3.在线开发的子表使用弹窗时,编辑显示时bug,例如"_point_code_"在dictionary中 不存在
2023-07-27 14:30:31 +08:00
zhoukeda
56223cf5d2 生产工单排产完成数量预计开始结束时间 2023-07-27 14:09:24 +08:00
zhoukeda
9e5b97b797 组装包装任务单下发加完成数量 2023-07-27 09:35:26 +08:00
zhoukeda
a41800e785 组装包装任务管理计划数量错误 2023-07-27 09:08:37 +08:00
zhoukeda
cfdf7048ec Merge remote-tracking branch 'origin/dev' into dev 2023-07-26 15:19:17 +08:00
zhoukeda
6ec90d3dbe 物料签收添加子载具,扫码投料bug 2023-07-26 15:19:09 +08:00
alex
1f0f302489 新增盘点任务模块 2023-07-26 13:31:13 +08:00
zhoukeda
acf1d9f94a 注塑任务单以pps开头 注塑挤出排产已排产数量bug 2023-07-26 10:03:09 +08:00
zhoukeda
134c57245c 扫码投料bug 2023-07-26 09:33:44 +08:00
zhoukeda
b727fdb574 Merge remote-tracking branch 'origin/dev' into dev 2023-07-26 09:05:33 +08:00
zhoukeda
29c033eae2 排产算预计结束时间bug 2023-07-26 09:05:25 +08:00
alex
9a5b9d8f9d 优化更新空载具接口及函数 2023-07-26 09:04:02 +08:00
alex
9b324ec606 wmsCarryService返回值修改 2023-07-25 13:45:02 +08:00
alex
08694f7845 1 2023-07-25 10:18:35 +08:00
alex
efa35b2f1a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-25 10:16:51 +08:00
alex
a8646258ac 1 2023-07-25 10:16:48 +08:00
alex
0f26a792b4 优化生成任务链单号,代码将4层循环优化为3层 2023-07-25 10:16:41 +08:00
zhoukeda
ed7f202487 Merge remote-tracking branch 'origin/dev' into dev 2023-07-25 09:32:08 +08:00
zhoukeda
c55bb77b98 任务单中断操作状态由关闭改为暂停 2023-07-25 09:32:01 +08:00
FanLian
1a01ea378e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-25 09:25:48 +08:00
FanLian
e81550fd8f dijkstra算法修正 2023-07-25 09:25:37 +08:00
zhoukeda
9872642cc1 生产bom投入产出物料添加单位id 2023-07-25 09:08:19 +08:00
zhoukeda
b8180d941f 取消提报数量大于等于任务数改状态 2023-07-24 13:52:21 +08:00
zhoukeda
1b3d30d204 Merge remote-tracking branch 'origin/dev' into dev 2023-07-24 11:24:16 +08:00
zhoukeda
ee2e9ffc3d 增加完成校验,自检报废记录添加报废人 2023-07-24 11:24:08 +08:00