From 4b68ad11ce677f134a46e183ca1fa7ee081b4431 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 17 May 2023 18:17:19 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E9=94=81=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/modules/system/util/CodeUtil.java | 6 ++++-- .../st/outbill/service/impl/CheckOutBillServiceImpl.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java index 3a7ff5a09..969ce5163 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java @@ -2,18 +2,20 @@ package org.nl.modules.system.util; import org.nl.modules.system.service.GenCodeService; import org.nl.modules.system.service.impl.GenCodeServiceImpl; +import org.nl.modules.wql.util.SpringContextHolder; +import org.springframework.boot.SpringApplication; import java.util.HashMap; public class CodeUtil { public static String getNewCode(String ruleCode){ - GenCodeService service=new GenCodeServiceImpl(); + GenCodeService bean = SpringContextHolder.getBean(GenCodeService.class); String flag = "1"; HashMap map = new HashMap<>(); map.put("flag",flag); map.put("code",ruleCode); - return service.codeDemo(map); + return bean.codeDemo(map); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 39b0f1dea..c5c5c1388 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -3660,11 +3660,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); String struct_code = json.getString("struct_code"); + String vehicle_code = json.getString("storagevehicle_code"); - JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06')").uniqueResult(0); - JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status in ('05','06')").uniqueResult(0); + JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06','07') and vehicle_code = '"+vehicle_code+"'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonTask1) || ObjectUtil.isNotEmpty(jsonTask2)) { + if (ObjectUtil.isNotEmpty(jsonTask1)) { } else { result.add(json);