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

update 新料号标签打印，标签模板新旧料号修改

Browse Source
This commit is contained in:
18110972313 2025-05-30 09:36:38 +08:00
parent 6a66846be6
commit ee1708c0df
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1935,7 +1935,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
//订单号 //订单号
labelPrintPET.setProductRequestName(queryForListProduct.get(0).get("SOURCEORDER") == null ? "" : queryForListProduct.get(0).get("SOURCEORDER").toString()); labelPrintPET.setProductRequestName(queryForListProduct.get(0).get("SOURCEORDER") == null ? "" : queryForListProduct.get(0).get("SOURCEORDER").toString());
//品名 //品名
labelPrintPET.setProductName(queryForListProduct.get(0).get("MATERIALNAME") == null ? "" : queryForListProduct.get(0).get("MATERIALNAME").toString()); String materialName = queryForListProduct.get(0).get("MATERIALNAME") == null ? "" : queryForListProduct.get(0).get("MATERIALNAME").toString();
labelPrintPET.setProductName(materialName);
//等级 //等级
labelPrintPET.setLotGrade(queryForListProduct.get(0).get("DEFINEITEM17") == null ? "" : queryForListProduct.get(0).get("DEFINEITEM17").toString()); labelPrintPET.setLotGrade(queryForListProduct.get(0).get("DEFINEITEM17") == null ? "" : queryForListProduct.get(0).get("DEFINEITEM17").toString());
//厚度 //厚度
@ -1949,8 +1950,9 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
//接头 //接头
labelPrintPET.setJoint(queryForListProduct.get(0).get("DEFINEITEM18") == null ? "" : queryForListProduct.get(0).get("DEFINEITEM18").toString()); labelPrintPET.setJoint(queryForListProduct.get(0).get("DEFINEITEM18") == null ? "" : queryForListProduct.get(0).get("DEFINEITEM18").toString());
//料号 //料号
String materialSpecNameNc = queryForListProduct.get(0).get("MATERIALSPECNAMENC") == null ? "" : queryForListProduct.get(0).get("MATERIALSPECNAMENC").toString();
String materialCode = queryForListProduct.get(0).get("MATERIALCODE") == null ? "" : queryForListProduct.get(0).get("MATERIALCODE").toString(); String materialCode = queryForListProduct.get(0).get("MATERIALCODE") == null ? "" : queryForListProduct.get(0).get("MATERIALCODE").toString();
labelPrintPET.setProductSpecName(materialCode); labelPrintPET.setProductSpecName(materialSpecNameNc);
//阶段 //阶段
String stageCode = queryForListProduct.get(0).get("STAGECODE") == null ? "" : queryForListProduct.get(0).get("STAGECODE").toString(); String stageCode = queryForListProduct.get(0).get("STAGECODE") == null ? "" : queryForListProduct.get(0).get("STAGECODE").toString();
labelPrintPET.setStageCode(stageCode); labelPrintPET.setStageCode(stageCode);
@ -1973,8 +1975,7 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
//NC料号编码+'-'+货位编码 //NC料号编码+'-'+货位编码
String erpLocation = queryForListProduct.get(0).get("ERPLOCATION") == null ? "" : queryForListProduct.get(0).get("ERPLOCATION").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(); String locationname = queryForListProduct.get(0).get("LOCATIONNAME") == null ? "" : queryForListProduct.get(0).get("LOCATIONNAME").toString();
String materialSpecNameNc = queryForListProduct.get(0).get("MATERIALSPECNAMENC") == null ? "" : queryForListProduct.get(0).get("MATERIALSPECNAMENC").toString(); labelPrintPET.setLocationcode(materialCode + "-" + locationname);
labelPrintPET.setLocationcode(materialSpecNameNc + "-" + locationname);
labelPrintPET.setWide(""); labelPrintPET.setWide("");
labelPrintPET.setLength(""); labelPrintPET.setLength("");
labelPrintPET.setLineSpeed(""); labelPrintPET.setLineSpeed("");
@ -2005,7 +2006,7 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
" 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," + " TO_CHAR(MAKEDATE,'YYYYMMDD') makedate, TO_CHAR(EXPIRINGDATE,'YYYYMMDD') expdate ,m.RECEIVEUSER opreater," +
" m.ERPLOCATION,m.LOCATIONNAME," + " m.ERPLOCATION," +
" CASE " + " CASE " +
" WHEN m.LOCATIONNAME IS NULL OR TRIM(m.LOCATIONNAME) = '' THEN m.ERPLOCATION " + " WHEN m.LOCATIONNAME IS NULL OR TRIM(m.LOCATIONNAME) = '' THEN m.ERPLOCATION " +
" ELSE m.LOCATIONNAME" + " ELSE m.LOCATIONNAME" +
@ -2056,11 +2057,15 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
qeuryLabelMap.put("MATERIALPACKINGNAME", MATERIALPACKINGNAME); qeuryLabelMap.put("MATERIALPACKINGNAME", MATERIALPACKINGNAME);
queryForListProduct = IDMFrameServiceProxy.getSqlTemplate().queryForList(qeuryLabelDatasql, qeuryLabelMap); queryForListProduct = IDMFrameServiceProxy.getSqlTemplate().queryForList(qeuryLabelDatasql, qeuryLabelMap);
obj.setBarcode(queryForListProduct.get(0).get("barcode") != null ? queryForListProduct.get(0).get("barcode").toString() : ""); obj.setBarcode(queryForListProduct.get(0).get("barcode") != null ? queryForListProduct.get(0).get("barcode").toString() : "");
obj.setMakedate(queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : ""); String makedate = queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : "";
obj.setExpdate(queryForListProduct.get(0).get("expdate") != null ? queryForListProduct.get(0).get("expdate").toString() : ""); obj.setMakedate(formatDateStr(makedate));
String expdate = queryForListProduct.get(0).get("expdate") != null ? queryForListProduct.get(0).get("expdate").toString() : "";
obj.setExpdate(formatDateStr(expdate));
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() : "");
// private String partNo; // private String partNo;
obj.setPartNo(queryForListProduct.get(0).get("partNo") != null ? queryForListProduct.get(0).get("partNo").toString() : ""); String erpState = queryForListProduct.get(0).get("ERPSTATE") == null ? "" : queryForListProduct.get(0).get("ERPSTATE").toString();
String partNo = queryForListProduct.get(0).get("partNo") != null ? queryForListProduct.get(0).get("partNo").toString() : "";
obj.setPartNo(erpState);
// private String state; // private String state;
obj.setState(queryForListProduct.get(0).get("state") != null ? queryForListProduct.get(0).get("state").toString() : ""); obj.setState(queryForListProduct.get(0).get("state") != null ? queryForListProduct.get(0).get("state").toString() : "");
// private String sdkSpec; // private String sdkSpec;
@ -2077,6 +2082,7 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
// private String qty; // private String qty;
obj.setQty(queryForListProduct.get(0).get("qty") != null ? queryForListProduct.get(0).get("qty").toString() : ""); obj.setQty(queryForListProduct.get(0).get("qty") != null ? queryForListProduct.get(0).get("qty").toString() : "");
// private String orderNo; // private String orderNo;
obj.setOrderNo(queryForListProduct.get(0).get("orderNo") != null ? queryForListProduct.get(0).get("orderNo").toString() : ""); obj.setOrderNo(queryForListProduct.get(0).get("orderNo") != null ? queryForListProduct.get(0).get("orderNo").toString() : "");
obj.setSourceOrder(queryForListProduct.get(0).get("sourceOrder") != null ? queryForListProduct.get(0).get("sourceOrder").toString() : ""); obj.setSourceOrder(queryForListProduct.get(0).get("sourceOrder") != null ? queryForListProduct.get(0).get("sourceOrder").toString() : "");
obj.setPiece(queryForListProduct.get(0).get("piece") != null ? queryForListProduct.get(0).get("piece").toString() : ""); obj.setPiece(queryForListProduct.get(0).get("piece") != null ? queryForListProduct.get(0).get("piece").toString() : "");
@ -2095,13 +2101,13 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
obj.setRemark(queryForListProduct.get(0).get("remark") != null ? queryForListProduct.get(0).get("remark").toString() : ""); obj.setRemark(queryForListProduct.get(0).get("remark") != null ? queryForListProduct.get(0).get("remark").toString() : "");
obj.setRemarks(queryForListProduct.get(0).get("remarks") != null ? queryForListProduct.get(0).get("remarks").toString() : ""); obj.setRemarks(queryForListProduct.get(0).get("remarks") != null ? queryForListProduct.get(0).get("remarks").toString() : "");
// obj.setJumboRollBatch(queryForList.get(0).get("jumboRollBatch") != null ? queryForList.get(0).get("jumboRollBatch").toString() : ""); // obj.setJumboRollBatch(queryForList.get(0).get("jumboRollBatch") != null ? queryForList.get(0).get("jumboRollBatch").toString() : "");
obj.setMakedate(queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : ""); obj.setMakedate(formatDateStr(makedate));
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 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(); String locationName = queryForListProduct.get(0).get("LOCATIONNAME") == null ? "" : queryForListProduct.get(0).get("LOCATIONNAME").toString();
String erpState = queryForListProduct.get(0).get("ERPSTATE") == null ? "" : queryForListProduct.get(0).get("ERPSTATE").toString();
obj.setLocationcode(erpState + "-" + locationName); obj.setLocationcode(partNo + "-" + 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);
@ -2174,11 +2180,15 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
qeuryLabelMap.put("MATERIALPACKINGNAME", MATERIALPACKINGNAME); qeuryLabelMap.put("MATERIALPACKINGNAME", MATERIALPACKINGNAME);
queryForListProduct = IDMFrameServiceProxy.getSqlTemplate().queryForList(qeuryLabelDatasql, qeuryLabelMap); queryForListProduct = IDMFrameServiceProxy.getSqlTemplate().queryForList(qeuryLabelDatasql, qeuryLabelMap);
obj.setBarcode(queryForListProduct.get(0).get("barcode") != null ? queryForListProduct.get(0).get("barcode").toString() : ""); obj.setBarcode(queryForListProduct.get(0).get("barcode") != null ? queryForListProduct.get(0).get("barcode").toString() : "");
obj.setMakedate(queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : ""); String makedate = queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : "";
obj.setExpdate(queryForListProduct.get(0).get("expdate") != null ? queryForListProduct.get(0).get("expdate").toString() : ""); obj.setMakedate(formatDateStr(makedate));
String expdate = queryForListProduct.get(0).get("expdate") != null ? queryForListProduct.get(0).get("expdate").toString() : "";
obj.setExpdate(formatDateStr(expdate));
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() : "");
// private String partNo; // private String partNo;
obj.setPartNo(queryForListProduct.get(0).get("partNo") != null ? queryForListProduct.get(0).get("partNo").toString() : ""); String partNo = queryForListProduct.get(0).get("partNo") != null ? queryForListProduct.get(0).get("partNo").toString() : "";
String erpState = queryForListProduct.get(0).get("ERPSTATE") == null ? "" : queryForListProduct.get(0).get("ERPSTATE").toString();
obj.setPartNo(erpState);
// private String state; // private String state;
obj.setState(queryForListProduct.get(0).get("state") != null ? queryForListProduct.get(0).get("state").toString() : ""); obj.setState(queryForListProduct.get(0).get("state") != null ? queryForListProduct.get(0).get("state").toString() : "");
// private String sdkSpec; // private String sdkSpec;
@ -2213,13 +2223,13 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> im
obj.setRemark(queryForListProduct.get(0).get("remark") != null ? queryForListProduct.get(0).get("remark").toString() : ""); obj.setRemark(queryForListProduct.get(0).get("remark") != null ? queryForListProduct.get(0).get("remark").toString() : "");
obj.setRemarks(queryForListProduct.get(0).get("remarks") != null ? queryForListProduct.get(0).get("remarks").toString() : ""); obj.setRemarks(queryForListProduct.get(0).get("remarks") != null ? queryForListProduct.get(0).get("remarks").toString() : "");
// obj.setJumboRollBatch(queryForList.get(0).get("jumboRollBatch") != null ? queryForList.get(0).get("jumboRollBatch").toString() : ""); // obj.setJumboRollBatch(queryForList.get(0).get("jumboRollBatch") != null ? queryForList.get(0).get("jumboRollBatch").toString() : "");
obj.setMakedate(queryForListProduct.get(0).get("makedate") != null ? queryForListProduct.get(0).get("makedate").toString() : ""); obj.setMakedate(formatDateStr(makedate));
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 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(); String locationName = queryForListProduct.get(0).get("LOCATIONNAME") == null ? "" : queryForListProduct.get(0).get("LOCATIONNAME").toString();
String erpState = queryForListProduct.get(0).get("ERPSTATE") == null ? "" : queryForListProduct.get(0).get("ERPSTATE").toString();
obj.setLocationcode(erpState + " " + locationName); obj.setLocationcode(partNo + "-" + 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);