Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• ab4d0544df 新增创建任务链接口 alex 2023-08-01 16:51:24 +08:00
• a9c9c8d74b 1 alex 2023-08-01 16:46:30 +08:00
• 9bb775f00e 新增Http请求帮助类，设备接口提供程序服务类 alex 2023-08-01 16:46:15 +08:00
• 8b581ab757 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-08-01 10:49:36 +08:00
• d6c33d91c1 增加预任务的点位ID和点位编号，更改任务执行字段 FanLian 2023-08-01 10:49:30 +08:00
• de2ad9b2d0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-31 17:28:11 +08:00
• 5e6e01a99a 调整，齐套出库、齐套分拣，代码 alex 2023-07-31 17:28:08 +08:00
• e8e590ba1b 出库策略更改 FanLian 2023-07-31 17:27:25 +08:00
• 9d4ceff2b8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-31 16:56:26 +08:00
• 8d0fb291e9 出库申请，出库策略 FanLian 2023-07-31 16:56:21 +08:00
• ed54413f42 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-31 16:54:46 +08:00
• e3e9bdf090 1 alex 2023-07-31 16:54:42 +08:00
• f50942fbaf Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-31 16:34:49 +08:00
• 5416aff03e 增加出库策略 FanLian 2023-07-31 16:34:44 +08:00
• 6f5a066a99 1 alex 2023-07-31 16:34:11 +08:00
• 61cb73711f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-31 16:21:30 +08:00
• 7f5f52c7da 出库策略代码调整 alex 2023-07-31 16:21:26 +08:00
• bc3a0fea43 1、新增出入库策略函数 2、调整更新空载具函数，删除多余参数 alex 2023-07-31 14:44:21 +08:00
• 11fa4017fa 1 alex 2023-07-31 14:44:21 +08:00
• d707daa395 1、出库库策略接口函数新增 2、调整更新 空载具函数，去除多余参数 alex 2023-07-31 14:43:43 +08:00
• 5229030165 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-31 11:59:18 +08:00
• 05dcc210bf 注塑挤出任务单下发列表页添加设备信息 zhoukeda 2023-07-31 11:59:10 +08:00
• b79ce73d42 代码修改 FanLian 2023-07-31 11:39:57 +08:00
• ca4e4c34e1 出库签收有carry_code的映射，将carry_id映射成carry_code的值 FanLian 2023-07-31 11:36:04 +08:00
• f4814f9af2 报错调整 FanLian 2023-07-31 11:16:59 +08:00
• 52f709c41a 修改电梯判空 FanLian 2023-07-31 09:18:45 +08:00
• b47392f61b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-31 08:38:32 +08:00
• fe4e0d90b7 调整格式 FanLian 2023-07-31 08:38:26 +08:00
• c18b937dc1 生产相关列表倒叙，生产工单列表重写 zhoukeda 2023-07-28 16:26:27 +08:00
• a78186d7b0 修改分拣出库相关代码 FanLian 2023-07-28 13:40:20 +08:00
• 703eda463e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-28 11:13:56 +08:00
• 11216f3ab5 载具查询接口，新增判空条件判断 alex 2023-07-28 11:13:51 +08:00
• ae80a0a971 提报数量限制 zhoukeda 2023-07-28 09:55:13 +08:00
• ec0697d5f8 简化 FanLian 2023-07-27 17:30:14 +08:00
• 8f9ac6af90 平均分配调整 FanLian 2023-07-27 17:27:36 +08:00
• e110a80d62 电梯平均分配优化 FanLian 2023-07-27 17:24:16 +08:00
• 720ef178dd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-27 17:05:14 +08:00
• 82870e63f9 增加电梯状态判断 FanLian 2023-07-27 17:05:10 +08:00
• 4269e75382 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-27 17:02:18 +08:00
• 7c0207e9e0 1 alex 2023-07-27 17:01:47 +08:00
• 0a2d23f268 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-27 16:45:20 +08:00
• cd880569bf 任务完成时电梯任务数量减少,预任务生成时电梯任务数量增加 FanLian 2023-07-27 16:45:15 +08:00
• 8f4f46be28 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-27 15:33:06 +08:00
• f3dda4a39d 盘点任务，全库盘功能代码提交 alex 2023-07-27 15:33:01 +08:00
• c54d4e6a4e 1 FanLian 2023-07-27 14:52:57 +08:00
• b8994bbfc2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-27 14:52:42 +08:00
• 37e6b362e1 修改错误 FanLian 2023-07-27 14:52:38 +08:00
• ffc9e9678d Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-27 14:33:59 +08:00
• 47d685738e 组装任务管理，所有子任务是一个状态改父级状态 zhoukeda 2023-07-27 14:33:28 +08:00
• 4f841116bc Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-27 14:30:36 +08:00
• 5cbe089b10 1.增加电梯的路径判断与平均分配 2.载具查询异常抛出 3.在线开发的子表使用弹窗时，编辑显示时bug,例如"_point_code_"在dictionary中 不存在 FanLian 2023-07-27 14:30:31 +08:00
• 56223cf5d2 生产工单排产完成数量预计开始结束时间 zhoukeda 2023-07-27 14:09:24 +08:00
• 9e5b97b797 组装包装任务单下发加完成数量 zhoukeda 2023-07-27 09:35:26 +08:00
• a41800e785 组装包装任务管理计划数量错误 zhoukeda 2023-07-27 09:08:37 +08:00
• cfdf7048ec Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-26 15:19:17 +08:00
• 6ec90d3dbe 物料签收添加子载具，扫码投料bug zhoukeda 2023-07-26 15:19:09 +08:00
• 1f0f302489 新增盘点任务模块 alex 2023-07-26 13:31:13 +08:00
• acf1d9f94a 注塑任务单以pps开头 注塑挤出排产已排产数量bug zhoukeda 2023-07-26 10:03:09 +08:00
• 134c57245c 扫码投料bug zhoukeda 2023-07-26 09:33:44 +08:00
• b727fdb574 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-26 09:05:33 +08:00
• 29c033eae2 排产算预计结束时间bug zhoukeda 2023-07-26 09:05:25 +08:00
• 9a5b9d8f9d 优化更新空载具接口及函数 alex 2023-07-26 09:04:02 +08:00
• 9b324ec606 wmsCarryService返回值修改 alex 2023-07-25 13:45:02 +08:00
• 08694f7845 1 alex 2023-07-25 10:18:35 +08:00
• efa35b2f1a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-25 10:16:51 +08:00
• a8646258ac 1 alex 2023-07-25 10:16:48 +08:00
• 0f26a792b4 优化生成任务链单号，代码将4层循环优化为3层 alex 2023-07-25 10:16:41 +08:00
• ed7f202487 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-25 09:32:08 +08:00
• c55bb77b98 任务单中断操作状态由关闭改为暂停 zhoukeda 2023-07-25 09:32:01 +08:00
• 1a01ea378e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-25 09:25:48 +08:00
• e81550fd8f dijkstra算法修正 FanLian 2023-07-25 09:25:37 +08:00
• 9872642cc1 生产bom投入产出物料添加单位id zhoukeda 2023-07-25 09:08:19 +08:00
• b8180d941f 取消提报数量大于等于任务数改状态 zhoukeda 2023-07-24 13:52:21 +08:00
• 1b3d30d204 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-24 11:24:16 +08:00
• ee2e9ffc3d 增加完成校验，自检报废记录添加报废人 zhoukeda 2023-07-24 11:24:08 +08:00
• 89baed0d9a 1 alex 2023-07-24 11:16:10 +08:00
• 9621ccac0e 任务执行，代码逻辑优化 alex 2023-07-24 11:15:55 +08:00
• fd2bbc465a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-24 10:03:50 +08:00
• c250cf01f8 优化齐套出库，更新空载具，并行处理逻辑 alex 2023-07-24 10:03:40 +08:00
• 9dcf772a08 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-24 09:09:30 +08:00
• b545b2df8e 暂停状态无法提报报废 zhoukeda 2023-07-24 09:09:22 +08:00
• 5e2bfc7ad1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-21 17:47:52 +08:00
• 1dc37a61ba 预任务执行，任务链编号赋值代码优化 alex 2023-07-21 17:47:48 +08:00
• 978505557c 1 zhoukeda 2023-07-21 17:41:46 +08:00
• 17e510f480 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-21 17:40:49 +08:00
• 1fc3469fad 齐套接口返回成功后再操作数据库，生产工单列表优化，提报完工数不能大于任务单数 完成后修改状态 zhoukeda 2023-07-21 17:40:42 +08:00
• 5538e3b897 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-21 17:35:16 +08:00
• f0624b0193 调整载具查询返回接口，子载具编号赋值逻辑 alex 2023-07-21 17:35:11 +08:00
• 60d9f17017 回滚生产入库状态 zhoukeda 2023-07-21 17:10:30 +08:00
• 8a1ce002fb Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-07-21 17:09:09 +08:00
• 2141a1bedb 修改生产入库状态描述 zhoukeda 2023-07-21 17:08:20 +08:00
• 9802bea65a 生产入库状态修改 zhoukeda 2023-07-21 17:06:51 +08:00
• 42c57ed97f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-07-21 17:02:55 +08:00
• 470ae8e8f6 1 qianjiawei 2023-07-21 17:02:50 +08:00
• c4ffd8e53c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-07-21 16:56:10 +08:00
• 878d012aa8 1 alex 2023-07-21 16:56:07 +08:00
• 331eeb0320 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev FanLian 2023-07-21 16:55:45 +08:00
• 5a050022e3 载具查询返回逻辑更改 FanLian 2023-07-21 16:55:40 +08:00
• bc529685e0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-07-21 16:50:11 +08:00
• c73e1efb7e 1 qianjiawei 2023-07-21 16:50:05 +08:00