root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 089193516a fix:木箱出库时移库方法增加同巷道校验；opt：子卷下先空洞问题 zhangzq 2025-05-02 16:13:04 +08:00
  • 80d078e011 fix: 套轴完毕暂存创建任务时过滤任务 liyongde 2025-05-02 14:26:01 +08:00
  • a2d10682ef opt:关闭日志打印 zhangzq 2025-05-02 12:19:08 +08:00
  • da57d8c355 fix:货位分配高度丢失；opt:一楼分配逻辑优化 zhangzq 2025-05-02 12:13:01 +08:00
  • d8149f8094 feat: 添加一期看板代码文件->/doc liyongde 2025-05-02 11:28:03 +08:00
  • ed3f39f071 fix:深货位过滤 zhangzq 2025-05-02 05:26:03 +08:00
  • 33a21088ad fix:深货位过滤 zhangzq 2025-05-01 19:23:00 +08:00
  • 20aa17af2d Merge remote-tracking branch 'origin/master_merge' into master_merge zhangzq 2025-05-01 18:16:49 +08:00
  • e5a9148415 opt:排过滤去除 zhangzq 2025-05-01 18:16:31 +08:00
  • e9e706836b Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge DESKTOP-5DIJMF9\admin 2025-05-01 15:56:17 +08:00
  • ac007b6d84 opt:优化扣减FRP管库存 DESKTOP-5DIJMF9\admin 2025-05-01 15:51:19 +08:00
  • d8bd2cfe42 opt:优化下线二次分配规则 zhangzq 2025-05-01 15:49:35 +08:00
  • 368f6b6427 fix: 套轴加强校验气涨轴库库存校验（1、2号插拔轴机同时申请套管，气胀轴库里只有1根轴，但是同时生成了两个分别去1、2号拔轴机的任务） liyongde 2025-05-01 15:03:44 +08:00
  • 29fa04701a Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-05-01 14:58:41 +08:00
  • cf2cbae92c add:新增下发气胀轴尺寸 tuqiang 2025-05-01 14:10:00 +08:00
  • ae2c9199b0 add:呼叫增加日志 zhangzq 2025-05-01 14:02:47 +08:00
  • 4a06a11551 fix:二次分配及行架任务并发问题 zhangzq 2025-05-01 13:56:52 +08:00
  • fbe2235106 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-04-30 19:55:20 +08:00
  • 22052f3650 rev:优化空轴退回功能 tuqiang 2025-04-30 18:19:26 +08:00
  • 1c2d6f76ab fix: 过滤失败2 liyongde 2025-04-30 16:18:23 +08:00
  • 7b67504230 rev:优化空轴退回功能 tuqiang 2025-04-30 16:04:44 +08:00
  • 2b0cd990bb opt:优化导出功能 zhangzq 2025-04-30 15:40:15 +08:00
  • e1e81b54e0 opt:零时关闭子卷下线2个点任务 zhangzq 2025-04-30 15:10:45 +08:00
  • 8d43351315 Merge remote-tracking branch 'origin/master_merge' into master_merge zhangzq 2025-04-30 14:38:58 +08:00
  • df5324dc7b opt: 备货区未创建AGV任务导致拔轴机构停住 liyongde 2025-04-30 13:04:29 +08:00
  • 9cdd8b7d86 add:装箱行架增加几寸轴字段 zhangzq 2025-04-30 11:21:31 +08:00
  • 3b744ea698 add:新增空轴退回功能 tuqiang 2025-04-30 10:35:40 +08:00
  • 0fc6d133c0 opt:优化装箱区送空行架任务校验 zhangzq 2025-04-29 19:41:57 +08:00
  • 98f26916cc add:子卷解绑定增加任务校验，已经装箱入库的不允许解绑 zhangzq 2025-04-29 14:56:28 +08:00
  • 7ae1579b17 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-29 12:43:55 +08:00
  • 69463008c4 fix:增加装箱区出库锁定 zhangzq 2025-04-29 10:43:55 +08:00
  • 3379e32512 opt:优化成品导出 zhangzq 2025-04-29 09:40:20 +08:00
  • 1006efa1b5 opt:导出优化；add：增加人工点维护功能；添加区域看板 zhangzq 2025-04-28 20:18:55 +08:00
  • cb69739175 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-26 18:55:12 +08:00
  • 2822f4da2e OPT:优化 DESKTOP-5DIJMF9\admin 2025-04-26 18:21:25 +08:00
  • 2c01a2bd2c opt:修改二期出库堆叠点位查询 DESKTOP-5DIJMF9\admin 2025-04-26 17:27:17 +08:00
  • 0e7e839d0e opt: 套轴时无轴干扰 feat: 饵料下卷 liyongde 2025-04-26 13:38:34 +08:00
  • bbdb26cb43 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-26 09:08:47 +08:00
  • 44d55dae35 opt:druid监控 zhangzq 2025-04-25 17:12:45 +08:00
  • 3b60fb6f3a fix:出库下发相同任务号问题 zhangzq 2025-04-25 16:45:34 +08:00
  • 3dc4422ebb opt:任务页面默认查询时间改为后2天 zhangzq 2025-04-25 14:42:50 +08:00
  • 76c3eaed4a Merge remote-tracking branch 'origin/master_1' into master_1 zhangzq 2025-04-25 14:41:48 +08:00
  • c57096181e fix: 过滤失败 liyongde 2025-04-25 14:09:26 +08:00
  • 783e8635f9 Merge remote-tracking branch 'origin/master_1' into master_1 zhangzq 2025-04-25 14:00:30 +08:00
  • 6a3d187f4e Merge remote-tracking branch 'origin/master_merge' into master_merge zhangzq 2025-04-25 13:59:43 +08:00
  • d2a8682f4a add:一楼看板增加数据；fix:出库任务完成报错；opt:任务查询不到优化 zhangzq 2025-04-25 13:59:33 +08:00
  • fc2d3d57e5 fix: 过滤删除任务 liyongde 2025-04-25 10:54:04 +08:00
  • 14ea6df2c0 fix: 防止ACS校验重复载具号 liyongde 2025-04-24 14:53:57 +08:00
  • 3a98deb92a add:增加木箱回库，装箱区至管制功能； opt:木箱移库优先级设置及下发延迟； add:增加页面调用MES接口功能 zhangzq 2025-04-22 17:26:35 +08:00
  • 4cc5506f15 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-22 13:11:12 +08:00
  • 5ea2596707 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-22 13:04:03 +08:00
  • a39f704e36 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-22 12:34:41 +08:00
  • 52e9a273f5 fix: 分切下卷气胀轴编码丢失 liyongde 2025-04-22 12:26:14 +08:00
  • ad7602c98c fix: 还原请求套轴的校验 liyongde 2025-04-22 10:01:54 +08:00
  • 000241fda5 fix: 工具类恢复 liyongde 2025-04-21 16:35:31 +08:00
  • 5f8180b844 Merge remote-tracking branch 'origin/master_1' into master_1 liyongde 2025-04-21 16:22:37 +08:00
  • a57bb4b5cc opt:优化出库 DESKTOP-5DIJMF9\admin 2025-04-21 15:47:32 +08:00
  • 843dc6bcad fix: 工具类恢复 liyongde 2025-04-21 13:19:45 +08:00
  • 9c31fa27c5 fix: 任务类修改 liyongde 2025-04-21 13:16:14 +08:00
  • 97522dbef6 opt:优化登录页面 DESKTOP-5DIJMF9\admin 2025-04-21 10:56:48 +08:00
  • be69abc097 opt: 套轴暂存位预留一个位置 fix: 管芯查询判断托盘与点位绑定关系 opt: 手持绑定管芯直接绑定点位与托盘 liyongde 2025-04-21 10:24:32 +08:00
  • e6a7b320b3 opt:优化日志 zhangzq 2025-04-20 10:13:44 +08:00
  • ea5739495a fix:子卷下线多次生成记录问题 zhangzq 2025-04-20 10:07:51 +08:00
  • ff576b36bb Merge remote-tracking branch 'origin/master_merge' into master_merge zhangzq 2025-04-19 20:21:47 +08:00
  • aae615a68b add:子卷包装页面增加调用MES接口 zhangzq 2025-04-19 20:21:38 +08:00
  • 926984b133 fix: 呼叫AGV前移、redis的key增加前缀 liyongde 2025-04-19 19:27:37 +08:00
  • 2feaabd1cc opt DESKTOP-5DIJMF9\admin 2025-04-19 17:41:58 +08:00
  • eabc74c171 add:增加分切看板接口；增加日志条件；增加子卷称重记录 zhangzq 2025-04-19 16:42:01 +08:00
  • 8db9059c5f feat: 套轴业务透明化 liyongde 2025-04-19 16:38:04 +08:00
  • 228a587421 opt:出库堆垛机对接位缓存数量2增加开关 DESKTOP-5DIJMF9\admin 2025-04-19 15:25:29 +08:00
  • f13651e5ca fix: 修复呼叫AGV失败但是最终还是出了气胀轴绑定了信息BUG liyongde 2025-04-19 10:48:20 +08:00
  • ab6d97e945 opt: acs工具允许BLK区域下发 liyongde 2025-04-18 15:48:57 +08:00
  • 7256afda39 opt: 内包间改造 liyongde 2025-04-18 10:12:29 +08:00
  • 19bade4b5f add:子卷步序 zhangzq 2025-04-18 09:49:09 +08:00
  • 4d9d432e4c Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge DESKTOP-5DIJMF9\admin 2025-04-17 12:36:23 +08:00
  • b2cd97fb9e opt:优化 DESKTOP-5DIJMF9\admin 2025-04-17 12:36:05 +08:00
  • 8b5bfab361 Merge remote-tracking branch 'origin/master_1' into master_1 liyongde 2025-04-17 12:12:48 +08:00
  • 47f49549f3 opt: 只做拔轴，任务完成将点位设置有气涨轴，等到拔轴完毕去除 liyongde 2025-04-17 11:04:21 +08:00
  • 5f1de12ae6 rev:库存导出新增是否管控字段 liuxy 2025-04-17 09:27:55 +08:00
  • d27446b48f rev：1.新增管控单据备注不能为空2.库存导出新增是否管控字段 liuxy 2025-04-17 09:17:33 +08:00
  • f4d3ef2d0f opt:B1车间增加烘箱外冷却区 送母卷到分切上料暂存架或分切机 DESKTOP-5DIJMF9\admin 2025-04-16 15:09:30 +08:00
  • adaa1552d1 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-16 12:13:59 +08:00
  • 8bb97124dd opt:B1呼叫母卷判断第三个点是否存在任务，行架任务完成时，判断agv目的点是否已有母卷 DESKTOP-5DIJMF9\admin 2025-04-15 18:11:33 +08:00
  • 05f98e2d2a rev:1.推送区域库存不查询管控的库存2.成品库存增加是否管控查询条件3.出库单新增不允许新增管控出库类型的出库单 liuxy 2025-04-15 16:19:53 +08:00
  • f5285e2148 rev:1.推送区域库存不查询管控的库存2.成品库存增加是否管控查询条件3.出库单新增不允许新增管控出库类型的出库单 liuxy 2025-04-15 15:49:55 +08:00
  • 6960467f74 rev：优化拔前行架逻辑 tuqiang 2025-04-15 15:44:13 +08:00
  • 010e26adf6 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-15 13:26:51 +08:00
  • 83bcb92bc9 Merge remote-tracking branch 'origin/master_1' into master_1 liyongde 2025-04-15 12:16:57 +08:00
  • e2b190bd85 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-15 09:58:07 +08:00
  • 598d0730e8 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-13 13:28:10 +08:00
  • b8b310bc93 Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge DESKTOP-5DIJMF9\admin 2025-04-13 13:17:19 +08:00
  • b32683cd82 opt:优化解绑包装关系时未找到木箱货位就不处理 DESKTOP-5DIJMF9\admin 2025-04-13 13:14:48 +08:00
  • 6a39e3c7fd fix: 3/6寸同个位置导致的问题 liyongde 2025-04-13 11:09:14 +08:00
  • 196f56005f rev 更新空盘入库 USER-20220102CG\noblelift 2025-04-12 12:45:40 +08:00
  • 502849fad1 rev 去除空盘入库限制 USER-20220102CG\noblelift 2025-04-12 12:42:42 +08:00
  • d67fe10455 Merge remote-tracking branch 'origin/master_merge' into master_merge DESKTOP-5DIJMF9\admin 2025-04-12 10:30:40 +08:00
  • 1cde8136f1 opt:优化 DESKTOP-5DIJMF9\admin 2025-04-12 09:25:04 +08:00
  • bbccff7c91 opt:优化日志配置 zhangzq 2025-04-11 21:35:45 +08:00
  • 636e347177 fix:日志配置，回传MES改成同步 zhangzq 2025-04-11 14:38:23 +08:00
  • e588a32472 opt:有任务禁止绑定子卷、绑定气胀轴，下料到内保间判断必须有气胀轴、必须有计划 DESKTOP-5DIJMF9\admin 2025-04-11 12:13:06 +08:00