10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

update 新料号标签打印，PET、膜材标签模板增加locationcode

Browse Source
This commit is contained in:
18110972313 2025-05-28 13:47:08 +08:00
parent 3301969c33
commit 0699dc27f5
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zi-wms-pda/src/main/java/com/cim/idm/model/LabelParameterObject.java
View File

@ -108,5 +108,5 @@ public class LabelParameterObject {
private String item3; private String item3;
private String item4; private String item4;
private String item5; private String item5;
private String locationcode;
} }

3
zi-wms-pda/src/main/java/com/cim/idm/model/LabelPrintPET.java
View File

@ -54,6 +54,8 @@ public class LabelPrintPET {
private String stageCode; private String stageCode;
//单位 //单位
private String mainUom; private String mainUom;
//库位
private String locationcode;
public List<String> creatLabelPET(){ public List<String> creatLabelPET(){
List<String> labelPETList = new ArrayList<>(); List<String> labelPETList = new ArrayList<>();
@ -80,6 +82,7 @@ public class LabelPrintPET {
labelPETList.add("specifications"); labelPETList.add("specifications");
labelPETList.add("stageCode"); labelPETList.add("stageCode");
labelPETList.add("mainUom"); labelPETList.add("mainUom");
labelPETList.add("locationcode");
return labelPETList; return labelPETList;
} }
} }

32
zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java
View File

@ -1876,9 +1876,12 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
" LN.STAGECODE,\n" + " LN.STAGECODE,\n" +
" LN.DEFINEITEM16,\n" + " LN.DEFINEITEM16,\n" +
" LN.MAINUOM,\n" + " LN.MAINUOM,\n" +
" LN.DEFINEITEM9\n" + " LN.DEFINEITEM9,\n" +
" MP.ERPLOCATION,\n" +
" MP.LOCATIONNAME" +
" FROM\n" + " FROM\n" +
" LABELPRINTINFO LN \n" + " LABELPRINTINFO LN \n" +
" LEFT JOIN MATERIALPACKING MP ON LN.BARCODE = MP.MATERIALPACKINGNAME " +
" LEFT JOIN MATERIALSPEC MS ON LN.MATERIALCODE = MS.MATERIALSPECNAME\n" + " LEFT JOIN MATERIALSPEC MS ON LN.MATERIALCODE = MS.MATERIALSPECNAME\n" +
" WHERE\n" + " WHERE\n" +
" LN.BARCODE =:MATERIALPACKINGNAME "; " LN.BARCODE =:MATERIALPACKINGNAME ";
@ -1900,9 +1903,12 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
"LN.STAGECODE,\n" + "LN.STAGECODE,\n" +
"LN.DEFINEITEM16,\n" + "LN.DEFINEITEM16,\n" +
"LN.MAINUOM,\n" + "LN.MAINUOM,\n" +
"LN.DEFINEITEM9 " + "LN.DEFINEITEM9, " +
" MP.ERPLOCATION,\n" +
" MP.LOCATIONNAME" +
"FROM\n" + "FROM\n" +
"\tLABELPRINTINFO LN \n" + "\tLABELPRINTINFO LN \n" +
" LEFT JOIN MATERIALPACKING MP ON LN.BARCODE = MP.MATERIALPACKINGNAME " +
"WHERE\n" + "WHERE\n" +
"\tLN.BARCODE =:MATERIALPACKINGNAME "; "\tLN.BARCODE =:MATERIALPACKINGNAME ";
} }
@ -1954,6 +1960,10 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
//单位 //单位
String mainUom = queryForListProduct.get(0).get("MAINUOM") == null ? "" : queryForListProduct.get(0).get("MAINUOM").toString(); String mainUom = queryForListProduct.get(0).get("MAINUOM") == null ? "" : queryForListProduct.get(0).get("MAINUOM").toString();
labelPrintPET.setMainUom(mainUom); 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.setWide("");
labelPrintPET.setLength(""); labelPrintPET.setLength("");
labelPrintPET.setLineSpeed(""); labelPrintPET.setLineSpeed("");
@ -1983,7 +1993,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
" m.RECEIVEUSER operater,\n" + " m.RECEIVEUSER operater,\n" +
" m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\n" + " m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\n" +
" m.REMARK remark,TO_CHAR(m.RECEIVETIME,'YYYYMMDD') jumboRollBatch,\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" + " FROM\n" +
" MATERIALPACKING m\n" + " MATERIALPACKING m\n" +
" LEFT JOIN SDK_SPEC ss ON\n" + " LEFT JOIN SDK_SPEC ss ON\n" +
@ -2007,7 +2018,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
" m.RECEIVEUSER operater,\r\n" + " m.RECEIVEUSER operater,\r\n" +
" m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" + " m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" +
" m.REMARK remark,TO_CHAR(m.RECEIVETIME,'YYYYMMDD') jumboRollBatch," " 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" + "FROM\r\n" +
" MATERIALPACKING m\r\n" + " MATERIALPACKING m\r\n" +
"LEFT JOIN SDK_SPEC ss ON\r\n" + "LEFT JOIN SDK_SPEC ss ON\r\n" +
@ -2064,6 +2076,9 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
obj.setMakedate(queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : ""); 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.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() : ""); 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()); 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); labelUrl = labelPrint(obj, requestUrl, pr, params);
@ -2084,7 +2099,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
" m.RECEIVEUSER operater,\r\n" + " m.RECEIVEUSER operater,\r\n" +
" m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" + " m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" +
" m.REMARK remark,TO_CHAR(m.RECEIVETIME,'YYYYMMDD') jumboRollBatch," " 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" + "FROM\r\n" +
" MATERIALPACKING m\r\n" + " MATERIALPACKING m\r\n" +
"LEFT JOIN SDK_SPEC ss ON\r\n" + "LEFT JOIN SDK_SPEC ss ON\r\n" +
@ -2108,7 +2124,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
" m.RECEIVEUSER operater,\r\n" + " m.RECEIVEUSER operater,\r\n" +
" m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" + " m.CHARGE lotNo,NVL(m.suppliername,'') supplierNo,\r\n" +
" m.REMARK remark,TO_CHAR(m.RECEIVETIME,'YYYYMMDD') jumboRollBatch," " 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" + "FROM\r\n" +
" MATERIALPACKING m\r\n" + " MATERIALPACKING m\r\n" +
"LEFT JOIN SDK_SPEC ss ON\r\n" + "LEFT JOIN SDK_SPEC ss ON\r\n" +
@ -2165,6 +2182,9 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
obj.setMakedate(queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : ""); 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.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() : ""); 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()); 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); labelUrl = labelPrint(obj, requestUrl, pr, params);