Commit Graph

1037 Commits

Author SHA1 Message Date
FanLian
e8e590ba1b 出库策略更改 2023-07-31 17:27:25 +08:00
FanLian
9d4ceff2b8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-31 16:56:26 +08:00
FanLian
8d0fb291e9 出库申请,出库策略 2023-07-31 16:56:21 +08:00
alex
ed54413f42 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-31 16:54:46 +08:00
alex
e3e9bdf090 1 2023-07-31 16:54:42 +08:00
FanLian
f50942fbaf Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-31 16:34:49 +08:00
FanLian
5416aff03e 增加出库策略 2023-07-31 16:34:44 +08:00
alex
6f5a066a99 1 2023-07-31 16:34:11 +08:00
alex
61cb73711f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-31 16:21:30 +08:00
alex
7f5f52c7da 出库策略代码调整 2023-07-31 16:21:26 +08:00
alex
bc3a0fea43 1、新增出入库策略函数
2、调整更新空载具函数,删除多余参数
2023-07-31 14:46:19 +08:00
alex
11fa4017fa 1 2023-07-31 14:44:21 +08:00
alex
d707daa395 1、出库库策略接口函数新增
2、调整更新 空载具函数,去除多余参数
2023-07-31 14:43:43 +08:00
zhoukeda
5229030165 Merge remote-tracking branch 'origin/dev' into dev 2023-07-31 11:59:18 +08:00
zhoukeda
05dcc210bf 注塑挤出任务单下发列表页添加设备信息 2023-07-31 11:59:10 +08:00
FanLian
b79ce73d42 代码修改 2023-07-31 11:39:57 +08:00
FanLian
ca4e4c34e1 出库签收有carry_code的映射,将carry_id映射成carry_code的值 2023-07-31 11:36:04 +08:00
FanLian
f4814f9af2 报错调整 2023-07-31 11:16:59 +08:00
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