update 新料号标签打印，PET、膜材标签模板增加locationcode
This commit is contained in:
parent
3301969c33
commit
0699dc27f5
@ -108,5 +108,5 @@ public class LabelParameterObject {
|
||||
private String item3;
|
||||
private String item4;
|
||||
private String item5;
|
||||
|
||||
private String locationcode;
|
||||
}
|
||||
|
||||
@ -54,6 +54,8 @@ public class LabelPrintPET {
|
||||
private String stageCode;
|
||||
//单位
|
||||
private String mainUom;
|
||||
//库位
|
||||
private String locationcode;
|
||||
|
||||
public List<String> creatLabelPET(){
|
||||
List<String> labelPETList = new ArrayList<>();
|
||||
@ -80,6 +82,7 @@ public class LabelPrintPET {
|
||||
labelPETList.add("specifications");
|
||||
labelPETList.add("stageCode");
|
||||
labelPETList.add("mainUom");
|
||||
labelPETList.add("locationcode");
|
||||
return labelPETList;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1876,9 +1876,12 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user