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

update 新料号标签打印页面，由MQ改为直接调打印机

Browse Source
This commit is contained in:
18110972313 2025-05-26 10:36:27 +08:00
parent 8290916c8d
commit 71b82def92
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zi-wms-environment/config/db/oracle.properties
View File

@ -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
#mq.url=192.168.1.73:5672
#mq.username=zimes
#mq.password=adm2024
#mq.virtual-host=/zimes

13
zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java
View File

@ -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<String, Object> bindMap = new HashMap<String, Object>();
bindMap.put("ERPLOCATION",erplocation);
/*
bindMap.put("SITENAME","SDK");
bindMap.put("AREANAME",areaName);
*/
List<Map<String,Object>> list = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, bindMap);
if(Objects.isNull(list) || list.isEmpty()) {

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

@ -1831,7 +1831,7 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> 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<String> params = getLabelAssignParameter("testLabel002");
String labelUrl = "";
String labelPath = getLabelAbsolutePath(labelAddress);
@ -1918,7 +1918,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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<BSLabelKey, BSLabel> 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, "未找到对应的标签模板");