From 0699dc27f5af50b9744a19c666c3ae7edb7662fe Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 28 May 2025 13:47:08 +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=EF=BC=8CPET=E3=80=81=E8=86=9C?= =?UTF-8?q?=E6=9D=90=E6=A0=87=E7=AD=BE=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?locationcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/model/LabelParameterObject.java | 2 +- .../java/com/cim/idm/model/LabelPrintPET.java | 3 ++ .../idm/service/Impl/BSLabelServiceImpl.java | 32 +++++++++++++++---- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/LabelParameterObject.java b/zi-wms-pda/src/main/java/com/cim/idm/model/LabelParameterObject.java index 51cd1f9..a2b9beb 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/LabelParameterObject.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/LabelParameterObject.java @@ -108,5 +108,5 @@ public class LabelParameterObject { private String item3; private String item4; private String item5; - + private String locationcode; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/LabelPrintPET.java b/zi-wms-pda/src/main/java/com/cim/idm/model/LabelPrintPET.java index cf8ed68..c1a6efc 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/LabelPrintPET.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/LabelPrintPET.java @@ -54,6 +54,8 @@ public class LabelPrintPET { private String stageCode; //单位 private String mainUom; + //库位 + private String locationcode; public List creatLabelPET(){ List labelPETList = new ArrayList<>(); @@ -80,6 +82,7 @@ public class LabelPrintPET { labelPETList.add("specifications"); labelPETList.add("stageCode"); labelPETList.add("mainUom"); + labelPETList.add("locationcode"); return labelPETList; } } 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 7d6c49f..edc7c5b 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 @@ -1876,9 +1876,12 @@ public class BSLabelServiceImpl extends CommonServiceDAO im " LN.STAGECODE,\n" + " LN.DEFINEITEM16,\n" + " LN.MAINUOM,\n" + - " LN.DEFINEITEM9\n" + + " LN.DEFINEITEM9,\n" + + " MP.ERPLOCATION,\n" + + " MP.LOCATIONNAME" + " FROM\n" + " LABELPRINTINFO LN \n" + + " LEFT JOIN MATERIALPACKING MP ON LN.BARCODE = MP.MATERIALPACKINGNAME " + " LEFT JOIN MATERIALSPEC MS ON LN.MATERIALCODE = MS.MATERIALSPECNAME\n" + " WHERE\n" + " LN.BARCODE =:MATERIALPACKINGNAME "; @@ -1900,9 +1903,12 @@ public class BSLabelServiceImpl extends CommonServiceDAO im "LN.STAGECODE,\n" + "LN.DEFINEITEM16,\n" + "LN.MAINUOM,\n" + - "LN.DEFINEITEM9 " + + "LN.DEFINEITEM9, " + + " MP.ERPLOCATION,\n" + + " MP.LOCATIONNAME" + "FROM\n" + "\tLABELPRINTINFO LN \n" + + " LEFT JOIN MATERIALPACKING MP ON LN.BARCODE = MP.MATERIALPACKINGNAME " + "WHERE\n" + "\tLN.BARCODE =:MATERIALPACKINGNAME "; } @@ -1954,6 +1960,10 @@ public class BSLabelServiceImpl extends CommonServiceDAO im //单位 String mainUom = queryForListProduct.get(0).get("MAINUOM") == null ? "" : queryForListProduct.get(0).get("MAINUOM").toString(); labelPrintPET.setMainUom(mainUom); + //仓库编码+空格+货位编码 + String erpLocation = queryForListProduct.get(0).get("ERPLOCATION") == null ? "" : queryForListProduct.get(0).get("ERPLOCATION").toString(); + String locationname = queryForListProduct.get(0).get("LOCATIONNAME") == null ? "" : queryForListProduct.get(0).get("LOCATIONNAME").toString(); + labelPrintPET.setLocationcode(erpLocation + " " + locationname); labelPrintPET.setWide(""); labelPrintPET.setLength(""); labelPrintPET.setLineSpeed(""); @@ -1983,7 +1993,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO im " m.RECEIVEUSER operater,\n" + " m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\n" + " m.REMARK remark,TO_CHAR(m.RECEIVETIME,'YYYYMMDD') jumboRollBatch,\n" + - " TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater\n" + + " TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater," + + " m.ERPLOCATION,m.LOCATIONNAME \n" + " FROM\n" + " MATERIALPACKING m\n" + " LEFT JOIN SDK_SPEC ss ON\n" + @@ -2007,7 +2018,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO im " m.RECEIVEUSER operater,\r\n" + " m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" + " m.REMARK remark,TO_CHAR(m.RECEIVETIME,'YYYYMMDD') jumboRollBatch," - + "TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater\r\n" + + + "TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater," + + " m.ERPLOCATION,m.LOCATIONNAME\r\n" + "FROM\r\n" + " MATERIALPACKING m\r\n" + "LEFT JOIN SDK_SPEC ss ON\r\n" + @@ -2064,6 +2076,9 @@ public class BSLabelServiceImpl extends CommonServiceDAO im obj.setMakedate(queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : ""); 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() : ""); + String erpLocation = queryForListProduct.get(0).get("ERPLOCATION") == null ? "" : queryForListProduct.get(0).get("ERPLOCATION").toString(); + String locationName = queryForListProduct.get(0).get("LOCATIONNAME") == null ? "" : queryForListProduct.get(0).get("LOCATIONNAME").toString(); + obj.setLocationcode(erpLocation + " " + locationName); log.info("***************************PrintLabel Assign params is : " + params.toString()); //labelUrl = labelPrintRabbitMQ(obj, requestUrl, pr, params); labelUrl = labelPrint(obj, requestUrl, pr, params); @@ -2084,7 +2099,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO im " m.RECEIVEUSER operater,\r\n" + " m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" + " m.REMARK remark,TO_CHAR(m.RECEIVETIME,'YYYYMMDD') jumboRollBatch," - + "TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater\r\n" + + + "TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater," + + " m.ERPLOCATION,m.LOCATIONNAME\r\n" + "FROM\r\n" + " MATERIALPACKING m\r\n" + "LEFT JOIN SDK_SPEC ss ON\r\n" + @@ -2108,7 +2124,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO im " m.RECEIVEUSER operater,\r\n" + " m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" + " m.REMARK remark,TO_CHAR(m.RECEIVETIME,'YYYYMMDD') jumboRollBatch," - + "TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater\r\n" + + + "TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater," + + " m.ERPLOCATION,m.LOCATIONNAME\r\n" + "FROM\r\n" + " MATERIALPACKING m\r\n" + "LEFT JOIN SDK_SPEC ss ON\r\n" + @@ -2165,6 +2182,9 @@ public class BSLabelServiceImpl extends CommonServiceDAO im obj.setMakedate(queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : ""); 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() : ""); + String erpLocation = queryForListProduct.get(0).get("ERPLOCATION") == null ? "" : queryForListProduct.get(0).get("ERPLOCATION").toString(); + String locationName = queryForListProduct.get(0).get("LOCATIONNAME") == null ? "" : queryForListProduct.get(0).get("LOCATIONNAME").toString(); + obj.setLocationcode(erpLocation + " " + locationName); log.info("***************************PrintLabel Assign params is : " + params.toString()); //labelUrl = labelPrintRabbitMQ(obj, requestUrl, pr, params); labelUrl = labelPrint(obj, requestUrl, pr, params);