From e6b315c7e14102adf3835249f3112234e5c4720b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Wed, 21 May 2025 14:19:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BB=A5=E4=BB=93=E5=BA=93=E7=BC=96=E7=A0=81=EF=BC=8C=E8=B4=A7?= =?UTF-8?q?=E4=BD=8D=E7=BC=96=E7=A0=81=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml index d4224be..185d2ef 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml @@ -30,6 +30,7 @@ AND a.ERPLOCATION = #{dto.erpLocation} + ORDER BY a.ERPLOCATION,a.STORAGENAME + WITH + AA AS ( + SELECT + m5.RECEIVEREQUESTNAME, + m5.MATERIALSPECNAME, + SUM( m5.MATERIALQUANTITY ) QTY + FROM + MATERIALPACKING m5 + WHERE + m5.STOCKSTATE IN ( 'Stocked', 'StockOut' ) + AND m5.RECEIVEREQUESTNAME IN ( #{deliveryName} ) + GROUP BY + m5.MATERIALSPECNAME, + m5.RECEIVEREQUESTNAME + ), + + + BB AS ( + SELECT + m5.RECEIVEREQUESTNAME, + m5.MATERIALSPECNAME, + SUM( m5.MATERIALQUANTITY ) QTY + FROM + MATERIALPACKING m5 + WHERE + m5.STOCKSTATE = 'Created' + AND m5.RECEIVEREQUESTNAME IN ( #{deliveryName} ) + GROUP BY + m5.MATERIALSPECNAME, + m5.RECEIVEREQUESTNAME + ), + + CC AS ( + SELECT + m5.DELIVERYNAME RECEIVEREQUESTNAME, + m5.MATERIALSPECNAME , + SUM( m5.DELIVERYNUM ) QTY + FROM + MATERIALDELIVERYRECEIVE m5 + WHERE + m5.DELIVERYNAME IN ( #{deliveryName} ) + GROUP BY + m5.DELIVERYNAME, + m5.MATERIALSPECNAME + ), + + DELIVERY AS ( + SELECT DISTINCT DELIVERYNAME, md.MATERIALSPECNAME, + TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) RECEIVETIME, + TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) MAKEDATE, + '1' RECEIVEREQUESTDETAILNAME, + m.SITENAME, + m.ERPLOCATION, + m.LOCATIONNAME, + m.MATERIALUNIT, + m.SDK_ID, + m.REMARK REMARK, + m.SALESMAN SALESPERSON, + m.SALESASSISTANT CAREER_ASSISTANCE, + m.BUSINESSDIVISION BUSINESS_UNIT, + COALESCE( m2.STOCKORGNO, m.ERPFACTORY ) AS ERPFACTORY, + m2.SUPPLIERNO, + --m.POCATEGORY, + m3.WIDTH AS DESCRIPTION, + m3.MATERIALUNITDESC, + m3.WIDTH SPECNAME, + m3.PHASE, + m3.DESC_CN, + DECODE( m3.IS_BATCH, 'Y', '是', '否' ) IS_BATCH, + CASE WHEN m3.EXPIRATION_RULES = '0' THEN + '入厂保质期' + WHEN m3.EXPIRATION_RULES = '1' THEN + '出厂保质期' ELSE '未定义' + END AS REPLACED_VALUE, + DECODE( m4.IQCFLAG, 'Y', '是', '否' ) IQCFLAG, + be.DESCRIPTION AS ERPLOCATION2, + o.ORGNAME AS ERPFACTORY2, + sss.DESCRIPTION AS LOCATIONNAME2 FROM MATERIALDELIVERYRECEIVE md + LEFT JOIN MATERIALRECEIVEREQUEST m2 ON md.RECEIVEREQUESTNAME = m2.RECEIVEREQUESTNAME + LEFT JOIN MATERIALRECEIVEREQUESTDETAIL m ON md.RECEIVEREQUESTNAME = m.RECEIVEREQUESTNAME + AND md.RECEIVEREQUESTDETAILNAME = m.RECEIVEREQUESTDETAILNAME + LEFT JOIN MATERIALSPEC m3 ON md.MATERIALSPECNAME = m3.MATERIALSPECNAME + LEFT JOIN BS_MATERIALFACTORY m4 ON m3.MATERIALSPECNAME = m4.MATERIALSPECNAME AND m2.ERPFACTORY = m4.ERPFACTORY + LEFT JOIN BS_ERPLOCATION be ON m.ERPLOCATION = be.ERPLOCATIONNAME + LEFT JOIN ORG o ON m2.STOCKORGNO = o.ORGNO + LEFT JOIN STORAGESPEC sss ON m.LOCATIONNAME = sss.STORAGENAME + WHERE md.DELIVERYNAME = #{deliveryName}) + + SELECT M.DELIVERYNAME, M.MATERIALSPECNAME, + M.RECEIVETIME, + M.MAKEDATE, + M.RECEIVEREQUESTDETAILNAME, + M.SITENAME, + M.ERPLOCATION, + M.LOCATIONNAME, + M.MATERIALUNIT, + M.SDK_ID, + M.REMARK, + M.SALESPERSON, + M.CAREER_ASSISTANCE, + M.BUSINESS_UNIT, + M.ERPFACTORY, + M.SUPPLIERNO, + M.DESCRIPTION, + M.MATERIALUNITDESC, + M.SPECNAME, + M.PHASE, + M.DESC_CN, + M.IS_BATCH, + M.REPLACED_VALUE, + M.IQCFLAG, + M.ERPLOCATION2, + M.ERPFACTORY2, + M.LOCATIONNAME2,AA.QTY RECEIVEDQUANTITY2,BB.QTY RECEIVEDQUANTITY, CC.QTY REQUESTQUANTITY, (CC.QTY - BB.QTY) MINUSQTY, AA.QTY STOCKINQTY, BB.QTY CREATEQTY FROM DELIVERY M + LEFT JOIN AA ON M.DELIVERYNAME = AA.RECEIVEREQUESTNAME AND M.MATERIALSPECNAME = AA.MATERIALSPECNAME + LEFT JOIN BB ON M.DELIVERYNAME = BB.RECEIVEREQUESTNAME AND M.MATERIALSPECNAME = BB.MATERIALSPECNAME + LEFT JOIN CC ON M.DELIVERYNAME = CC.RECEIVEREQUESTNAME AND M.MATERIALSPECNAME = CC.MATERIALSPECNAME + WHERE M.DELIVERYNAME = #{deliveryName} + \ No newline at end of file From 0ca68b71424d0f196f3dee92eece3886ab467355 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 18:32:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?update=20=E7=89=A9=E6=96=99=E6=B6=88?= =?UTF-8?q?=E8=80=97=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8A=A5=E6=96=87=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cim/idm/controller/SAPToWMSController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 e034f95..05578a0 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 @@ -2303,7 +2303,12 @@ public class SAPToWMSController { @ApiOperation(value = "物料消耗") @RequestMapping("/sapwms_materialconsume_request") public WMSToSAPReturn sapMaterialConsume_Request(HttpServletRequest httpRequest, @RequestBody SAPToWMSRequest request) { - Map head = request.getHEAD(); + //Map head = request.getHEAD(); + Map head = new HashMap<>(); + head.put("INTF_ID",request.getHEAD().get("INTFID")); + head.put("SRC_SYSTEM",request.getHEAD().get("SRCMSGID")); + head.put("DEST_SYSTEM","WMS"); + head.put("SRC_MSGID","PP103"); //开启事务 IDMFrameServiceProxy.getTransactionManager().beginTransaction(); try { From ca8cc399ccf826d33bbf802d84d7bb28cbf4211d Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 18:46:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=89=B9=E6=AC=A1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cim/idm/dao/DeliveryDao.java | 7 +++++++ .../idm/service/Impl/DeliveryServiceImpl.java | 2 +- .../resources/com/cim/idm/dao/DeliveryDao.xml | 20 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java index 1798356..0d64c45 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java @@ -145,4 +145,11 @@ public interface DeliveryDao { @Param("nameList") List nameList, @Param("typeList") List typeList, @Param("deliveryName") String deliveryName); + + /** + * 获取入库批次 + */ + @MapKey("storeCharge") + List> getStoreChargeSort(@Param("siteName") String siteName, + @Param("documentName") String documentName); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java index 69b7174..61e25ca 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java @@ -151,7 +151,7 @@ public class DeliveryServiceImpl implements IDeliveryService { List> storeDetail = deliveryDao.getDeliveryStoreDetail(siteName, nameList, ReceiveTypeEnums.getPurchase(), deliveryName); receiveDetailVo.setStoreDetail(storeDetail); // 批次 - List> storeCharge = deliveryDao.getStoreCharge(siteName, documentName); + List> storeCharge = deliveryDao.getStoreChargeSort(siteName, documentName); receiveDetailVo.setStoreCharge(storeCharge); return receiveDetailVo; } diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml index b0924de..a3eb8a9 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml @@ -481,4 +481,24 @@ LEFT JOIN CC ON M.DELIVERYNAME = CC.RECEIVEREQUESTNAME AND M.MATERIALSPECNAME = CC.MATERIALSPECNAME WHERE M.DELIVERYNAME = #{deliveryName} + \ No newline at end of file From b44c92939cfbb7b8f1517dbf430c58d73d0bd4ad Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 18:51:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9MES=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=B6=88=E8=80=97=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java index a244163..c56b3c4 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java @@ -138,7 +138,7 @@ public class MESToWMSServiceImpl implements MESToWMSService { errorCode = stringObjectMap.get("V_RETURN_CODE").toString(); String vReturnMessage = stringObjectMap.get("V_RETURN_MESSAGE").toString(); log.error("MES_CONSUME返回错误码：" + errorCode + "，错误信息：" + vReturnMessage); - result = AjaxResult.me().setErrorCode(Integer.parseInt(errorCode)).setMessage(vReturnMessage); + result = AjaxResult.me().setSuccess(false).setErrorCode(400).setMessage(vReturnMessage); return result; } }