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

Commit Graph

  • 79615d3430 Merge remote-tracking branch 'origin/master_1' into master_merge_0523 zhangzq 2025-06-30 09:16:08 +08:00
  • a516b7d94a Merge remote-tracking branch 'origin/acs_dev' into acs_dev ls 2025-06-28 09:44:45 +08:00
  • e3c4a39cb2 fix: 诺宝指令状态修复 ls 2025-06-28 09:43:36 +08:00
  • 62521d3263 fix:提示、注释优化 zhouz 2025-06-27 15:01:14 +08:00
  • 594e90bb48 opt:优化 DESKTOP-5DIJMF9\admin 2025-06-26 13:45:15 +08:00
  • 66e7b1a2c8 rev：二期出库测试修改 liuxy 2025-06-25 18:05:22 +08:00
  • 668c9e1200 fix:修改dev配置文件数据库驱动 zhangzq 2025-06-25 17:44:57 +08:00
  • 4c17631f55 opt:增加自动充电功能 DESKTOP-5DIJMF9\admin 2025-06-25 14:15:57 +08:00
  • 5775003503 opt: 1 liyongde 2025-06-25 13:57:50 +08:00
  • c8a070f597 opt:增加根据车号自动充电 master DESKTOP-5DIJMF9\admin 2025-06-25 13:33:45 +08:00
  • cb8e62b662 opt: 查询是否存在任务正在搬运过来出现异常 liyongde 2025-06-25 10:03:27 +08:00
  • f72fd08c94 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-06-24 11:23:35 +08:00
  • 85115041c8 opt: 加急工单 liyongde 2025-06-24 11:23:16 +08:00
  • eba37aa061 fix:修复下发逻辑，增加一楼补空载具/送满轴/装箱空载具三个任务直接下发逻辑 zhangzq 2025-06-24 11:07:32 +08:00
  • c300f9fdb9 fix:修复下发逻辑，增加一楼补空载具/送满轴/装箱空载具三个任务直接下发逻辑 zhangzq 2025-06-24 11:06:53 +08:00
  • 2a4742421a fix:分切计划改为按照母卷按照数组下发 zhouz 2025-06-24 10:37:46 +08:00
  • eecb2ea9e7 fix: 堆垛机清点位校验、开始线程不判断状态 ls 2025-06-24 10:29:05 +08:00
  • 31b9884281 fix:套轴逻辑SQL优化 zhouz 2025-06-24 09:42:54 +08:00
  • 51f816de93 opt:删除主从配置：WO,WQLCore,WQLObject,DataBaceConfig,ResultBean数据源及数据分装 zhangzq 2025-06-23 10:03:49 +08:00
  • 5e7914c19f opt:优化一件设置 zhangzq 2025-06-22 13:47:32 +08:00
  • 8b05812975 Merge remote-tracking branch 'origin/master_1' into master_merge_0523 zhangzq 2025-06-22 12:49:33 +08:00
  • b0c61ff1ab opt:优化一件设置 zhangzq 2025-06-22 12:49:14 +08:00
  • c611820094 add:增加公共类直接下发逻辑，重写子卷下线下发改直接下发 opt:修改装箱区补空代码，改成查询可用点位生成下发 opt:删除装箱对接行架任务完成后调用补空任务，统一由定时器执行 zhangzq 2025-06-22 12:36:44 +08:00
  • 43ba587817 opt: 备货区检测管芯使用，防止所需要的托盘被搬走 liyongde 2025-06-19 20:11:59 +08:00
  • 13d27fa911 opt: 备货区检测搬运中的管芯数（目前单轴双管是一种规格） liyongde 2025-06-18 13:17:35 +08:00
  • da54fc67ab fix:套轴逻辑SQL优化 zhouz 2025-06-17 18:27:51 +08:00
  • 9781bbcc99 opt: 异常处理无点位创建半条任务2 liyongde 2025-06-17 17:58:39 +08:00
  • 094b7104fc opt: 异常处理无点位创建半条任务 liyongde 2025-06-17 17:49:12 +08:00
  • 02cd276f87 opt: 去掉预分配逻辑\备货区搬运优化（将空托盘自动搬出去）\拔轴桁架任务做完触发半条任务 liyongde 2025-06-17 14:53:29 +08:00
  • 1e82417a81 fix: agv车号更新 ls 2025-06-16 20:33:23 +08:00
  • 8dc996bf2c opt: 加锁处理定时器异步问题 liyongde 2025-06-16 18:53:03 +08:00
  • 240a195be6 fix：修复手动创建指令失败问题 tuqiang 2025-06-16 09:46:55 +08:00
  • 26622ca4bf refactor(mdm): 重构 MDM 数据接口处理逻辑 yangyufu 2025-06-16 09:35:36 +08:00
  • 34cf36c90e opt: 异常处理任务类型 liyongde 2025-06-13 17:24:20 +08:00
  • 52329b209d opt: 套轴优先托盘有管芯、套轴看板优化、看板可直接恢复套轴计划、套轴计划过滤天数 liyongde 2025-06-13 15:34:18 +08:00
  • 409bad5fcb fix:修改所有写死的管制点 zhouz 2025-06-13 15:20:20 +08:00
  • d74f04a80f Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2025-06-13 15:20:10 +08:00
  • c641eedbf3 opt: 提示 liyongde 2025-06-13 10:27:18 +08:00
  • 7936ab91d0 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2025-06-13 10:16:41 +08:00
  • 0530a9fab8 Merge remote-tracking branch 'origin/master_merge' into master_merge zhangzq 2025-06-13 09:58:26 +08:00
  • 9cbeca4e3c fix:管制判断4 zhangzq 2025-06-13 09:58:19 +08:00
  • ec3b2d0854 opt: 时间动态设置 liyongde 2025-06-13 09:56:52 +08:00
  • a3d5593443 fix:管制判断4 zhangzq 2025-06-12 22:53:05 +08:00
  • 36495109cf fix:修改所有写死的管制点 zhouz 2025-06-12 20:11:29 +08:00
  • 58663e44df rev:优化一楼诺宝取货完成交互 tuqiang 2025-06-12 20:09:52 +08:00
  • 25f796e201 opt:优化二次分配锁力度；优化重复申请时直接反馈陈工 zhangzq 2025-06-12 20:02:47 +08:00
  • 473dfb06da feat(wms): 添加 MDM 主数据平台与 LMS 接口功能 Eric 2025-06-12 17:10:23 +08:00
  • 251723507c opt: 套轴计划查询SQL liyongde 2025-06-12 15:37:04 +08:00
  • 285605b151 fix:修改所有写死的管制点 zhouz 2025-06-12 15:04:20 +08:00
  • 031cc72b49 rev：一楼诺宝车取货完成反馈和agv与纸管抓取位交互代码优化 tuqiang 2025-06-12 14:57:51 +08:00
  • 9853d7129e fix:MES同步BOM信息 zhouz 2025-06-12 14:28:18 +08:00
  • 917bf37baa fix:将管制点改为查询点位下拉框 zhouz 2025-06-12 11:19:54 +08:00
  • dbd45a5bf6 rev: 去除重量重复设置 liyongde 2025-06-12 11:16:57 +08:00
  • 18aa216a9b opt: 套轴完成异常处理 liyongde 2025-06-11 19:22:38 +08:00
  • d97e61912e rev:烘箱温度 gengby 2025-06-11 16:55:45 +08:00
  • dfcaeea731 add:套管完成,重量为0，不反馈LMS gengby 2025-06-11 16:44:54 +08:00
  • 1827f702bd add:添加桁架下发信号日志 gengby 2025-06-11 16:44:08 +08:00
  • 81bfb2b213 fix：空木箱入库新增托盘重量校验；分切计划套轴按照创建时间排序；烘箱冷却页面查询修复 zhouz 2025-06-11 14:00:23 +08:00
  • 338257ab9f opt: 套轴异常处理流程 liyongde 2025-06-09 17:18:33 +08:00
  • f413bfeb82 fix: 初始化穿拔轴将预分配清除 liyongde 2025-06-09 15:23:21 +08:00
  • 62cfd39fbe fix: 使用计划代数而非气胀轴库点位 liyongde 2025-06-09 13:11:36 +08:00
  • a1c4ea6a92 opt: 错误看板信息 liyongde 2025-06-06 16:47:26 +08:00
  • e26e5df2a2 opt:送空任务增加空洞校验 zhangzq 2025-06-06 15:20:45 +08:00
  • 566a1db0f5 fix：冷却区查询BUG优化 zhouz 2025-06-06 09:37:10 +08:00
  • 2f4bd64a91 opt: 套轴多次问题修复SQL-判空、过滤组别 liyongde 2025-06-04 17:13:16 +08:00
  • 83e4d5a778 add:增加烘箱冷却区看板 zhangzq 2025-06-04 14:36:31 +08:00
  • de6babd4eb fix：提示优化 zhouz 2025-06-04 14:19:57 +08:00
  • e39b5c0e3b opt: 套轴多次问题修复、看板数据优化、送轴问题优化 liyongde 2025-06-04 13:43:40 +08:00
  • f2ae4b8670 opt: 重复套轴问题 liyongde 2025-06-03 09:14:51 +08:00
  • a4100a9fb0 fix: 不套轴提醒放置看板2 liyongde 2025-05-30 16:08:08 +08:00
  • c70c54794b fix: 不套轴提醒放置看板 liyongde 2025-05-30 16:06:00 +08:00
  • 37aa0bc727 fix：优化B1分切上料，提醒没有可用的冷却区提示逻辑 zhouz 2025-05-30 15:31:43 +08:00
  • 1756706642 fix: bug修复 liyongde 2025-05-30 10:37:07 +08:00
  • d0ba3ac408 fix：修改 zhouz 2025-05-28 16:11:10 +08:00
  • 8fedac67aa feat: 套轴日志看板 liyongde 2025-05-27 20:31:53 +08:00
  • c5a63cd8b6 add:新增与MES用于更新分切计划和订单BOM信息的接口 zhouz 2025-05-26 15:07:43 +08:00
  • 5467a7514c add:增加烘箱冷却区看板 zhangzq 2025-05-25 21:07:15 +08:00
  • 5eca263ff7 init:海亮测试数据库88主85从 zhangzq 2025-05-23 10:45:13 +08:00
  • dd49f0d1fe init:海亮测试数据库88主85从 zhangzq 2025-05-23 09:25:02 +08:00
  • ad7bfbfc7f init:一期二期代码合并 zhangzq 2025-05-22 14:13:19 +08:00
  • 2dfe5f22de Merge remote-tracking branch 'origin/master_merge' into master_1_opt zhangzq 2025-05-22 13:44:35 +08:00
  • 51464a41e3 fix：取货点未qzz_point zhangzq 2025-05-22 11:28:17 +08:00
  • 0b2532edbd add:新增分切暂存维护功能 tuqiang 2025-05-21 16:53:57 +08:00
  • 25f61098cf fix：取货点未qzz_point zhangzq 2025-05-21 15:26:52 +08:00
  • 258109e20a fix：取货点未qzz_point zhangzq 2025-05-20 16:50:05 +08:00
  • df866ae0d1 fix:修复虚拟货位生成只到100的问题 zhangzq 2025-05-20 16:42:48 +08:00
  • 541779da6b Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2025-05-20 14:41:43 +08:00
  • 4da7b42b54 fix:包装关系查询页面客户要求幅宽精度修改 zhouz 2025-05-20 14:41:31 +08:00
  • 2cf482f5f5 fix: 固定sql改为变量传入（暂时不影响） liyongde 2025-05-16 15:50:32 +08:00
  • 7ef22815e7 fix:修复虚拟货位生成只到100的问题 zhangzq 2025-05-14 16:34:57 +08:00
  • c93bda46dd fix:入库全部分配新加仓库标识 zhouz 2025-05-14 16:16:03 +08:00
  • 1b6871cb59 fix:修复虚拟货位生成只到100的问题 zhangzq 2025-05-14 16:11:49 +08:00
  • 4d88480851 add:子卷步骤导出 zhangzq 2025-05-13 15:20:54 +08:00
  • 40addef8a1 rev：1、盘点单不能查询管控库存2、报表幅宽小数点保留1位数 liuxy 2025-05-12 16:19:16 +08:00
  • e4ecd9dd34 rev：1、盘点单不能查询管控库存2、报表幅宽小数点保留1位数 liuxy 2025-05-12 16:15:05 +08:00
  • 1fc76a5042 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-05-10 14:39:44 +08:00
  • 8a1609ae08 add:dto zhangzq 2025-05-10 14:38:50 +08:00
  • be9f8e6f8b Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-05-10 14:29:22 +08:00
  • 52ae7d9b54 fix: 去除测试参数 liyongde 2025-05-10 14:22:55 +08:00
  • 4f2427e086 opt:优化拔轴逻辑优先暂存架排序；add:增加称重异常飞书提醒 zhangzq 2025-05-10 11:13:34 +08:00