diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java index 6819993..738ccef 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java @@ -30,7 +30,7 @@ public class QMSServiceImpl implements QMSService{ @Autowired QMSHttpUtil qmsHttpUtil; - private static String baseUrl = "http://192.168.1.72:9913"; + private static String baseUrl = "http://172.22.10.221:9913"; /** * 质检信息发送QMS diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java index 1313040..df8de67 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java @@ -353,8 +353,8 @@ public class ToSAPServiceImpl { rcode = returnJsonObject.get("STATUS").toString(); rmsg = returnJsonObject.get("MSGTXT").toString(); if ("S".equals(rcode)) { - undoId2 = returnJsonObject.get("MBLNR") == null ? "" : returnJsonObject.get("MBLNR").toString() - +"_"+returnJsonObject.get("MJAHR") == null ? "" : returnJsonObject.get("MJAHR").toString();//将物料凭证号与凭证年度拼在一起 + undoId2 = returnJsonObject.get("MBLNR1") == null ? "" : returnJsonObject.get("MBLNR1").toString() + +"_"+returnJsonObject.get("MJAHR1") == null ? "" : returnJsonObject.get("MJAHR1").toString();//将物料凭证号与凭证年度拼在一起 } } catch (Exception e) { log.error("WMS请求SAP异常:" + e.getMessage(), e); @@ -375,11 +375,10 @@ public class ToSAPServiceImpl { erplog.setResultCode(rcode); MessageLogUtil.writeMessageLog(erplog); } -// if (!"S".equals(rcode)) { -// throw new RuntimeException("SAP返回" + rmsg); -// } -// return undoId2; - return "5000000755"; + if (!"S".equals(rcode)) { + throw new RuntimeException("SAP返回" + rmsg); + } + return undoId2; } public String FGStockIn2(String RECEIVEACTNO, String user) throws Exception { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java index 1bb9a9c..3be7365 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java @@ -2091,13 +2091,13 @@ public class InvoiceController { "WHERE\r\n" + " m.SHIPREQUESTNAME = :SHIPREQUESTNAME\r\n" + " AND t.MATERIALSPECNAME = :MATERIALSPECNAME\r\n" + - " AND (:SDK_ID IS NULL\r\n" + - " OR t.SDK_ID = :SDK_ID)\r\n" + - " AND (:PHASE IS NULL\r\n" + - " OR t.PHASE = :PHASE)\r\n" + +// " AND (:SDK_ID IS NULL\r\n" + +// " OR t.SDK_ID = :SDK_ID)\r\n" + +// " AND (:PHASE IS NULL\r\n" + +// " OR t.PHASE = :PHASE)\r\n" + " GROUP BY m.SHIPREQUESTTYPE ,\r\n" + " m.SHIPREQUESTDETAILTYPE,\r\n" + - " t.MATERIALSPECNAME,t.SDK_ID,t.PHASE\r\n" + + " t.MATERIALSPECNAME, t.SDK_ID,t.PHASE\r\n" + "ORDER BY\r\n" + " t.MATERIALSPECNAME ,\r\n" + " t.SDK_ID,\r\n" + @@ -2105,8 +2105,8 @@ public class InvoiceController { Map hashMap = new HashMap (); hashMap.put("SHIPREQUESTNAME", shipRequestName); hashMap.put("MATERIALSPECNAME", materialSpecName); - hashMap.put("SDK_ID", sdk_id); - hashMap.put("PHASE", phase); +// hashMap.put("SDK_ID", sdk_id); +// hashMap.put("PHASE", phase); List> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, hashMap); if(Objects.isNull(queryForList) || queryForList.isEmpty()) { return AjaxResult.me().setSuccess(false).setMessage("条码与单据无法匹配！"); @@ -2123,25 +2123,27 @@ public class InvoiceController { com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking selectByKey = MaterialPackingServiceProxy.getMaterialPackingService().selectByKey(materialPackingKey); if ("Assign".equals(type)) { System.out.println("4Y".equals(shipRequestType) + "*****************"); - if ("4Y".equals(shipRequestType)) {//调拨单 - if ( "4Y-Cxx-03".equals(shipRequestDetailType)) { + if ("NLCC".equals(shipRequestType)) {//调拨单 +// if ( "4Y-Cxx-03".equals(shipRequestDetailType)) { if (dy0 < 0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } - } - } else if ("BLSQ4K".equals(shipRequestType)) {//领料 +// } + } else if ("01".equals(shipRequestType)) {//领料 if (dy0 < 0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } - } else if ("CKSQ4I".equals(shipRequestType)) { //其他出库 + } +// else if ("CKSQ4I".equals(shipRequestType)) { //其他出库 +// if (dy0 < 0) {//只能超发一个 +// return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); +// } +// } + else if ("OEM".equals(shipRequestType)) { //委外出库 if (dy0 < 0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } - } else if ("OEM".equals(shipRequestType)) { //委外出库 - if (dy0 < 0) {//只能超发一个 - return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); - } - } else if ("4C".equals(shipRequestType)) { + } else if (shipRequestType.contains("ZLF")) { if (dy0 < 0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("销售不允许超发！"); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java index 4652f13..1e26855 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java @@ -271,30 +271,40 @@ public class PurchaseReturnController { com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking selectByKey = MaterialPackingServiceProxy.getMaterialPackingService().selectByKey(materialPackingKey); if ("Assign".equals(type)) { System.out.println("45".equals(shipRequestType) + "*****************"); - if (dy0 < 0) {//只能超发一个 - return AjaxResult.me().setSuccess(false).setMessage("采购退货不允许超发！"); - } -// if ("4Y".equals(shipRequestType)) {//调拨单 -// if ( "4Y-Cxx-03".equals(shipRequestDetailType)) { -// if (dy0 < 0) {//只能超发一个 -// return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); -// } -// } -// } else if ("BLSQ4K".equals(shipRequestType)) {//领料 -// if (dy0 < 0) {//只能超发一个 -// return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); -// } -// } else if ("CKSQ4I".equals(shipRequestType)) { //其他出库 -// if (dy0 < 0) {//只能超发一个 -// return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); -// } -// } else if ("4C".equals(shipRequestType)) { -// if (dy0 < 0) {//只能超发一个 -// return AjaxResult.me().setSuccess(false).setMessage("销售不允许超发！"); -// } -// }else { -// return AjaxResult.me().setSuccess(false).setMessage("单据类型不正确！"); +// if (dy0 < 0) {//只能超发一个 +// return AjaxResult.me().setSuccess(false).setMessage("采购退货不允许超发！"); // } + if ("NLCC".equals(shipRequestType)) {//调拨单 +// if ( "4Y-Cxx-03".equals(shipRequestDetailType)) { + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); + } +// } + } else if ("01".equals(shipRequestType)) {//领料 + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); + } + } +// else if ("CKSQ4I".equals(shipRequestType)) { //其他出库 +// if (dy0 < 0) {//只能超发一个 +// return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); +// } +// } + else if ("OEM".equals(shipRequestType)) { //委外出库 + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); + } + } else if (shipRequestType.contains("ZLF")) { + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("销售不允许超发！"); + } + } else if ("Z008".equals(shipRequestType)) { + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("采购退货不允许超发！"); + } + }else { + return AjaxResult.me().setSuccess(false).setMessage("单据类型不正确！"); + } } else if ("Dessign".equals(type)) { } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java index a4b593f..ddbb3b8 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java @@ -395,8 +395,8 @@ public class QMSController { } // 将订单的质检结果传给SAP -// String undoId = toSAPService.iqcResultFeekback(sapBoxList,siteName,commonNumber,materialCode,pqcResult,pqcResultDate,user, -// exceptionHandling,specialState); + String undoId = toSAPService.iqcResultFeekback(sapBoxList,siteName,commonNumber,materialCode,pqcResult,pqcResultDate,user, + exceptionHandling,specialState); if(mpList.size()>0) { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java index b113e6a..fa72819 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java @@ -519,28 +519,34 @@ public class SaleOutController { //"SHIPREQUESTDETAILTYPE": "4Y-Cxx-03",//跨组织领料调拨单 //"BLSQ4K".equals(shipRequestType) || "4Y".equals(shipRequestType) || "CKSQ4I".equals(shipRequestType) int dy0 = FminusQty.compareTo(Fzero); - - if ("4Y".equals(shipRequestType)) {//调拨单 - if ( "4Y-Cxx-03".equals(shipRequestDetailType)) { - if (dy0 < 0) {//只能超发一个 - return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); - } - } - } else if ("BLSQ4K".equals(shipRequestType)) {//领料 - if (dy0 < 0) {//只能超发一个 - return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); - } - } else if ("CKSQ4I".equals(shipRequestType)) { //其他出库 - if (dy0 < 0) {//只能超发一个 - return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); - } - } else if ("4C".equals(shipRequestType)) { - if (dy0 <= 0) {//只能超发一个 - return AjaxResult.me().setSuccess(false).setMessage("销售不允许超发！"); - } - }else { - return AjaxResult.me().setSuccess(false).setMessage("单据类型不正确！"); + + if ("NLCC".equals(shipRequestType)) {//调拨单 +// if ( "4Y-Cxx-03".equals(shipRequestDetailType)) { + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } +// } + } else if ("01".equals(shipRequestType)) {//领料 + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); + } + } +// else if ("CKSQ4I".equals(shipRequestType)) { //其他出库 +// if (dy0 < 0) {//只能超发一个 +// return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); +// } +// } + else if ("OEM".equals(shipRequestType)) { //委外出库 + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); + } + } else if (shipRequestType.contains("ZLF")) { + if (dy0 < 0) {//只能超发一个 + return AjaxResult.me().setSuccess(false).setMessage("销售不允许超发！"); + } + }else { + return AjaxResult.me().setSuccess(false).setMessage("单据类型不正确！"); + } try { invoiceServiceImpl.Reserve2(selectByKey, shipRequestName, materialSpecName,"", "", "Assign", "SDK", user,materialQuantity2,"N"); 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 7ed2ae3..a2281e7 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 @@ -83,8 +83,8 @@ public class BSLabelServiceImpl extends CommonServiceDAO im * @author ZXY Team. * @date 2022年5月6日 */ - public String labelPrint(Object data, String requestURL, PrintRequest printRequest,List nameParams) throws CustomException - { + public String labelPrint(Object data, String requestURL, PrintRequest printRequest,List nameParams) throws CustomException + { if (data != null && nameParams.size() > 0) { Map namedDataSources = new HashMap(); Field[] fields = data.getClass().getDeclaredFields(); @@ -115,7 +115,7 @@ public class BSLabelServiceImpl extends CommonServiceDAO im } if (key.toUpperCase().equals(field.getName().toUpperCase())) { field.setAccessible(true); - + if("CREATETIME".equals(field.getName().toUpperCase())) { Timestamp time = null; try { @@ -137,7 +137,7 @@ public class BSLabelServiceImpl extends CommonServiceDAO im namedDataSources.put(key, timeKey); break; } - + try { namedDataSources.put(key, String.valueOf(field.get(data))); } catch (IllegalArgumentException e) { @@ -155,7 +155,7 @@ public class BSLabelServiceImpl extends CommonServiceDAO im Map dataEntryControls = new HashMap<>(); printRequest.setDataEntryControls(dataEntryControls ); } - + ObjectMapper objectMapper = new ObjectMapper(); String labelRequestParameter = ""; try { @@ -178,9 +178,9 @@ public class BSLabelServiceImpl extends CommonServiceDAO im // PrintSuccess result = //PrintSuccess forObject = restTemplate.getForObject(requestURL, PrintSuccess.class, printRequest); // HttpEntity requestEntity = new HttpEntity<>(JSONObject.toJSONString(data), BSLabelServiceImpl.getRequestHeaders()); - // 返回值为BaseEntity实体类，只有一个字段时不用配置请求头也能正常解析，但存在两个字段及以上时会出现415异常（问题未知，有人知道求告知） - - + // 返回值为BaseEntity实体类，只有一个字段时不用配置请求头也能正常解析，但存在两个字段及以上时会出现415异常（问题未知，有人知道求告知） + + HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); HttpEntity entity = new HttpEntity<>(printRequest, headers); @@ -190,24 +190,24 @@ public class BSLabelServiceImpl extends CommonServiceDAO im long endTime = System.currentTimeMillis(); //获取结束时间 String conTime = "程序运行时间：" + (endTime - startTime) + "ms"; log.info("标签打印-批次号:" + printRequest.getNamedDataSources().get("batch") + "的打印时间为" - + conTime +"毫秒"); //输出程序运行时间 + + conTime +"毫秒"); //输出程序运行时间 // log.info("标签打印:"+response.getBody()); bodyinfo = response.getBody(); - + // HttpHeaders headers = new HttpHeaders(); // headers.setContentType(MediaType.APPLICATION_JSON); // HttpEntity httpEntity = new HttpEntity<>(printRequest, headers); // new RestTemplateBuilder().build().exchange(requestURL, "POST", httpEntity, String.class); // PrintSuccess postForObject = new RestTemplateBuilder().build().postForObject(requestURL, httpEntity, PrintSuccess.class, printRequest); // //PrintSuccess postForObject = new RestTemplateBuilder().build().postForObject(requestURL, printRequest, PrintSuccess.class);//requestURL(1)printRequest(2~5) - + } catch (Exception e) { e.printStackTrace(); throw new CustomException(e.getMessage().toString()); } - + return bodyinfo; - + } private void setEventInfo(BSLabel data, EventInfo eventInfo) {