From a3d55934431fbbfe76fb3b3f0864eecad617308d Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 12 Jun 2025 22:53:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E7=AE=A1=E5=88=B6=E5=88=A4=E6=96=AD4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java | 2 +- lms/nladmin-system/src/main/resources/config/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java index 3d1084c41..6febc44af 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java @@ -84,7 +84,7 @@ public class AutoSendDjqToGzq extends Prun{ //todo 新增NG卷放置临时管制区135136，只取空不补空 List ivtLists = gzqPackageinfoivtList.stream() - .filter(r -> r.getPoint_status().equals(4)) + .filter(r -> r.getPoint_status().equals("4")) .collect(Collectors.toList()); if (ObjectUtils.isEmpty(ivtLists)) { log.info("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name()); diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index a9fc87884..a435e1108 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: From ec3b2d0854fb8b424ccbdf1defb556da4d241422 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 13 Jun 2025 09:56:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?opt:=20=E6=97=B6=E9=97=B4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dao/mapper/PdmBiSlittingproductionplanMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml index 685998c9f..36d9f4ee3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml @@ -25,7 +25,7 @@ AND p.is_delete = '0' AND IFNULL(p.up_or_down, '') ]]> '' AND IFNULL(p.left_or_right, '') ]]> '' - AND DATE (p.start_time) >= DATE_SUB(CURDATE(), INTERVAL 0 DAY) + AND DATE (p.start_time) >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY) AND IFNULL(p.parent_container_name, '') ]]> '' AND '1' = ( SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name ) GROUP BY From 9cbeca4e3c85c791a758b3b04ee44db04544ef03 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 13 Jun 2025 09:58:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E7=AE=A1=E5=88=B6=E5=88=A4=E6=96=AD4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java index 6febc44af..4638707fb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java @@ -84,7 +84,7 @@ public class AutoSendDjqToGzq extends Prun{ //todo 新增NG卷放置临时管制区135136，只取空不补空 List ivtLists = gzqPackageinfoivtList.stream() - .filter(r -> r.getPoint_status().equals("4")) + .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status())) .collect(Collectors.toList()); if (ObjectUtils.isEmpty(ivtLists)) { log.info("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name());