From 66b59eaa8e3b65bab6a48adf3f851a76b068a157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Tue, 13 May 2025 19:28:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=A4=87?= =?UTF-8?q?=E8=B4=A7=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/MaterialShipRequestDetail.java | 17 ++++++++-- .../idm/service/impl/ToSAPServiceImpl.java | 1 + .../idm/controller/CheckMarkController.java | 31 +++++++++++-------- .../idm/controller/CheckPlanController.java | 2 +- .../idm/controller/SAPToWMSController.java | 3 ++ .../cim/idm/controller/SaleOutController.java | 2 +- .../idm/service/Impl/InvoiceServiceImpl.java | 5 +-- 7 files changed, 42 insertions(+), 19 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 f8fe323..9b6dba5 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 @@ -187,6 +187,20 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo private String supplierNO; @UserColumnMark private String erpFactory; + @UserColumnMark + private String deliveryAddress; + @UserColumnMark + private String auart; + + public String getDeliveryAddress() { + return deliveryAddress; + } + + public void setDeliveryAddress(String deliveryAddress) { + this.deliveryAddress = deliveryAddress; + } + + public String getAuart() { return auart; @@ -196,8 +210,7 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo this.auart = auart; } - @UserColumnMark - private String auart; + public String getSaleOutQuantity() { return saleOutQuantity; 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 178263a..e855f37 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 @@ -5851,6 +5851,7 @@ public class ToSAPServiceImpl { erplog.setEventName("盘点"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/CheckMarkController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/CheckMarkController.java index 676efb1..a612e21 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/CheckMarkController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/CheckMarkController.java @@ -140,29 +140,34 @@ public class CheckMarkController { String erpLocation = sr_erp.get(i).get("ERPLOCATION").toString(); bindMap.put("ERPLOCATION", erpLocation); //查找盘亏的批次 - String sql_pk = " SELECT a.*,ABS(DifferenceQuantity)NUM FROM (\r\n" + + String sql_pk = " SELECT a.*,ABS(DifferenceQuantity)NUM FROM (\r\n" + " SELECT c.MATERIALPACKINGNAME,c.MATERIALSPECNAME,m.UNIT,c.ERPLOCATION,c.SYSLOCATION,m.ERPFACTORY,\r\n" + " NVL( c.MATERIALQUANTITY,0) AS MATERIALQUANTITY,NVL(c2.MATERIALQUANTITY, 0) AS MATERIALACTQUANTITY, \r\n" + " (NVL(c2.MATERIALQUANTITY, 0) -c.MATERIALQUANTITY) AS DifferenceQuantity,c.CHECKPLATATE,c.CHECKPLANSTATE,\r\n" + - " m.CHARGE ,m.SDK_ID ,m.PHASE ,TO_CHAR(m.EXPIRINGDATE, 'YYYY-MM-DD HH24:MI:SS') expdate,\r\n" + - " TO_CHAR(m.MAKEDATE, 'YYYY-MM-DD HH24:MI:SS') proddate,TO_CHAR(SYSDATE, 'YYYY-MM-DD HH24:MI:SS') indate\r\n" + - " FROM CHECKPLAN c\r\n" + - " LEFT JOIN MATERIALPACKING m ON c.MATERIALPACKINGNAME=m.MATERIALPACKINGNAME \r\n" + - " LEFT JOIN CHECKRECORD c2 ON c.CHECKPLANNAME = c2.CHECKPLANNAME AND c.ERPLOCATION = c2.ERPLOCATION \r\n" + - " AND c.MATERIALPACKINGNAME = c2.MATERIALPACKINGNAME AND c.SYSLOCATION = c2.ACTLOCATION\r\n" + - " WHERE c.CHECKPLANNAME =:CHECKPLANNAME AND c.PLANDATE = :PLANDATE AND c.ERPLOCATION=:ERPLOCATION)A\r\n" + + " m.CHARGE ,m.SDK_ID ,m.PHASE ,TO_CHAR(m.EXPIRINGDATE, 'YYYY-MM-DD HH24:MI:SS') expdate,\r\n" + + " TO_CHAR(m.MAKEDATE, 'YYYY-MM-DD HH24:MI:SS') proddate,TO_CHAR(SYSDATE, 'YYYY-MM-DD HH24:MI:SS') indate\r\n" + + " FROM CHECKPLAN c\r\n" + + " LEFT JOIN MATERIALPACKING m ON c.MATERIALPACKINGNAME=m.MATERIALPACKINGNAME \r\n" + + " LEFT JOIN CHECKRECORD c2 ON c.CHECKPLANNAME = c2.CHECKPLANNAME AND c.ERPLOCATION = c2.ERPLOCATION \r\n" + + " AND c.MATERIALPACKINGNAME = c2.MATERIALPACKINGNAME AND c.SYSLOCATION = c2.ACTLOCATION\r\n" + + " WHERE c.CHECKPLANNAME =:CHECKPLANNAME AND c.PLANDATE = :PLANDATE AND c.ERPLOCATION=:ERPLOCATION)A\r\n" + " WHERE DifferenceQuantity<0 AND nvl(CHECKPLATATE,'是')='是' AND nvl(CHECKPLANSTATE,'N')<>'Approved' "; List> sr_pk = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql_pk, bindMap); - if(sr_pk.size()>0) + if(sr_pk.size()>0) { //调用SAP接口 billCode=toSAPServiceImpl.qtcrNoInvoiceForCheckPlan(sr_pk, "qtc", user, commitDate,opCode,costName); + + if("".equals(billCode) || billCode == null) { + return AjaxResult.me().setErrorCode(500).setSuccess(false).setMessage("SAP过账失败"); + } + //更新盘点计划状态 - String sql = "UPDATE CHECKPLAN c SET CHECKPLANSTATE = 'Approved' WHERE PLANDATE = :PLANDATE AND CHECKPLANNAME = :CHECKPLANNAME AND ERPLOCATION=:ERPLOCATION"; + String sql = "UPDATE CHECKPLAN c SET CHECKPLANSTATE = 'Approved' WHERE PLANDATE = :PLANDATE AND CHECKPLANNAME = :CHECKPLANNAME AND ERPLOCATION=:ERPLOCATION"; IDMFrameServiceProxy.getSqlTemplate().update(sql, bindMap); //更新批次状态 List mpkList=new ArrayList<>(); - for(int j=0;j bindMap = new HashMap(); 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 e62c405..224c0b4 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 @@ -1292,6 +1292,7 @@ public class SAPToWMSController { String xloek= MapUtils.getString(item, "xloek"); // 删除标识 String auart= MapUtils.getString(item, "AUART"); // 接收生产订单类型 返工ZP05 复卷ZP01 + String lifnr= MapUtils.getString(item, "LIFNR"); // MaterialShipRequestDetail mrd =new MaterialShipRequestDetail(); @@ -1403,6 +1404,8 @@ public class SAPToWMSController { bindMapItem.put("phase", phase); bindMapItem.put("saleOutQuantity", 0); bindMapItem.put("auart", auart); + bindMapItem.put("deliveryAddress", lifnr); + if("07".equals(shipRequestType) || "03".equals(shipRequestType)) { 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 f3e4744..091ab89 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 @@ -364,7 +364,7 @@ public class SaleOutController { // return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); // } // } - else if ("OEM".equals(shipRequestType)) { //委外出库 + else if ("OEM".equals(shipRequestType) || "08".equals(shipRequestType)) { //委外出库 if ((allQty.subtract(minusQty)).compareTo(minQty)>0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java index 1f3a7bd..2e6cd02 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java @@ -2581,7 +2581,8 @@ public class InvoiceServiceImpl implements InvoiceService { String undoId = ""; String rmsg = null; String sql="SELECT \r\n" + - " MS.DELIVERYADDRESS, \r\n" + +// " MS.DELIVERYADDRESS, \r\n" + + " MD.DELIVERYADDRESS, \r\n" + // 取详情 " MP.MATERIALSPECNAME, \r\n" + " MP.ERPFACTORY, \r\n" + " MP.ERPLOCATION, \r\n" + @@ -2613,7 +2614,7 @@ public class InvoiceServiceImpl implements InvoiceService { " AND MP.STOCKSTATE = 'Stocked'\r\n" + " AND mp.MATERIALPACKINGNAME IN (:BOXLIST)\r\n" + " GROUP BY \r\n" + - " MS.DELIVERYADDRESS, \r\n" + + " MD.DELIVERYADDRESS, \r\n" + " MP.MATERIALSPECNAME, \r\n" + " MP.ERPFACTORY, \r\n" + " MP.ERPLOCATION, \r\n" +