From fd57b85e898b55af3cf4cf201fab0721823ab08f Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 9 Jan 2024 09:02:24 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/T2.java | 44 -------- .../wms/ext/acs/service/AcsToWmsService.java | 2 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 3 - .../jm/service/impl/JmToWmsServiceImpl.java | 9 +- .../src/main/resources/logback-spring.xml | 1 - .../src/main/resources/logback2.xml | 101 ------------------ .../src/main/resources/test.xml | 28 ----- 7 files changed, 7 insertions(+), 181 deletions(-) delete mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/T2.java delete mode 100644 wms/hd/nladmin-system/src/main/resources/logback2.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/test.xml diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/T2.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/T2.java deleted file mode 100644 index 862daf2..0000000 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/T2.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.nl.wms; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.springframework.http.HttpStatus; - -import java.util.Hashtable; - -public class T2 { - public static void main(String[] args) { - Hashtable l=new Hashtable(); - l.put("k",1); - JSONObject mst = new JSONObject(); - mst.put("stor_code", "001"); - mst.put("interface_bill_code", "1123"); - mst.put("stor_biz_date", "2021-09-15"); - mst.put("bill_type", "01"); - - JSONArray dtl = new JSONArray(); - JSONObject dtlObj = new JSONObject(); - dtlObj.put("material_code", "1.1.01.01.KHTY01"); - dtlObj.put("material_name", "分切纸带"); - dtlObj.put("material_spec", "0.25*4200*8"); - dtlObj.put("unit_code", "T01"); - dtlObj.put("unit_name", "台"); - dtlObj.put("qty", "20"); - dtlObj.put("pcsn", "20210915"); - dtlObj.put("remark", "备注"); - dtl.add(dtlObj); - - JSONObject result = new JSONObject(); - result.put("mst", mst); - result.put("dtl", dtl); - System.out.println(result.toString()); - - JSONObject a = new JSONObject(); - a.put("status", HttpStatus.OK.value()); - a.put("message", "操作成功"); - a.put("data", "123"); - System.out.println(a.toString()); - System.out.println(DateUtil.now()); - } -} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 89f9679..445be54 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -18,7 +18,7 @@ public interface AcsToWmsService { * ACS客户端--->WMS服务端 * ACS向WMS反馈任务状态 * - * @param jsonObject 条件 + * @param string 条件 * @return Map */ diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 7471d68..af82e07 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -298,9 +298,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { WQLObject.getWQLObject("st_buss_emptyvehiclerecord").insert(jo); if (StrUtil.equals(point_code, "BHMDDW") || StrUtil.equals(point_code, "JZDDW01")) { inEmptyVehicleTask.findNextPoint(); - /* JSONObject taskObj = WQLObject.getWQLObject("sch_base_task").query("task_uuid='" + task_uuid + "' and task_status <'" + TaskStatusEnum.START_AND_POINT.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(taskObj)){ - }*/ inEmptyVehicleTask.renotifyAcs(task_uuid); } JSONObject result = new JSONObject(); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/jm/service/impl/JmToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/jm/service/impl/JmToWmsServiceImpl.java index 62014e8..1968320 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/jm/service/impl/JmToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/jm/service/impl/JmToWmsServiceImpl.java @@ -122,14 +122,16 @@ public class JmToWmsServiceImpl implements JmToWmsService { jsonDtl.put("remark", ""); String stor_code = dtlObj.getString("stor_code"); String sect_uuid = ""; + + //保护膜存储区 if (StrUtil.isNotEmpty(stor_code) && stor_code.equals("01")) { sect_uuid = "a464ae812f1747149318ad2848a77400"; } + //聚酯膜存储区 if (StrUtil.isNotEmpty(stor_code) && stor_code.equals("02")) { sect_uuid = "40b6289b759f4d6a99b09c411d27403e"; } jsonDtl.put("sect_uuid", sect_uuid); - //TODO jsonDtl.put("sect_uuid",""); 库区怎么写 dtlTab.insert(jsonDtl); } @@ -189,9 +191,12 @@ public class JmToWmsServiceImpl implements JmToWmsService { String stor_code = dtlObj.getString("stor_code"); String sect_uuid = ""; + + //保护膜存储区 if (StrUtil.isNotEmpty(stor_code) && stor_code.equals("01")) { sect_uuid = "a464ae812f1747149318ad2848a77400"; } + //聚酯膜存储区 if (StrUtil.isNotEmpty(stor_code) && stor_code.equals("02")) { sect_uuid = "40b6289b759f4d6a99b09c411d27403e"; } @@ -316,7 +321,6 @@ public class JmToWmsServiceImpl implements JmToWmsService { if (ObjectUtil.isEmpty(jsonIvt)) { log.info("JM数据库未发现条形码为{}的仓位", barcode); continue; - } //创建质检单 @@ -373,7 +377,6 @@ public class JmToWmsServiceImpl implements JmToWmsService { } } JSONObject result = new JSONObject(); - //result.put("status", HttpStatus.OK.value()); result.put("status", 200); result.put("message", "任务状态反馈成功!"); result.put("data", new JSONObject()); diff --git a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml index 5e92f52..0c32a8a 100644 --- a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -16,7 +16,6 @@ https://juejin.cn/post/6844903775631572999 - diff --git a/wms/hd/nladmin-system/src/main/resources/logback2.xml b/wms/hd/nladmin-system/src/main/resources/logback2.xml deleted file mode 100644 index 6516f51..0000000 --- a/wms/hd/nladmin-system/src/main/resources/logback2.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - nlAdmin - - - - - - - - - - - - ${LOG_HOME}/%d{yyyy-MM-dd}.log - - 30 - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - 20MB - - - - - - - - - ${LOG_HOME}/%d{yyyy-MM-dd}.log - - 30 - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - 20MB - - - - - - - ${log.pattern} - ${log.charset} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/test.xml b/wms/hd/nladmin-system/src/main/resources/test.xml deleted file mode 100644 index de1cf04..0000000 --- a/wms/hd/nladmin-system/src/main/resources/test.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - ${LOG_HOME}/AutoCreateInst/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - -