From 016af18df61e79ee2f1c527b5d6402c708382e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Tue, 13 May 2025 10:58:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9qms=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/data/MaterialShipRequestDetail.java | 13 ++++++++++++- .../com/cim/idm/controller/NoChargeStockIn.java | 8 ++++---- .../java/com/cim/idm/controller/QMSController.java | 2 +- .../com/cim/idm/controller/SAPToWMSController.java | 4 ++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java index fb0181d..f8fe323 100644 --- a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java +++ b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java @@ -15,7 +15,7 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo private double requestQuantity; private double assignedQuantity; - + private String posid; @@ -188,6 +188,17 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo @UserColumnMark private String erpFactory; + public String getAuart() { + return auart; + } + + public void setAuart(String auart) { + this.auart = auart; + } + + @UserColumnMark + private String auart; + public String getSaleOutQuantity() { return saleOutQuantity; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java index 5dcd438..d6e772c 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java @@ -253,12 +253,12 @@ public class NoChargeStockIn { for (MaterialReceiveRequest request : requests) { String billcode = null; // 采购订单 - if (ReceiveTypeEnums.isPurchase(request.getReceiveRequestType())) { +// if (ReceiveTypeEnums.isPurchase(request.getReceiveRequestType())) { Map args = new HashMap<>(); billcode = toSAPServiceImpl.PurStockIn(request.getReceiveRequestName(), siteName, user, args,commitDate); - }else { - billcode = toSAPServiceImpl.SaleReturn(request.getReceiveRequestName(), siteName, user, commitDate, opCode); - } +// }else { +// billcode = toSAPServiceImpl.SaleReturn(request.getReceiveRequestName(), siteName, user, commitDate, opCode); +// } // @TODO 其他类型 if (billcode == null || "".equals(billcode)) { return AjaxResult.me().setErrorCode(500).setSuccess(false).setMessage("SAP过账失败"); 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 c7fee64..d79365b 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 @@ -472,7 +472,7 @@ public class QMSController { } } } else if ("1".equals(tpType) || "2".equals(tpType) || "3".equals(tpType) || "4".equals(tpType) || "5".equals(tpType) || "7".equals(tpType)) {//料号+批次 - String kcsql = "SELECT M.SITENAME ,M.MATERIALPACKINGNAME FROM MATERIALPACKING M " + String kcsql = "SELECT M.SITENAME ,M.MATERIALPACKINGNAME,M.OQARESULT FROM MATERIALPACKING M " + "WHERE M.CHARGE = :BATCH AND M.MATERIALSPECNAME = :MATERIALSPECNAME"; Map hashMap = new HashMap (); hashMap.put("BATCH", commonNumber); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java index ff29a33..e62c405 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java @@ -1291,6 +1291,7 @@ public class SAPToWMSController { String ummat = MapUtils.getString(item, "UMMAT"); // 形态转换->目标物料类型 String xloek= MapUtils.getString(item, "xloek"); // 删除标识 + String auart= MapUtils.getString(item, "AUART"); // 接收生产订单类型 返工ZP05 复卷ZP01 MaterialShipRequestDetail mrd =new MaterialShipRequestDetail(); @@ -1401,6 +1402,8 @@ public class SAPToWMSController { bindMapItem.put("goalMaterialSpec", ummat); bindMapItem.put("phase", phase); bindMapItem.put("saleOutQuantity", 0); + bindMapItem.put("auart", auart); + if("07".equals(shipRequestType) || "03".equals(shipRequestType)) { bindMapItem.put("receiveRequestDetailType", shipRequestType); // 原单号 @@ -1482,6 +1485,7 @@ public class SAPToWMSController { bindMapItem.put("goalMaterialSpec", ummat); bindMapItem.put("phase", phase); bindMapItem.put("saleOutQuantity", 0); + bindMapItem.put("auart", auart); nonPrimaryKeyValueInfo.setUserColumns(bindMapItem); EventInfo eventInfo = new EventInfo();