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

Commit Graph

  • 0d03a22828 fix:入库确认更新目的点库存时带上库区条件 zhouz 2025-09-19 17:10:01 +08:00
  • 1189a5f162 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2025-09-19 15:26:07 +08:00
  • 8639e276b6 fix:增加入库是否到异常位的系统参数 zhouz 2025-09-19 14:08:28 +08:00
  • e9e0bb5c13 fix:入空木箱高度类型兼容，确认下卷提示ACS内容修改 zhouz 2025-09-19 14:08:28 +08:00
  • 91c03f6b85 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2025-09-19 11:07:36 +08:00
  • 50d0df166e fix:入空木箱高度类型兼容，确认下卷提示ACS内容修改 zhouz 2025-09-19 11:07:20 +08:00
  • d10f6c91e0 feat: 备货区出入库手持功能 liyongde 2025-09-18 14:00:53 +08:00
  • 91fae3177a fix:出库顺序逻辑优化 zhouz 2025-09-18 10:50:29 +08:00
  • 4cade7b1ea fix:子卷质检加锁，绑定托盘时校验该托盘是否有被绑定过 zhouz 2025-09-17 09:57:24 +08:00
  • 35a8e863fe Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-09-16 14:20:09 +08:00
  • cfd64e92e7 opt：套轴、B2入烘箱 liyongde 2025-09-16 14:19:35 +08:00
  • e0a6548d69 add:NDC烘箱对接位放货判断 gengby 2025-09-16 13:10:46 +08:00
  • 78409838dc fix:待检区到管制区任务下发优化、出入烘箱去除插入到表内 zhouz 2025-09-15 17:18:46 +08:00
  • 0fd2500e4f opt：备货区任务校验 liyongde 2025-09-15 09:31:04 +08:00
  • 071dfa6efd fix：修复指令同时创建校验失败问题 tuqiang 2025-09-11 14:59:12 +08:00
  • 139a5c1636 Merge remote-tracking branch 'origin/acs_dev' into acs_dev tuqiang 2025-09-11 13:19:36 +08:00
  • 5f109bded1 新-成品出库查询 添加箱内子卷个数字段 yangyufu 2025-09-10 09:58:03 +08:00
  • 0d02b5ef37 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-09-09 15:49:03 +08:00
  • 0e3f21c27c opt: 去掉测试代码 liyongde 2025-09-09 15:47:15 +08:00
  • 67e8002ffd opt: 备货区优化、拉取子卷优先能释放架子的点位 liyongde 2025-09-09 15:46:08 +08:00
  • 2bcaebfa14 fix:深浅货位被锁定提示优化 zhouz 2025-09-09 13:41:57 +08:00
  • 522abe91c7 fix:B1入烘箱找冷却点统一用定时器去找 zhouz 2025-09-08 17:02:58 +08:00
  • 4d5325bf1b rev:生箔AGV取货手持放行报错 gengby 2025-09-08 09:19:32 +08:00
  • 34e202f81b Merge remote-tracking branch 'origin/acs_dev' into acs_dev tuqiang 2025-09-04 17:42:12 +08:00
  • dde6888074 feat: 异常处理逻辑 liyongde 2025-09-04 17:31:53 +08:00
  • 7dc6402b25 feat: 人工呼叫空轴 liyongde 2025-09-04 13:50:35 +08:00
  • f6499ed20d fix:入冷却回传MES，加上冷却区点位编码 zhouz 2025-09-03 15:46:56 +08:00
  • 2ddc093476 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-09-01 17:36:55 +08:00
  • b5300d584b opt: 锁更改 liyongde 2025-09-01 17:34:42 +08:00
  • 89f9ee10f8 fix:出库校验 zhouz 2025-09-01 17:32:07 +08:00
  • 9927637543 fix:扩容增加校验和日志 zhouz 2025-09-01 16:04:26 +08:00
  • 48a6a2cd22 fix:查询MES NG卷校验优化 zhouz 2025-09-01 10:18:47 +08:00
  • 155db6f8f1 rev：报警信息、子卷码 gengby 2025-08-27 11:15:20 +08:00
  • 81deba8512 fix:分切上料排队 zhouz 2025-08-26 16:46:28 +08:00
  • 867d6ddf4c fix:设备异常优化 zhouz 2025-08-26 13:41:31 +08:00
  • d0df9f415f opt: 套轴完成、申请入缓存的任务校验 liyongde 2025-08-26 10:42:45 +08:00
  • 76ddd010b7 fix:逻辑校验优化 zhouz 2025-08-26 10:09:35 +08:00
  • 8797079f58 add:新增异常设备查询页面 zhouz 2025-08-26 09:40:15 +08:00
  • 7ceae64eef fix:出库校验是否填写物流公司和预估运费 zhouz 2025-08-25 13:48:34 +08:00
  • 00163df4f8 fix:出库校验是否填写物流公司和预估运费 zhouz 2025-08-25 13:42:20 +08:00
  • 2e6c0775b1 fix:入库扩容问题修改 zhouz 2025-08-25 10:10:14 +08:00
  • 3e9551ddc3 fix:异常设备查询页面 zhouz 2025-08-25 09:33:45 +08:00
  • f7d2f15f39 fix:用户设备 zhouz 2025-08-25 08:57:08 +08:00
  • 5bd272e1e6 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2025-08-22 14:04:19 +08:00
  • 3ff49fe4f0 opt: 套轴长度判断、下卷的壁厚长度信息提供 liyongde 2025-08-22 14:03:16 +08:00
  • 266411691e Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2025-08-21 16:18:26 +08:00
  • be0e2f46b1 fix:子卷拼单桁架任务 zhouz 2025-08-21 16:18:17 +08:00
  • b793e40b65 add：枚举 liyongde 2025-08-21 14:10:01 +08:00
  • ad4ff02d40 fix:获取移库单对应的移入货位时，加上并发锁 zhouz 2025-08-19 17:52:36 +08:00
  • 8e7eb4fd05 fix:更改BOM信息时，变更对应的分切计划 zhouz 2025-08-18 15:58:20 +08:00
  • 304dfb9fc1 fix:分切上料排队 zhouz 2025-08-18 09:52:22 +08:00
  • 53717f806d Merge remote-tracking branch 'origin/master_merge_0523' into master_merge_0523 zhouz 2025-08-15 10:20:39 +08:00
  • 7e5f6e140a 合并master1到0523 zhouz 2025-08-15 10:20:10 +08:00
  • 661595c790 fix: 锁细粒度扩大 liyongde 2025-08-07 19:58:32 +08:00
  • 746833151f fix:点位更改 zhouz 2025-07-30 17:26:11 +08:00
  • c45205aff4 fix:巷道移库判断逻辑优化 zhangzq 2025-07-27 23:05:57 +08:00
  • 5c4127c5d5 fix:代码优化 zhouz 2025-07-25 10:01:38 +08:00
  • aed0bdc2d7 fix:包装关系修改不变更状态 master_1 zhouz 2025-07-24 13:39:34 +08:00
  • 20aecf5d73 fix:RGV任务下发异常任务时不需要校验 zhouz 2025-07-23 14:22:24 +08:00
  • 33c8cf5466 rev:优化自动门驱动日志级别 tuqiang 2025-07-22 15:23:25 +08:00
  • 99babf99ac add：新增出库异常口放行功能 tuqiang 2025-07-22 15:17:23 +08:00
  • 741789d332 fix:出库强制确认插入包装关系记录表、NG卷接口修改 zhouz 2025-07-22 14:57:09 +08:00
  • c7492a6cd7 fix:异常入库 zhouz 2025-07-21 08:52:14 +08:00
  • a366af32dd fix:异常出库、NG卷校验 zhouz 2025-07-20 18:49:04 +08:00
  • 4d6344c4bb fix:库存质检字段选取修改 zhouz 2025-07-14 17:57:32 +08:00
  • e65081ae69 fix: 穿拔轴区增加设备异常报警展示 liyongde 2025-07-14 16:15:10 +08:00
  • 47d57d9977 fix:同类木箱兼容问题 zhouz 2025-07-14 15:53:41 +08:00
  • 4a8bfacfae Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2025-07-14 10:40:27 +08:00
  • 40cca955bb fix:同类木箱兼容问题 zhouz 2025-07-14 10:40:12 +08:00
  • dd1ba4810e opt:修正定时任务配置未生效问题 DESKTOP-5DIJMF9\admin 2025-07-11 17:55:30 +08:00
  • f6cbfb876f fix: 人工呼叫套轴 liyongde 2025-07-11 14:33:13 +08:00
  • e849b87eb2 删除多余连接查询 yangyufu 2025-07-10 13:58:53 +08:00
  • b3833d52ce fix(wms): 修复出库查询中箱子材质信息问题 - 在子查询中添加 box_type 字段 - 新增与 md_me_materialbase 表的左连接，获取材质名称 - 移除 bst_ivt_boxinfo 表的左连接，不再使用箱型信息 yangyufu 2025-07-10 13:57:31 +08:00
  • 13ea603036 perf(query): 优化出库查询 SQL 语句 yangyufu 2025-07-10 09:39:35 +08:00
  • d36b4811d9 feat(wms): 退货出库查询页面添加日期范围选择功能- 引入 DateRangePicker组件用于选择日期范围 - 添加 udOperation 组件以支持更新和删除操作 yangyufu 2025-07-10 09:22:41 +08:00
  • d43f56f741 feat(wms): 出库查询列表添加木箱编码和木箱描述字段 yangyufu 2025-07-10 09:05:05 +08:00
  • 1b49ffcb2e feat(wms): 出库查询新增木箱编码和木箱描述字段 zhouz 2025-07-10 09:00:02 +08:00
  • be2459d5b5 fix:出库任务被占用，提示优化 zhouz 2025-07-10 09:00:02 +08:00
  • 4a1b8ac17a Revert "feat(wms): 出库查询新增木箱编码和木箱描述字段" zhouz 2025-07-10 14:55:34 +08:00
  • a89e7507fd feat(wms): 出库查询新增木箱编码和木箱描述字段 zhouz 2025-07-10 09:00:02 +08:00
  • 5cf38152f9 fix:出库任务被占用，提示优化 zhouz 2025-07-10 09:00:02 +08:00
  • 8243742007 fix: 反收卷下卷异常 liyongde 2025-07-08 18:29:05 +08:00
  • 6451957b9f add：添加输送线指令号丢失日志 tuqiang 2025-07-08 17:38:25 +08:00
  • 39d780ad5c opt: 添加日志 liyongde 2025-07-07 16:03:48 +08:00
  • 03c0f641c4 opt: 校验点位可用 liyongde 2025-07-07 13:37:25 +08:00
  • 8be4276360 opt: 1 liyongde 2025-07-03 14:03:30 +08:00
  • a1d219ec6b opt: 卷号添加到任务里 liyongde 2025-07-02 17:03:49 +08:00
  • b03a153d1a fix: 日志反馈 ls 2025-07-02 11:18:41 +08:00
  • 56285ab21c opt: 看板加急字段显示 liyongde 2025-07-02 10:26:22 +08:00
  • dbbc2a2987 fix:出库双通排序更改，扩容IP修改 zhouz 2025-07-01 20:21:59 +08:00
  • c795358f06 Merge remote-tracking branch 'origin/master_merge_0523' into master_merge_0523 zhouz 2025-06-30 22:09:59 +08:00
  • f5a5c4b390 fix:分切计划推送优化、出库左出右出排序更改 zhouz 2025-06-30 22:09:46 +08:00
  • 2ff9549ce5 add:增加单据锁及一件设置并发锁 zhangzq 2025-06-30 21:53:56 +08:00
  • 67d5dca6fd opt:newcode,redisson锁报错 zhangzq 2025-06-30 12:07:20 +08:00
  • db61709c4f opt:druid版本 zhangzq 2025-06-30 12:01:26 +08:00
  • d4a77d71f6 fix:修改配置文件jdbc驱动 zhangzq 2025-06-30 10:44:05 +08:00
  • 0af5ee4292 fix:newcode端口 zhangzq 2025-06-30 10:33:04 +08:00
  • d30e25a8cd opt: 备货区、送轴（去除分切计划状态校验） liyongde 2025-06-30 10:30:34 +08:00
  • f78b2a76df fix:下发调度问题 zhangzq 2025-06-30 10:25:51 +08:00
  • c1cda9da0e fix:下发调度问题 zhangzq 2025-06-30 10:20:56 +08:00