From e9514e252df6744dcd1aaae79de9b33d37957238 Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Mon, 31 Mar 2025 14:30:15 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat=20=E5=90=88=E5=B9=B6=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/com/cim/idm/dao/DeliveryDao.xml | 53 +++++++++++++------
 1 file changed, 36 insertions(+), 17 deletions(-)

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 d119825..eb921e5 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
@@ -49,22 +49,31 @@
                     #{name}
                 </foreach>
             GROUP BY m5.MATERIALSPECNAME, m5.RECEIVEREQUESTNAME, m5.SDK_ID, m5.phase
+        ),
+        MAIN AS (
+            SELECT m.MATERIALSPECNAME,
+            SUM( m.REQUESTQUANTITY ) REQUESTQUANTITY,
+            SUM( m.RECEIVEDQUANTITY ) RECEIVEDQUANTITY,
+            SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS RECEIVEDQUANTITY2,
+            SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS MINUSQTY
+            FROM MATERIALRECEIVEREQUESTDETAIL m
+            WHERE RECEIVEREQUESTNAME in
+            <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
+                #{name}
+            </foreach>
+            GROUP BY m.MATERIALSPECNAME
         )
-        SELECT m3.WIDTH AS DESCRIPTION, be.DESCRIPTION AS ERPLOCATION2, m.ERPLOCATION, o.ORGNAME AS ERPFACTORY2,
-                m2.STOCKORGNO AS ERPFACTORY, sss.DESCRIPTION AS LOCATIONNAME2, m.LOCATIONNAME, m2.SUPPLIERNO,
-                '1' RECEIVEREQUESTDETAILNAME, SUM( m.REQUESTQUANTITY ) REQUESTQUANTITY, SUM( m.RECEIVEDQUANTITY ) RECEIVEDQUANTITY,
-                SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS RECEIVEDQUANTITY2,
-                SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS MINUSQTY, NVL( MAX( BB.QTY ), 0 ) CREATEQTY,
-                NVL( MAX( AA.QTY ), 0 ) STOCKINQTY, m3.DESC_CN, m.MATERIALUNIT, M3.MATERIALUNITDESC,
-                CASE WHEN m3.EXPIRATION_RULES = '0' THEN '入厂保质期'
-                    WHEN m3.EXPIRATION_RULES = '1' THEN '出厂保质期' ELSE '未定义'
-                    END AS REPLACED_VALUE,
-                m.SDK_ID, m3.WIDTH SPECNAME, m3.PHASE, m.MATERIALSPECNAME, m.SITENAME, m.RECEIVEREQUESTNAME,
-                DECODE( m3.IS_BATCH, 'Y', '是' ， '否' ) IS_BATCH, '是' IS_BATCH, DECODE( m4.IQCFLAG, 'Y', '是' ， '否' ) IQCFLAG,
-                max( m.REMARK ) REMARK, max( m.SALESMAN ) SALESPERSON, max( m.SALESASSISTANT ) CAREER_ASSISTANCE,
-                max( m.BUSINESSDIVISION ) BUSINESS_UNIT, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) RECEIVETIME,
-                TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) MAKEDATE
-        FROM MATERIALRECEIVEREQUESTDETAIL m
+        SELECT distinct MAIN.*, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) RECEIVETIME, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) MAKEDATE, '1' RECEIVEREQUESTDETAILNAME, '是' IS_BATCH,
+        m.MATERIALSPECNAME, 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,
+        m2.STOCKORGNO AS ERPFACTORY, m2.SUPPLIERNO,
+        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,
+        NVL( BB.QTY, 0 ) CREATEQTY, NVL( AA.QTY, 0 ) STOCKINQTY
+        FROM MAIN
+        LEFT JOIN MATERIALRECEIVEREQUESTDETAIL m ON MAIN.MATERIALSPECNAME = m.MATERIALSPECNAME
         LEFT JOIN MATERIALRECEIVEREQUEST m2 ON m.RECEIVEREQUESTNAME = m2.RECEIVEREQUESTNAME
         LEFT JOIN MATERIALSPEC m3 ON m.MATERIALSPECNAME = m3.MATERIALSPECNAME
         LEFT JOIN BS_MATERIALFACTORY m4 ON m.MATERIALSPECNAME = m4.MATERIALSPECNAME AND m.ERPFACTORY = m4.ERPFACTORY
@@ -118,14 +127,24 @@
     </select>
 
     <select id="getByKey" resultType="com.cim.idm.model.MaterialReceiveRequest">
-        SELECT *
+        SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
+               OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
+               LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
+               ERPID, REMARK, PURCHASER, PURORGNO, ORDERDATE, CLOSERUSER, CLOSEDATE, STOCKORGNO, RETURNFLAG,
+               RECEIVEREQUESTDETAILTYPE, ERPLOCATION, PRODUCTDEPTNO, SOURCEBILLID, EFFECTIVESTARTTIME, EFFECTIVEENDTIME,
+               DELIVERYNAME
         FROM MATERIALRECEIVEREQUEST
         WHERE SITENAME = #{siteName}
         AND RECEIVEREQUESTNAME = #{receiveRequestName}
     </select>
 
     <select id="getReceiveByDelivery" resultType="com.cim.idm.model.MaterialReceiveRequest">
-        SELECT *
+        SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
+               OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
+               LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
+               ERPID, REMARK, PURCHASER, PURORGNO, ORDERDATE, CLOSERUSER, CLOSEDATE, STOCKORGNO, RETURNFLAG,
+               RECEIVEREQUESTDETAILTYPE, ERPLOCATION, PRODUCTDEPTNO, SOURCEBILLID, EFFECTIVESTARTTIME, EFFECTIVEENDTIME,
+               DELIVERYNAME
         FROM MATERIALRECEIVEREQUEST
         WHERE SITENAME = #{siteName}
         AND DELIVERYNAME = #{receiveRequestName}

From 27d7b880a9eb32ffe0c3f9175391acc2a3780f9f Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Mon, 31 Mar 2025 14:31:16 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat=20=E5=88=B0=E8=B4=A7=E5=8D=95=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idm/controller/DeliveryController.java    | 10 ++++
 .../MaterialReceiveActController.java         | 13 +++++
 .../java/com/cim/idm/dao/DeliveryDao.java     | 14 +++++
 .../java/com/cim/idm/model/DeliveryDto.java   |  3 +
 .../cim/idm/model/DeliveryRelationDto.java    | 13 +++++
 .../model/MaterialReceiveRequestDetail.java   | 56 +++++++++++++++++++
 .../com/cim/idm/service/IDeliveryService.java |  8 +++
 .../idm/service/Impl/DeliveryServiceImpl.java | 17 ++++--
 .../resources/com/cim/idm/dao/DeliveryDao.xml | 29 ++++++++--
 9 files changed, 155 insertions(+), 8 deletions(-)
 create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java
 create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
index 0641f98..5f08688 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
@@ -70,4 +70,14 @@ public class DeliveryController {
 		// 获取采购单明细及批次
 		return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getStoreDetail(siteName, nameList));
 	}
+
+	/**
+	 * 获取采购订单详情
+	 */
+	@PostMapping(value = "/getReceiveDetail")
+	public AjaxResult getReceiveDetail(@RequestBody JSONObject in) {
+		List<String> nameList = (List<String>) in.get("nameList");
+		// 获取采购订单详情
+		return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getReceiveDetail(nameList));
+	}
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
index 6380791..64197d0 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.cim.idm.service.Impl.SDKMaterialPackingServiceImpl;
 
@@ -175,7 +176,19 @@ public class MaterialReceiveActController {
 		String receiveActNo = box.getReceiveActNo();
 		String receiveQty = box.getRECEIVEDQUANTITY2();//实收数量
 		String receiveRequestDetailName = box.getReceiveRequestDetailName();
+		// 单据
 		String receiveRequestName = box.getReceiveRequestName();
+		// 判断是否是倒库单据
+		MaterialReceiveRequest byKey = deliveryService.getByKey(boxs.getSiteName(), boxs.getReceiveRequestName());
+		if (byKey.getReceiveRequestType().equals(ReceiveTypeEnums.DK.getCode())) {
+			// 检索该到库订单下该物料的采购订单的 name
+			List<MaterialReceiveRequest> collect = deliveryService.getReceiveByDelivery(boxs.getSiteName(), boxs.getReceiveRequestName())
+					.stream().filter(item -> item.getMaterialSpecName().equals(materialSpecName)).collect(Collectors.toList());
+			// 检查剩余数量
+//			if () {
+//
+//			}
+		}
 		String remark = box.getRemark();
 		String sdkid = box.getSdkid() == null ? "" : box.getSdkid();
 		String shipRequestDetailName = box.getShipRequestDetailName();
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 adc54fc..a964aa2 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
@@ -1,6 +1,8 @@
 package com.cim.idm.dao;
 
+import com.cim.idm.model.DeliveryRelationDto;
 import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.MaterialReceiveRequestDetail;
 import com.cim.idm.model.PurchaseDto;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
@@ -21,6 +23,11 @@ public interface DeliveryDao {
                        @Param("receiveRequestName") String receiveRequestName,
                        @Param("receiveRequestType") String receiveRequestType );
 
+    /**
+     * 新增到货单关系
+     */
+    int createRelation(@Param("receiveList") List<DeliveryRelationDto> receiveList);
+
     /**
      * 绑定采购订单 的 到货单
      */
@@ -59,4 +66,11 @@ public interface DeliveryDao {
      */
     List<MaterialReceiveRequest> getReceiveByDelivery(@Param("siteName") String siteName,
                                       @Param("receiveRequestName") String receiveRequestName);
+
+    /**
+     * 根据到库单获取采购单名称
+     * @param nameList 到库单
+     * @return 采购单名称列表
+     */
+    List<MaterialReceiveRequestDetail> getReceiveDetail(@Param("nameList") List<String> nameList);
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java
index 2defff3..14eeea1 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java
@@ -15,4 +15,7 @@ public class DeliveryDto {
 
 	// 数据
 	private List<MaterialReceiveRequestKey> dataList;
+
+	// 数据
+	private List<DeliveryRelationDto> receiveList;
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java
new file mode 100644
index 0000000..eeb4a71
--- /dev/null
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java
@@ -0,0 +1,13 @@
+package com.cim.idm.model;
+
+import lombok.Data;
+
+@Data
+public class DeliveryRelationDto {
+	// 到库单名称
+	private String deliveryName;
+	// 到库数量
+	private Integer deliveryNum = 0;
+	// 采购单名称
+	private String receiveRequestName;
+}
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java b/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java
new file mode 100644
index 0000000..cd39960
--- /dev/null
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java
@@ -0,0 +1,56 @@
+package com.cim.idm.model;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class MaterialReceiveRequestDetail {
+
+	private String siteName;
+	private String receiveRequestName;
+	private String receiveRequestDetailName;
+	private String pocategory; // 对应SAP PSTYPE
+	private String receiveRequestDetailType;  //对应SAP KNTTP
+	private String materialSpecName;
+	private String description;
+	private double requestQuantity;
+	private double receivedQuantity;
+	private String erpLocation;
+	private String locationName;
+	private String erpFactory;
+	private String returnFlag;
+	private String freeFlag;
+	private String forceCompletedFlag;
+	private String receiveRequestDetailState;
+	private String holdState;
+	private String iqcFlag;
+	private Timestamp planDate;
+	private String createUser;
+	private Timestamp createTime;
+	private String lastEventName;
+	private String lastEventTimeKey;
+	private Timestamp lastEventTime;
+	private String lastEventUser;
+	private String lastEventComment;
+	private String innerOrder;//内部订单号20190806
+	private String charge;
+	private String applicant;
+	private String erpPoName;
+	private String erpPoDetailName;
+	private String innerFlag;
+	//众凌定制字段
+	private String supplierCharge;
+	private String materialUnit;
+	private String finishFlag;
+	private String costCenter;//成本中心
+	private Timestamp orderChangeDate; //订单更改日期
+	private String wmsReturnChargeNo; //WMS退货批次号
+	private String purchaseRequestNote; //采购申请备注信息
+	private String purchaseRequestNo; //采购申请单号
+	private String purchaseRequestDetailNo; //采购申请单行号
+	private String deleteDetailFlag; //订单行项目删除标识
+	private String salesman; // 业务员zzywy
+	private String salesAssistant; // 业务助理zzywzl
+	private String businessDivision; // 事业部zzsyb
+}
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
index 8711491..c340f25 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
@@ -3,6 +3,7 @@ package com.cim.idm.service;
 import com.cim.idm.model.DeliveryDto;
 import com.cim.idm.model.MaterialReceiveRequest;
 import com.cim.idm.model.PageDto;
+import com.cim.idm.model.MaterialReceiveRequestDetail;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
@@ -45,4 +46,11 @@ public interface IDeliveryService {
      * @return 采购单名称列表
      */
     List<MaterialReceiveRequest> getReceiveByDelivery(String siteName, String receiveRequestName);
+
+    /**
+     * 根据到库单获取采购单名称
+     * @param nameList 到库单
+     * @return 采购单名称列表
+     */
+    List<MaterialReceiveRequestDetail> getReceiveDetail(List<String> nameList);
 }
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 25917a5..dac29d0 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
@@ -3,10 +3,7 @@ package com.cim.idm.service.Impl;
 import com.alibaba.fastjson.JSON;
 import com.cim.idm.constants.ReceiveTypeEnums;
 import com.cim.idm.dao.DeliveryDao;
-import com.cim.idm.model.DeliveryDto;
-import com.cim.idm.model.MaterialReceiveRequest;
-import com.cim.idm.model.PageDto;
-import com.cim.idm.model.PurchaseDto;
+import com.cim.idm.model.*;
 import com.cim.idm.service.IDeliveryService;
 import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey;
 import com.github.pagehelper.PageInfo;
@@ -34,6 +31,13 @@ public class DeliveryServiceImpl implements IDeliveryService {
                 dto.getReceiveRequestName(), ReceiveTypeEnums.DK.getCode()) <= 0) {
             return "添加到库单失败";
         }
+        // 添加到库单关系
+        for (DeliveryRelationDto item : dto.getReceiveList()) {
+            item.setDeliveryName(dto.getReceiveRequestName());
+        }
+        if (deliveryDao.createRelation(dto.getReceiveList()) <= 0) {
+            return "添加到库单关系失败";
+        }
         // 更新采购单到库单字段
         List<String> collect = dto.getDataList().stream()
                 .map(MaterialReceiveRequestKey::getReceiveRequestName).collect(Collectors.toList());
@@ -69,4 +73,9 @@ public class DeliveryServiceImpl implements IDeliveryService {
     public List<MaterialReceiveRequest> getReceiveByDelivery(String siteName, String receiveRequestName) {
         return deliveryDao.getReceiveByDelivery(siteName, receiveRequestName);
     }
+
+    @Override
+    public List<MaterialReceiveRequestDetail> getReceiveDetail(List<String> nameList) {
+        return deliveryDao.getReceiveDetail(nameList);
+    }
 }
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 eb921e5..a2f0475 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
@@ -7,6 +7,14 @@
         VALUES (#{siteName}, #{receiveRequestName}, #{receiveRequestType})
     </insert>
 
+    <insert id="createRelation">
+        INSERT ALL
+        <foreach item="item" index="index" collection="receiveList">
+            INTO MATERIALRECEIVEDELIVERY (RECEIVEREQUESTNAME, DELIVERYNAME, DELIVERYNUM) VALUES (#{item.receiveRequestName}, #{item.deliveryName}, #{item.deliveryNum})
+        </foreach>
+        SELECT * FROM dual
+    </insert>
+
     <update id="bindDelivery">
         UPDATE MATERIALRECEIVEREQUEST SET DELIVERYNAME = #{receiveRequestName}
         WHERE SITENAME = #{siteName}
@@ -95,10 +103,6 @@
             </foreach>
             AND m.SITENAME = #{siteName}
             AND m2.RECEIVEREQUESTTYPE IN ( 'ZK4A', '45', '4C', 'Z001', 'Z002', 'Z003', 'Z004' )
-        GROUP BY m3.DESCRIPTION, be.DESCRIPTION, m.ERPLOCATION, o.ORGNAME, m2.STOCKORGNO, sss.DESCRIPTION,
-                m.LOCATIONNAME, m2.SUPPLIERNO, m3.DESC_CN, m.MATERIALUNIT, M3.MATERIALUNITDESC,
-                m3.EXPIRATION_RULES, m.SDK_ID, m3.WIDTH, m3.PHASE, m.MATERIALSPECNAME, m.SITENAME,
-                m.RECEIVEREQUESTNAME, m3.IS_BATCH, m4.IQCFLAG
     </select>
 
     <!-- GetPackingRow  xh002 -->
@@ -149,4 +153,21 @@
         WHERE SITENAME = #{siteName}
         AND DELIVERYNAME = #{receiveRequestName}
     </select>
+
+    <select id="getReceiveDetail" resultType="com.cim.idm.model.MaterialReceiveRequestDetail">
+        SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTDETAILNAME, POCATEGORY, RECEIVEREQUESTDETAILTYPE,
+               MATERIALSPECNAME, DESCRIPTION, REQUESTQUANTITY, RECEIVEDQUANTITY, ERPLOCATION, RETURNFLAG, FREEFLAG,
+               RECEIVEREQUESTDETAILSTATE, HOLDSTATE, IQCFLAG, PLANDATE, CREATEUSER, CREATETIME, CHARGE, ERPFACTORY,
+               LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER, LASTEVENTCOMMENT, SDK_ID, MATERIALUNIT,
+               STATE, PHASE, ERPDETAILID, SOURCELINEID, APPLICANT, INNERORDER, ERPPONAME, INNERFLAG, SUPPLIERCHARGE,
+               FORCECOMPLETEDFLAG, ERPPODETAILNAME, TRANFERTYPE, PRTBARCODEQTY, LOCATIONNAME, DELETEDETAILFLAG,
+               PRODUCTORDER, PLANORDER, REMARK, SALESMAN, SALESASSISTANT, BUSINESSDIVISION, FINISHFLAG, COSTCENTER,
+               ORDERCHANGEDATE, WMSRETURNCHARGENO, PURCHASEREQUESTNOTE, PURCHASEREQUESTNO, PURCHASEREQUESTDETAILNO
+        FROM MATERIALRECEIVEREQUESTDETAIL
+        WHERE RECEIVEREQUESTNAME in
+        <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
+            #{name}
+        </foreach>
+        order by RECEIVEREQUESTNAME
+    </select>
 </mapper>
\ No newline at end of file

From 9a5625021492637f6e8e10dbb56c7b5fd0f400ec Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Mon, 31 Mar 2025 15:02:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat=20=E5=8C=85=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cim/idm/controller/ChargeSplitController.java     | 2 +-
 .../java/com/cim/idm/controller/DeliveryController.java   | 6 +++---
 .../java/com/cim/idm/controller/FGStockInController.java  | 4 +---
 .../java/com/cim/idm/controller/InvoiceController.java    | 3 +--
 .../main/java/com/cim/idm/controller/LabelController.java | 3 +++
 .../com/cim/idm/controller/MaterialPackingController.java | 4 ++--
 .../cim/idm/controller/MaterialReceiveActController.java  | 4 ++--
 .../com/cim/idm/controller/NoInvoiceManagerContoller.java | 3 +--
 .../com/cim/idm/controller/ProduceReturnController.java   | 2 +-
 .../com/cim/idm/controller/PurchaseReturnController.java  | 2 +-
 .../java/com/cim/idm/controller/SaleReturnController.java | 2 +-
 zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java | 8 ++++----
 .../java/com/cim/idm/model/{ => bo}/StorageObject.java    | 2 +-
 .../java/com/cim/idm/model/{ => dto}/DeliveryDto.java     | 2 +-
 .../com/cim/idm/model/{ => dto}/DeliveryRelationDto.java  | 2 +-
 .../MaterialNotPostedDto.java}                            | 5 +++--
 .../main/java/com/cim/idm/model/{ => dto}/PageDto.java    | 2 +-
 .../java/com/cim/idm/model/{ => dto}/PurchaseDto.java     | 2 +-
 .../java/com/cim/idm/model/{ => dto}/StoragePrintDto.java | 2 +-
 .../java/com/cim/idm/model/{ => dto}/TrackOutBoDto.java   | 3 ++-
 .../cim/idm/model/{ => po}/MaterialReceiveRequest.java    | 2 +-
 .../idm/model/{ => po}/MaterialReceiveRequestDetail.java  | 2 +-
 .../main/java/com/cim/idm/service/IDeliveryService.java   | 8 ++++----
 .../java/com/cim/idm/service/Impl/BSLabelServiceImpl.java | 2 ++
 .../com/cim/idm/service/Impl/DeliveryServiceImpl.java     | 7 ++++++-
 .../java/com/cim/idm/service/Impl/LabelServiceImpl.java   | 1 +
 .../src/main/java/com/cim/idm/service/LabelService.java   | 1 +
 .../src/main/resources/com/cim/idm/dao/DeliveryDao.xml    | 8 ++++----
 28 files changed, 52 insertions(+), 42 deletions(-)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => bo}/StorageObject.java (77%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/DeliveryDto.java (92%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/DeliveryRelationDto.java (87%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{MaterialNotPostedRequest.java => dto/MaterialNotPostedDto.java} (71%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/PageDto.java (84%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/PurchaseDto.java (82%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/StoragePrintDto.java (89%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/TrackOutBoDto.java (75%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => po}/MaterialReceiveRequest.java (96%)
 rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => po}/MaterialReceiveRequestDetail.java (98%)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java
index 7815ce9..b462029 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java
@@ -2,7 +2,7 @@ package com.cim.idm.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.utils.AjaxResult;
 import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
index 5f08688..7fb446e 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
@@ -3,9 +3,9 @@ package com.cim.idm.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cim.idm.constants.ReceiveTypeEnums;
-import com.cim.idm.model.DeliveryDto;
-import com.cim.idm.model.MaterialReceiveRequest;
-import com.cim.idm.model.PageDto;
+import com.cim.idm.model.dto.DeliveryDto;
+import com.cim.idm.model.po.MaterialReceiveRequest;
+import com.cim.idm.model.dto.PageDto;
 import com.cim.idm.service.IDeliveryService;
 import com.cim.idm.utils.AjaxResult;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java
index b6236fd..951ff8d 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java
@@ -5,12 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.cim.idm.exception.GlobalException;
 import com.cim.idm.framework.IDMFrameServiceProxy;
 import com.cim.idm.model.MaterialPacking;
-import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.response.BaseResponse;
 import com.cim.idm.response.RespGenerator;
 import com.cim.idm.utils.AjaxResult;
 import com.cim.idm.utils.CommonUtils;
-import com.cim.idm.wmspackage.name.NameServiceProxy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
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 793b023..1bb9a9c 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
@@ -6,6 +6,7 @@ import com.cim.idm.exception.GlobalException;
 import com.cim.idm.framework.IDMFrameServiceProxy;
 import com.cim.idm.framework.data.EventInfo;
 import com.cim.idm.model.*;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.service.QueryService;
 import com.cim.idm.utils.AjaxResult;
 import com.cim.idm.utils.EventInfoUtil;
@@ -23,14 +24,12 @@ import com.cim.idm.wmspackage.name.NameServiceProxy;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java
index 27b7a15..57bc3a6 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java
@@ -7,6 +7,9 @@ import com.cim.idm.exception.GlobalException;
 import com.cim.idm.framework.IDMFrameServiceProxy;
 import com.cim.idm.framework.data.EventInfo;
 import com.cim.idm.model.*;
+import com.cim.idm.model.dto.TrackOutBoDto;
+import com.cim.idm.model.dto.StoragePrintDto;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.mwmsextend.materialpacking.service.MaterialPackingServiceImpl;
 import com.cim.idm.response.BaseResponse;
 import com.cim.idm.response.RespGenerator;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java
index 85d7f86..e65b89b 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java
@@ -2,7 +2,7 @@ package com.cim.idm.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.cim.idm.model.*;
+import com.cim.idm.model.dto.MaterialNotPostedDto;
 import com.cim.idm.utils.AjaxResult;
 import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy;
 import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey;
@@ -23,7 +23,7 @@ public class MaterialPackingController {
 	 */
 	@PostMapping(value = "/update")
 	public AjaxResult update(@RequestBody JSONObject in) {
-		MaterialNotPostedRequest sl = JSON.toJavaObject(in, MaterialNotPostedRequest.class);
+		MaterialNotPostedDto sl = JSON.toJavaObject(in, MaterialNotPostedDto.class);
         // 获取数据
 		List<MaterialPackingKey> collect = sl.getDataList().stream().map(item -> {
 			MaterialPackingKey packingKey = new MaterialPackingKey();
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
index 64197d0..761fdba 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
@@ -5,9 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.cim.idm.constants.ReceiveTypeEnums;
 import com.cim.idm.framework.IDMFrameServiceProxy;
 import com.cim.idm.framework.data.EventInfo;
-import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.model.MaterialreceiveActDto;
-import com.cim.idm.model.TrackOutBoDto;
+import com.cim.idm.model.dto.TrackOutBoDto;
 import com.cim.idm.mwmsextend.materialpacking.service.MaterialPackingServiceImpl;
 import com.cim.idm.service.IDeliveryService;
 import com.cim.idm.service.impl.QMSServiceImpl;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java
index 2c7ebc0..0881541 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java
@@ -10,11 +10,10 @@ import java.util.Map;
 import java.util.Objects;
 
 import com.cim.idm.exception.GlobalException;
-import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.model.ShelfDto;
 import com.cim.idm.utils.AjaxResult;
 import com.cim.idm.utils.CommonUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java
index 7fd405e..eb3e025 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java
@@ -7,7 +7,7 @@ import com.cim.idm.exception.GlobalException;
 import com.cim.idm.framework.IDMFrameServiceProxy;
 import com.cim.idm.framework.data.EventInfo;
 import com.cim.idm.model.MaterialPacking;
-import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.utils.AjaxResult;
 import com.cim.idm.utils.CommonUtils;
 import com.cim.idm.utils.EventInfoUtil;
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 5a3ccd1..4652f13 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
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cim.idm.dao.PurchaseReturnServiceDao;
 import com.cim.idm.framework.IDMFrameServiceProxy;
-import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.model.PurchaseReturnDto;
 import com.cim.idm.model.StockOutDto;
 import com.cim.idm.service.PurchaseReturnService;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java
index 22e7f4d..fc22d3d 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cim.idm.exception.GlobalException;
 import com.cim.idm.framework.IDMFrameServiceProxy;
 import com.cim.idm.model.MaterialPacking;
-import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.model.MaterialshipRequest;
 import com.cim.idm.utils.AjaxResult;
 import com.cim.idm.utils.CommonUtils;
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 a964aa2..7106d67 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
@@ -1,9 +1,9 @@
 package com.cim.idm.dao;
 
-import com.cim.idm.model.DeliveryRelationDto;
-import com.cim.idm.model.MaterialReceiveRequest;
-import com.cim.idm.model.MaterialReceiveRequestDetail;
-import com.cim.idm.model.PurchaseDto;
+import com.cim.idm.model.dto.DeliveryRelationDto;
+import com.cim.idm.model.po.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequestDetail;
+import com.cim.idm.model.dto.PurchaseDto;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/StorageObject.java b/zi-wms-pda/src/main/java/com/cim/idm/model/bo/StorageObject.java
similarity index 77%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/StorageObject.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/bo/StorageObject.java
index 99995e2..7235172 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/StorageObject.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/bo/StorageObject.java
@@ -1,4 +1,4 @@
-package com.cim.idm.model;
+package com.cim.idm.model.bo;
 
 import lombok.Data;
 
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java
similarity index 92%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java
index 14eeea1..f4deb03 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java
@@ -1,4 +1,4 @@
-package com.cim.idm.model;
+package com.cim.idm.model.dto;
 
 import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey;
 import lombok.Data;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java
similarity index 87%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java
index eeb4a71..89c4943 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java
@@ -1,4 +1,4 @@
-package com.cim.idm.model;
+package com.cim.idm.model.dto;
 
 import lombok.Data;
 
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/MaterialNotPostedDto.java
similarity index 71%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/MaterialNotPostedDto.java
index fd2819c..06d80e1 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/MaterialNotPostedDto.java
@@ -1,11 +1,12 @@
-package com.cim.idm.model;
+package com.cim.idm.model.dto;
 
+import com.cim.idm.model.MaterialPacking;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class MaterialNotPostedRequest {
+public class MaterialNotPostedDto {
 
 	// 批次
 	private String CHARGE;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PageDto.java
similarity index 84%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/PageDto.java
index c5570d2..346e583 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PageDto.java
@@ -1,4 +1,4 @@
-package com.cim.idm.model;
+package com.cim.idm.model.dto;
 
 import lombok.Data;
 import com.alibaba.fastjson.JSONObject;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java
similarity index 82%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java
index 521d9de..b016cf2 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java
@@ -1,4 +1,4 @@
-package com.cim.idm.model;
+package com.cim.idm.model.dto;
 
 import lombok.Data;
 
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/StoragePrintDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/StoragePrintDto.java
similarity index 89%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/StoragePrintDto.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/StoragePrintDto.java
index f801fcf..b173e45 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/StoragePrintDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/StoragePrintDto.java
@@ -1,4 +1,4 @@
-package com.cim.idm.model;
+package com.cim.idm.model.dto;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/TrackOutBoDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java
similarity index 75%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/TrackOutBoDto.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java
index 56f4b45..09eb743 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/TrackOutBoDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java
@@ -1,5 +1,6 @@
-package com.cim.idm.model;
+package com.cim.idm.model.dto;
 
+import com.cim.idm.model.MaterialreceiveActDto;
 import lombok.Data;
 
 @Data
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequest.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequest.java
similarity index 96%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequest.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequest.java
index 15dfbb1..658e08c 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequest.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequest.java
@@ -1,4 +1,4 @@
-package com.cim.idm.model;
+package com.cim.idm.model.po;
 
 import lombok.Data;
 
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequestDetail.java
similarity index 98%
rename from zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java
rename to zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequestDetail.java
index cd39960..ef43cb8 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequestDetail.java
@@ -1,4 +1,4 @@
-package com.cim.idm.model;
+package com.cim.idm.model.po;
 
 import lombok.Data;
 
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
index c340f25..b727f28 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
@@ -1,9 +1,9 @@
 package com.cim.idm.service;
 
-import com.cim.idm.model.DeliveryDto;
-import com.cim.idm.model.MaterialReceiveRequest;
-import com.cim.idm.model.PageDto;
-import com.cim.idm.model.MaterialReceiveRequestDetail;
+import com.cim.idm.model.dto.DeliveryDto;
+import com.cim.idm.model.po.MaterialReceiveRequest;
+import com.cim.idm.model.dto.PageDto;
+import com.cim.idm.model.po.MaterialReceiveRequestDetail;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
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 f3251d4..7ed2ae3 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
@@ -12,6 +12,8 @@ import com.cim.idm.framework.orm.info.KeyInfo;
 import com.cim.idm.framework.orm.service.CommonServiceDAO;
 import com.cim.idm.framework.util.time.TimeStampUtil;
 import com.cim.idm.model.*;
+import com.cim.idm.model.bo.StorageObject;
+import com.cim.idm.model.dto.StoragePrintDto;
 import com.cim.idm.mwmsextend.generic.util.CommonUtil;
 import com.cim.idm.wmsextend.generic.errorHandler.CustomException;
 import com.cim.idm.wmsextend.generic.util.ObjectUtil;
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 dac29d0..5737f1b 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
@@ -3,7 +3,12 @@ package com.cim.idm.service.Impl;
 import com.alibaba.fastjson.JSON;
 import com.cim.idm.constants.ReceiveTypeEnums;
 import com.cim.idm.dao.DeliveryDao;
-import com.cim.idm.model.*;
+import com.cim.idm.model.dto.PageDto;
+import com.cim.idm.model.dto.PurchaseDto;
+import com.cim.idm.model.dto.DeliveryDto;
+import com.cim.idm.model.dto.DeliveryRelationDto;
+import com.cim.idm.model.po.MaterialReceiveRequest;
+import com.cim.idm.model.po.MaterialReceiveRequestDetail;
 import com.cim.idm.service.IDeliveryService;
 import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey;
 import com.github.pagehelper.PageInfo;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/LabelServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/LabelServiceImpl.java
index a718ac6..5d79165 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/LabelServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/LabelServiceImpl.java
@@ -2,6 +2,7 @@ package com.cim.idm.service.Impl;
 
 import com.cim.idm.framework.data.EventInfo;
 import com.cim.idm.model.*;
+import com.cim.idm.model.dto.StoragePrintDto;
 import com.cim.idm.service.LabelService;
 import com.cim.idm.utils.EventInfoUtil;
 import com.cim.idm.wmsextend.generic.errorHandler.CustomException;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java
index b913d38..590aaac 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java
@@ -2,6 +2,7 @@ package com.cim.idm.service;
 
 
 import com.cim.idm.model.*;
+import com.cim.idm.model.dto.StoragePrintDto;
 import com.cim.idm.wmsextend.generic.errorHandler.CustomException;
 
 /**
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 a2f0475..18728ea 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
@@ -24,7 +24,7 @@
         </foreach>
     </update>
 
-    <select id="getPurchase" resultType="com.cim.idm.model.MaterialReceiveRequest">
+    <select id="getPurchase" resultType="com.cim.idm.model.po.MaterialReceiveRequest">
         SELECT SITENAME, RECEIVEREQUESTNAME FROM MATERIALRECEIVEREQUEST
         WHERE SITENAME = #{dto.siteName}
         AND RECEIVEREQUESTTYPE IN
@@ -130,7 +130,7 @@
         ) TTT
     </select>
 
-    <select id="getByKey" resultType="com.cim.idm.model.MaterialReceiveRequest">
+    <select id="getByKey" resultType="com.cim.idm.model.po.MaterialReceiveRequest">
         SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
                OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
                LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
@@ -142,7 +142,7 @@
         AND RECEIVEREQUESTNAME = #{receiveRequestName}
     </select>
 
-    <select id="getReceiveByDelivery" resultType="com.cim.idm.model.MaterialReceiveRequest">
+    <select id="getReceiveByDelivery" resultType="com.cim.idm.model.po.MaterialReceiveRequest">
         SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
                OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
                LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
@@ -154,7 +154,7 @@
         AND DELIVERYNAME = #{receiveRequestName}
     </select>
 
-    <select id="getReceiveDetail" resultType="com.cim.idm.model.MaterialReceiveRequestDetail">
+    <select id="getReceiveDetail" resultType="com.cim.idm.model.po.MaterialReceiveRequestDetail">
         SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTDETAILNAME, POCATEGORY, RECEIVEREQUESTDETAILTYPE,
                MATERIALSPECNAME, DESCRIPTION, REQUESTQUANTITY, RECEIVEDQUANTITY, ERPLOCATION, RETURNFLAG, FREEFLAG,
                RECEIVEREQUESTDETAILSTATE, HOLDSTATE, IQCFLAG, PLANDATE, CREATEUSER, CREATETIME, CHARGE, ERPFACTORY,

From f16885f5c661bfe7bc01cec786c6d90d12e30db5 Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Mon, 31 Mar 2025 18:28:58 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idm/model/po/MaterialReceiveDelivery.java    | 16 ++++++++++++++++
 .../idm/model/vo/DeliveryReceiveDetailVo.java    | 12 ++++++++++++
 .../com/cim/idm/model/vo/ReceiveDetailVo.java    | 14 ++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveDelivery.java
 create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java
 create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/vo/ReceiveDetailVo.java

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveDelivery.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveDelivery.java
new file mode 100644
index 0000000..20ba28d
--- /dev/null
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveDelivery.java
@@ -0,0 +1,16 @@
+package com.cim.idm.model.po;
+
+import lombok.Data;
+
+@Data
+public class MaterialReceiveDelivery {
+
+	// 到库单
+	private String deliveryName;
+	// 到库数量
+	private String deliveryNum;
+	// 采购单
+	private String receiveRequestName;
+	// 料号
+	private String materialSpecName;
+}
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java
new file mode 100644
index 0000000..7f341ef
--- /dev/null
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java
@@ -0,0 +1,12 @@
+package com.cim.idm.model.vo;
+
+import lombok.Data;
+
+@Data
+public class DeliveryReceiveDetailVo {
+
+	private String receiveRequestName;
+	private String materialSpecName;
+	private double requestQuantity;
+	private double deliveryNum;
+}
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/ReceiveDetailVo.java b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/ReceiveDetailVo.java
new file mode 100644
index 0000000..26b13ec
--- /dev/null
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/ReceiveDetailVo.java
@@ -0,0 +1,14 @@
+package com.cim.idm.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ReceiveDetailVo {
+	// 采购单明细
+	private List<Map<String, Object>> storeDetail;
+	// 批次
+	private List<Map<String, Object>> storeCharge;
+}

From 68bf730af33bec75b9d5dad4bf1f6d7c4aab81e4 Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Mon, 31 Mar 2025 18:47:23 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat=20=E6=89=B9=E6=AC=A1=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=EF=BC=9A=E5=88=B0=E8=B4=A7=E5=8D=95=E7=9A=84=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idm/controller/DeliveryController.java    |  5 +-
 .../java/com/cim/idm/dao/DeliveryDao.java     | 20 ++---
 .../idm/model/dto/DeliveryRelationDto.java    |  2 +
 .../com/cim/idm/service/IDeliveryService.java | 15 +++-
 .../idm/service/Impl/DeliveryServiceImpl.java | 43 ++++++-----
 .../resources/com/cim/idm/dao/DeliveryDao.xml | 74 +++++++++++--------
 6 files changed, 92 insertions(+), 67 deletions(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
index 7fb446e..1bf1c73 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
@@ -59,7 +59,8 @@ public class DeliveryController {
 		List<String> nameList = new ArrayList<>();
 		// 判定是否是到库单
 		String typeByKey = deliveryService.getByKey(siteName, receiveRequestName).getReceiveRequestType();
-		if (typeByKey.equals(ReceiveTypeEnums.DK.getCode())) {
+		boolean isDelivery = typeByKey.equals(ReceiveTypeEnums.DK.getCode());
+		if (isDelivery) {
 			// 到库单（找出该单据下的所有的采购单）
 			nameList = deliveryService.getReceiveByDelivery(siteName, receiveRequestName)
 					.stream().map(MaterialReceiveRequest::getReceiveRequestName).collect(Collectors.toList());
@@ -68,7 +69,7 @@ public class DeliveryController {
 			nameList.add(receiveRequestName);
 		}
 		// 获取采购单明细及批次
-		return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getStoreDetail(siteName, nameList));
+		return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getStoreDetail(siteName, nameList, isDelivery));
 	}
 
 	/**
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 7106d67..e03e352 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
@@ -1,9 +1,10 @@
 package com.cim.idm.dao;
 
 import com.cim.idm.model.dto.DeliveryRelationDto;
+import com.cim.idm.model.po.MaterialReceiveDelivery;
 import com.cim.idm.model.po.MaterialReceiveRequest;
-import com.cim.idm.model.po.MaterialReceiveRequestDetail;
 import com.cim.idm.model.dto.PurchaseDto;
+import com.cim.idm.model.vo.DeliveryReceiveDetailVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -28,13 +29,6 @@ public interface DeliveryDao {
      */
     int createRelation(@Param("receiveList") List<DeliveryRelationDto> receiveList);
 
-    /**
-     * 绑定采购订单 的 到货单
-     */
-    int bindDelivery(@Param("siteName") String siteName,
-                     @Param("receiveRequestName") String receiveRequestName,
-                     @Param("nameList") List<String> nameList);
-
     /**
      * 获取采购订单
      */
@@ -46,7 +40,8 @@ public interface DeliveryDao {
      */
     @MapKey("storeDetail")
     List<Map<String, Object>> getStoreDetail(@Param("siteName") String siteName,
-                                             @Param("nameList") List<String> nameList);
+                                             @Param("nameList") List<String> nameList,
+                                             @Param("isDelivery") Boolean isDelivery);
 
     /**
      * 获取入库批次
@@ -67,10 +62,15 @@ public interface DeliveryDao {
     List<MaterialReceiveRequest> getReceiveByDelivery(@Param("siteName") String siteName,
                                       @Param("receiveRequestName") String receiveRequestName);
 
+    /**
+     * 获取到库单关系
+     */
+    List<MaterialReceiveDelivery> getRelation(@Param("deliveryName") String deliveryName);
+
     /**
      * 根据到库单获取采购单名称
      * @param nameList 到库单
      * @return 采购单名称列表
      */
-    List<MaterialReceiveRequestDetail> getReceiveDetail(@Param("nameList") List<String> nameList);
+    List<DeliveryReceiveDetailVo> getReceiveDetail(@Param("nameList") List<String> nameList);
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java
index 89c4943..83b8f57 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java
@@ -10,4 +10,6 @@ public class DeliveryRelationDto {
 	private Integer deliveryNum = 0;
 	// 采购单名称
 	private String receiveRequestName;
+	// 料号
+	private String materialSpecName;
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
index b727f28..2ce7089 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
@@ -1,13 +1,14 @@
 package com.cim.idm.service;
 
 import com.cim.idm.model.dto.DeliveryDto;
+import com.cim.idm.model.po.MaterialReceiveDelivery;
 import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.model.dto.PageDto;
-import com.cim.idm.model.po.MaterialReceiveRequestDetail;
+import com.cim.idm.model.vo.DeliveryReceiveDetailVo;
+import com.cim.idm.model.vo.ReceiveDetailVo;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
-import java.util.Map;
 
 public interface IDeliveryService {
     /**
@@ -28,9 +29,10 @@ public interface IDeliveryService {
      * 获取采购单明细及批次
      * @param siteName 组织
      * @param nameList 名称
+     * @param isDelivery 是否到库
      * @return 采购订单
      */
-    Map<String, Object> getStoreDetail(String siteName, List<String> nameList);
+    ReceiveDetailVo getStoreDetail(String siteName, List<String> nameList, Boolean isDelivery);
 
     /**
      * 根据 key 获取值
@@ -47,10 +49,15 @@ public interface IDeliveryService {
      */
     List<MaterialReceiveRequest> getReceiveByDelivery(String siteName, String receiveRequestName);
 
+    /**
+     * 获取到库单关系
+     */
+    List<MaterialReceiveDelivery> getRelation(String deliveryName);
+
     /**
      * 根据到库单获取采购单名称
      * @param nameList 到库单
      * @return 采购单名称列表
      */
-    List<MaterialReceiveRequestDetail> getReceiveDetail(List<String> nameList);
+    List<DeliveryReceiveDetailVo> getReceiveDetail(List<String> nameList);
 }
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 5737f1b..0aa3152 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
@@ -7,20 +7,18 @@ import com.cim.idm.model.dto.PageDto;
 import com.cim.idm.model.dto.PurchaseDto;
 import com.cim.idm.model.dto.DeliveryDto;
 import com.cim.idm.model.dto.DeliveryRelationDto;
+import com.cim.idm.model.po.MaterialReceiveDelivery;
 import com.cim.idm.model.po.MaterialReceiveRequest;
-import com.cim.idm.model.po.MaterialReceiveRequestDetail;
+import com.cim.idm.model.vo.DeliveryReceiveDetailVo;
+import com.cim.idm.model.vo.ReceiveDetailVo;
 import com.cim.idm.service.IDeliveryService;
-import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.*;
 
 @Service
 public class DeliveryServiceImpl implements IDeliveryService {
@@ -37,16 +35,18 @@ public class DeliveryServiceImpl implements IDeliveryService {
             return "添加到库单失败";
         }
         // 添加到库单关系
+        List<DeliveryRelationDto> res = new ArrayList<>();
         for (DeliveryRelationDto item : dto.getReceiveList()) {
-            item.setDeliveryName(dto.getReceiveRequestName());
+            // 数量大于 0
+            if (Objects.nonNull(item.getDeliveryNum()) && item.getDeliveryNum() > 0) {
+                // 到库单号
+                item.setDeliveryName(dto.getReceiveRequestName());
+                res.add(item);
+            }
         }
-        if (deliveryDao.createRelation(dto.getReceiveList()) <= 0) {
+        if (deliveryDao.createRelation(res) <= 0) {
             return "添加到库单关系失败";
         }
-        // 更新采购单到库单字段
-        List<String> collect = dto.getDataList().stream()
-                .map(MaterialReceiveRequestKey::getReceiveRequestName).collect(Collectors.toList());
-        deliveryDao.bindDelivery(dto.getSiteName(), dto.getReceiveRequestName(), collect);
         return "更新成功";
     }
 
@@ -58,15 +58,15 @@ public class DeliveryServiceImpl implements IDeliveryService {
     }
 
     @Override
-    public Map<String, Object> getStoreDetail(String siteName, List<String> nameList) {
-        Map<String, Object> res = new HashMap<>();
+    public ReceiveDetailVo getStoreDetail(String siteName, List<String> nameList, Boolean isDelivery) {
+        ReceiveDetailVo receiveDetailVo = new ReceiveDetailVo();
         // 采购单明细
-        List<Map<String, Object>> storeDetail = deliveryDao.getStoreDetail(siteName, nameList);
+        List<Map<String, Object>> storeDetail = deliveryDao.getStoreDetail(siteName, nameList, isDelivery);
+        receiveDetailVo.setStoreDetail(storeDetail);
         // 批次
         List<Map<String, Object>> storeCharge = deliveryDao.getStoreCharge(siteName, nameList);
-        res.put("storeDetail", storeDetail);
-        res.put("storeCharge", storeCharge);
-        return res;
+        receiveDetailVo.setStoreCharge(storeCharge);
+        return receiveDetailVo;
     }
 
     @Override
@@ -80,7 +80,12 @@ public class DeliveryServiceImpl implements IDeliveryService {
     }
 
     @Override
-    public List<MaterialReceiveRequestDetail> getReceiveDetail(List<String> nameList) {
+    public List<MaterialReceiveDelivery> getRelation(String deliveryName) {
+        return deliveryDao.getRelation(deliveryName);
+    }
+
+    @Override
+    public List<DeliveryReceiveDetailVo> getReceiveDetail(List<String> nameList) {
         return deliveryDao.getReceiveDetail(nameList);
     }
 }
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 18728ea..da1e150 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
@@ -10,20 +10,11 @@
     <insert id="createRelation">
         INSERT ALL
         <foreach item="item" index="index" collection="receiveList">
-            INTO MATERIALRECEIVEDELIVERY (RECEIVEREQUESTNAME, DELIVERYNAME, DELIVERYNUM) VALUES (#{item.receiveRequestName}, #{item.deliveryName}, #{item.deliveryNum})
+            INTO MATERIALRECEIVEDELIVERY (RECEIVEREQUESTNAME, DELIVERYNAME, DELIVERYNUM, MATERIALSPECNAME) VALUES (#{item.receiveRequestName}, #{item.deliveryName}, #{item.deliveryNum}, #{item.materialSpecName})
         </foreach>
         SELECT * FROM dual
     </insert>
 
-    <update id="bindDelivery">
-        UPDATE MATERIALRECEIVEREQUEST SET DELIVERYNAME = #{receiveRequestName}
-        WHERE SITENAME = #{siteName}
-        AND RECEIVEREQUESTNAME IN
-        <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
-            #{name}
-        </foreach>
-    </update>
-
     <select id="getPurchase" resultType="com.cim.idm.model.po.MaterialReceiveRequest">
         SELECT SITENAME, RECEIVEREQUESTNAME FROM MATERIALRECEIVEREQUEST
         WHERE SITENAME = #{dto.siteName}
@@ -65,13 +56,31 @@
             SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS RECEIVEDQUANTITY2,
             SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS MINUSQTY
             FROM MATERIALRECEIVEREQUESTDETAIL m
-            WHERE RECEIVEREQUESTNAME in
+            WHERE m.RECEIVEREQUESTNAME in
             <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
                 #{name}
             </foreach>
             GROUP BY m.MATERIALSPECNAME
         )
-        SELECT distinct MAIN.*, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) RECEIVETIME, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) MAKEDATE, '1' RECEIVEREQUESTDETAILNAME, '是' IS_BATCH,
+        <if test="isDelivery">
+            ,DELIVERY AS (
+                SELECT sum(md.DELIVERYNUM) DELIVERYNUM, md.MATERIALSPECNAME MATERIALSPECNAME
+                FROM MATERIALRECEIVEDELIVERY md
+                WHERE md.RECEIVEREQUESTNAME IN
+                <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+                GROUP BY md.MATERIALSPECNAME
+            )
+        </if>
+        SELECT distinct MAIN.RECEIVEDQUANTITY, MAIN.MINUSQTY,
+        <if test="isDelivery">
+            DELIVERY.DELIVERYNUM REQUESTQUANTITY,
+        </if>
+        <if test="!isDelivery">
+            MAIN.REQUESTQUANTITY REQUESTQUANTITY,
+        </if>
+        TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) RECEIVETIME, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) MAKEDATE, '1' RECEIVEREQUESTDETAILNAME, '是' IS_BATCH,
         m.MATERIALSPECNAME, 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,
         m2.STOCKORGNO AS ERPFACTORY, m2.SUPPLIERNO,
@@ -96,6 +105,9 @@
             AND BB.MATERIALSPECNAME = m.MATERIALSPECNAME
             AND BB.SDK_ID = m.SDK_ID
             AND BB.PHASE = m3.PHASE
+        <if test="isDelivery">
+            INNER JOIN DELIVERY ON DELIVERY.MATERIALSPECNAME = m.MATERIALSPECNAME
+        </if>
         WHERE ( m2.RETURNFLAG IS NULL OR m2.RETURNFLAG != 'Y' )
             AND m.RECEIVEREQUESTNAME in
             <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
@@ -135,34 +147,32 @@
                OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
                LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
                ERPID, REMARK, PURCHASER, PURORGNO, ORDERDATE, CLOSERUSER, CLOSEDATE, STOCKORGNO, RETURNFLAG,
-               RECEIVEREQUESTDETAILTYPE, ERPLOCATION, PRODUCTDEPTNO, SOURCEBILLID, EFFECTIVESTARTTIME, EFFECTIVEENDTIME,
-               DELIVERYNAME
+               RECEIVEREQUESTDETAILTYPE, ERPLOCATION, PRODUCTDEPTNO, SOURCEBILLID, EFFECTIVESTARTTIME, EFFECTIVEENDTIME
         FROM MATERIALRECEIVEREQUEST
         WHERE SITENAME = #{siteName}
         AND RECEIVEREQUESTNAME = #{receiveRequestName}
     </select>
 
     <select id="getReceiveByDelivery" resultType="com.cim.idm.model.po.MaterialReceiveRequest">
-        SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
-               OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
-               LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
-               ERPID, REMARK, PURCHASER, PURORGNO, ORDERDATE, CLOSERUSER, CLOSEDATE, STOCKORGNO, RETURNFLAG,
-               RECEIVEREQUESTDETAILTYPE, ERPLOCATION, PRODUCTDEPTNO, SOURCEBILLID, EFFECTIVESTARTTIME, EFFECTIVEENDTIME,
-               DELIVERYNAME
-        FROM MATERIALRECEIVEREQUEST
-        WHERE SITENAME = #{siteName}
-        AND DELIVERYNAME = #{receiveRequestName}
+        SELECT m.SITENAME, m.RECEIVEREQUESTNAME, m.RECEIVEREQUESTTYPE, m.PURCHASEORDERGROUP, m.RECEIVEREQUESTSTATE, m.SUPPLIERNO,
+               m.OEMSITENAME, m.OEMSITEINCHARGE, m.SYSTEMTYPE, m.LASTEVENTNAME, m.LASTEVENTTIMEKEY, m.LASTEVENTTIME, m.LASTEVENTUSER,
+               m.LASTEVENTCOMMENT, m.ERPPONAME, m.SAVEREASON, m.RESPPERSON, m.RESPDEPART, m.SOLVETIME, m.PASSSTATE, m.WORKER, m.SDK_ID,
+               m.ERPID, m.REMARK, m.PURCHASER, m.PURORGNO, m.ORDERDATE, m.CLOSERUSER, m.CLOSEDATE, m.STOCKORGNO, m.RETURNFLAG,
+               m.RECEIVEREQUESTDETAILTYPE, m.ERPLOCATION, m.PRODUCTDEPTNO, m.SOURCEBILLID, m.EFFECTIVESTARTTIME, m.EFFECTIVEENDTIME
+        FROM MATERIALRECEIVEREQUEST m, MATERIALRECEIVEDELIVERY md
+        WHERE md.DELIVERYNAME = #{receiveRequestName}
+        AND m.SITENAME = #{siteName}
+        AND m.RECEIVEREQUESTNAME = md.RECEIVEREQUESTNAME
     </select>
 
-    <select id="getReceiveDetail" resultType="com.cim.idm.model.po.MaterialReceiveRequestDetail">
-        SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTDETAILNAME, POCATEGORY, RECEIVEREQUESTDETAILTYPE,
-               MATERIALSPECNAME, DESCRIPTION, REQUESTQUANTITY, RECEIVEDQUANTITY, ERPLOCATION, RETURNFLAG, FREEFLAG,
-               RECEIVEREQUESTDETAILSTATE, HOLDSTATE, IQCFLAG, PLANDATE, CREATEUSER, CREATETIME, CHARGE, ERPFACTORY,
-               LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER, LASTEVENTCOMMENT, SDK_ID, MATERIALUNIT,
-               STATE, PHASE, ERPDETAILID, SOURCELINEID, APPLICANT, INNERORDER, ERPPONAME, INNERFLAG, SUPPLIERCHARGE,
-               FORCECOMPLETEDFLAG, ERPPODETAILNAME, TRANFERTYPE, PRTBARCODEQTY, LOCATIONNAME, DELETEDETAILFLAG,
-               PRODUCTORDER, PLANORDER, REMARK, SALESMAN, SALESASSISTANT, BUSINESSDIVISION, FINISHFLAG, COSTCENTER,
-               ORDERCHANGEDATE, WMSRETURNCHARGENO, PURCHASEREQUESTNOTE, PURCHASEREQUESTNO, PURCHASEREQUESTDETAILNO
+    <select id="getRelation" resultType="com.cim.idm.model.po.MaterialReceiveDelivery">
+        SELECT md.DELIVERYNAME, md.DELIVERYNUM, md.RECEIVEREQUESTNAME, md.MATERIALSPECNAME
+        FROM MATERIALRECEIVEDELIVERY md
+        WHERE md.DELIVERYNAME = #{deliveryName}
+    </select>
+
+    <select id="getReceiveDetail" resultType="com.cim.idm.model.vo.DeliveryReceiveDetailVo">
+        SELECT receiveRequestName, materialSpecName, requestQuantity, requestQuantity as deliveryNum
         FROM MATERIALRECEIVEREQUESTDETAIL
         WHERE RECEIVEREQUESTNAME in
         <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">

From 64c4e2f94d97f53eda4d03572663f462e7b930c9 Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Mon, 31 Mar 2025 19:05:33 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat=20=E5=88=B0=E5=BA=93=E5=8D=95=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cim/idm/controller/MaterialReceiveActController.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
index 761fdba..85b2f30 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
@@ -177,7 +177,7 @@ public class MaterialReceiveActController {
 		String receiveQty = box.getRECEIVEDQUANTITY2();//实收数量
 		String receiveRequestDetailName = box.getReceiveRequestDetailName();
 		// 单据
-		String receiveRequestName = box.getReceiveRequestName();
+		String receiveRequestName = boxs.getReceiveRequestName();
 		// 判断是否是倒库单据
 		MaterialReceiveRequest byKey = deliveryService.getByKey(boxs.getSiteName(), boxs.getReceiveRequestName());
 		if (byKey.getReceiveRequestType().equals(ReceiveTypeEnums.DK.getCode())) {
@@ -185,9 +185,7 @@ public class MaterialReceiveActController {
 			List<MaterialReceiveRequest> collect = deliveryService.getReceiveByDelivery(boxs.getSiteName(), boxs.getReceiveRequestName())
 					.stream().filter(item -> item.getMaterialSpecName().equals(materialSpecName)).collect(Collectors.toList());
 			// 检查剩余数量
-//			if () {
-//
-//			}
+			// @TODO
 		}
 		String remark = box.getRemark();
 		String sdkid = box.getSdkid() == null ? "" : box.getSdkid();