From 71b82def928777d376a8191f35fab348310c4ebb Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Mon, 26 May 2025 10:36:27 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E6=96=99=E5=8F=B7=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=94=B1?= =?UTF-8?q?MQ=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5=E8=B0=83=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zi-wms-environment/config/db/oracle.properties | 8 ++++---- .../com/cim/idm/controller/StorageController.java | 13 ++++++++++--- .../cim/idm/service/Impl/BSLabelServiceImpl.java | 11 +++++++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/zi-wms-environment/config/db/oracle.properties b/zi-wms-environment/config/db/oracle.properties index 4772909..552d6fc 100644 --- a/zi-wms-environment/config/db/oracle.properties +++ b/zi-wms-environment/config/db/oracle.properties @@ -22,7 +22,7 @@ db.Prd.url=jdbc:oracle:thin:@192.168.1.73:1526/test db.Prd.username=ziwms_sap_test db.Prd.password=adm2024 #MQ -mq.url=192.168.1.73:5672 -mq.username=zimes -mq.password=adm2024 -mq.virtual-host=/zimes \ No newline at end of file +#mq.url=192.168.1.73:5672 +#mq.username=zimes +#mq.password=adm2024 +#mq.virtual-host=/zimes \ No newline at end of file diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java index 6c942d7..19b89e2 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java @@ -94,12 +94,12 @@ public class StorageController { public AjaxResult getLocationName2(@RequestBody JSONObject in ) throws Exception { StorageSpec storageSpec = JSON.toJavaObject(in, StorageSpec.class); - //String erplocation = storageSpec.getErpLocation(); - String erpLocation = storageSpec.getErpLocation(); + String erplocation = storageSpec.getErpLocation(); + //String erpLocation = storageSpec.getErpLocation(); String areaName = ""; // String commitDate = storageSpec.getCommitDate(); //判断条码是否存在且状态是在库 - //String sql = "SELECT m.STORAGENAME ,m.DESCRIPTION || m.STORAGENAME DESCRIPTION FROM STORAGESPEC m WHERE m.ERPLOCATION = :ERPLOCATION ORDER BY STORAGENAME "; + String sql = "SELECT m.STORAGENAME ,m.DESCRIPTION || m.STORAGENAME DESCRIPTION FROM STORAGESPEC m WHERE m.ERPLOCATION = :ERPLOCATION ORDER BY STORAGENAME "; /*String sql = " SELECT\n" + "\tm.STORAGENAME,\n" + "\tm.STORAGENAME || ' ' || m.DESCRIPTION DESCRIPTION \n" + @@ -110,6 +110,7 @@ public class StorageController { "\tAND m.AREANAME =:AREANAME\n" + "ORDER BY\n" + "\tSTORAGENAME ";*/ + /* String sql = " SELECT * FROM ( " + " SELECT\n" + "\tm.STORAGENAME,\n" + @@ -122,6 +123,8 @@ public class StorageController { "ORDER BY\n" + "\tSTORAGENAME" + " ) WHERE ROWNUM <= 50 "; + */ + /* switch (erpLocation) { case "1010": case "1020": @@ -142,9 +145,13 @@ public class StorageController { default : break; } + */ Map bindMap = new HashMap(); + bindMap.put("ERPLOCATION",erplocation); + /* bindMap.put("SITENAME","SDK"); bindMap.put("AREANAME",areaName); + */ List> list = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, bindMap); if(Objects.isNull(list) || list.isEmpty()) { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java index ff07498..989d9e3 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java @@ -1831,7 +1831,7 @@ public class BSLabelServiceImpl extends CommonServiceDAO im String printer = printName == null || "".equals(printName) ? getDefaultPrinter() : printName;// "\\\\ZXYNB10810864P.boe.com.cn\\TSC MA3400P"; String server = "LabelRequestURL"; String requestUrl = getRequestUrlByServer(server); - requestUrl = "0980b551-20a2-49ba-a1e8-950331ff9827"; +// requestUrl = "0980b551-20a2-49ba-a1e8-950331ff9827"; List params = getLabelAssignParameter("testLabel002"); String labelUrl = ""; String labelPath = getLabelAbsolutePath(labelAddress); @@ -1918,7 +1918,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO im labelPrintPET.setStartTime(""); labelPrintPET.setEndTime(""); log.info("***************************PrintLabel Assign params is : " + params.toString()); - labelUrl = labelPrintRabbitMQ(labelPrintPET, requestUrl, pr, params); + //labelUrl = labelPrintRabbitMQ(labelPrintPET, requestUrl, pr, params); + labelUrl = labelPrint(labelPrintPET, requestUrl, pr, params); log.info("***************************PrintLabel Use URL is : " + requestUrl); }else { throw new CustomException(CustomExceptionCode.DATA_NOT_FOUND,"Undefined Execute Type : "); @@ -1994,7 +1995,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO im obj.setSupplierno(queryForListProduct.get(0).get("supplierNo") != null ? queryForListProduct.get(0).get("supplierNo").toString() : ""); obj.setDescription(queryForListProduct.get(0).get("description") != null ? queryForListProduct.get(0).get("description").toString() : ""); log.info("***************************PrintLabel Assign params is : " + params.toString()); - labelUrl = labelPrintRabbitMQ(obj, requestUrl, pr, params); + //labelUrl = labelPrintRabbitMQ(obj, requestUrl, pr, params); + labelUrl = labelPrint(obj, requestUrl, pr, params); log.info("***************************PrintLabel Use URL is : " + requestUrl); }else if ("胶水原材.btw".equals(labelAddress)){ qeuryLabelDatasql = "SELECT\r\n" + @@ -2066,7 +2068,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO im obj.setSupplierno(queryForListProduct.get(0).get("supplierNo") != null ? queryForListProduct.get(0).get("supplierNo").toString() : ""); obj.setDescription(queryForListProduct.get(0).get("description") != null ? queryForListProduct.get(0).get("description").toString() : ""); log.info("***************************PrintLabel Assign params is : " + params.toString()); - labelUrl = labelPrintRabbitMQ(obj, requestUrl, pr, params); + //labelUrl = labelPrintRabbitMQ(obj, requestUrl, pr, params); + labelUrl = labelPrint(obj, requestUrl, pr, params); log.info("***************************PrintLabel Use URL is : " + requestUrl); }else { throw new CustomException(CustomExceptionCode.DATA_NOT_FOUND, "未找到对应的标签模板");