From 6a2316fd309b13671fd9c0b93c328d13b7dc48ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 19 Dec 2023 17:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7=20?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=20=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptJob/ProductreceiptJobMainService.java    | 4 ++++
 .../ProductreceiptJobMainServiceImpl.java                  | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java
index 0c76ae8c..fd52a92e 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java
@@ -8,6 +8,8 @@ import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainP
 import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
 import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO;
+import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO;
+import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO;
 import org.springframework.lang.Nullable;
 
 import javax.validation.Valid;
@@ -116,4 +118,6 @@ public interface ProductreceiptJobMainService {
     Integer closeProductreceiptJobMain(Long id);
 
     String executeProductreceiptJobMain(ProductreceiptJobMainUpdateReqVO updateReqVO);
+
+    void generateBackflushRecord(ProductreceiptRecordMainDO productreceiptRecordMainDO, List<ProductreceiptRecordDetailDO> productreceiptRecordDetailDOList);
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java
index 49abd357..22d1632d 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java
@@ -427,6 +427,11 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe
             productputawayRequestDetailCreateReqVO.setItemCode(itemDetailDO.getItemCode());
             productputawayRequestDetailCreateReqVO.setQty(itemDetailDO.getQty());
             productputawayRequestDetailCreateReqVO.setInventoryStatus(itemDetailDO.getInventoryStatus());
+            productputawayRequestDetailCreateReqVO.setFromLocationCode(itemDetailDO.getToLocationCode());
+            productputawayRequestDetailCreateReqVO.setPackingNumber(itemDetailDO.getPackingNumber());
+            productputawayRequestDetailCreateReqVO.setContainerNumber(itemDetailDO.getContainerNumber());
+            productputawayRequestDetailCreateReqVO.setBatch(itemDetailDO.getBatch());
+            productputawayRequestDetailCreateReqVO.setUom(itemDetailDO.getUom());
             subList.add(productputawayRequestDetailCreateReqVO);
         });
         productputawayRequestMainCreateReqVO.setSubList(subList);
@@ -438,7 +443,7 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe
      * @param productreceiptRecordMainDO
      * @param productreceiptRecordDetailDOList
      */
-    private void generateBackflushRecord(ProductreceiptRecordMainDO productreceiptRecordMainDO, List<ProductreceiptRecordDetailDO> productreceiptRecordDetailDOList) {
+    public void generateBackflushRecord(ProductreceiptRecordMainDO productreceiptRecordMainDO, List<ProductreceiptRecordDetailDO> productreceiptRecordDetailDOList) {
         List<ProductreceiptRequestDetailDO> productreceiptRequestDetailDOList = productreceiptRequestService.getProductreceiptRequestDetailDOByNumber(productreceiptRecordMainDO.getRequestNumber());
         List<BackflushRecordDetailbDO> backflushRecordDetailbDOList = new ArrayList<>();
         // 下线结算集合