From 3df29f8f5bce030b1ed7258ace34e0538fd0a45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 24 Nov 2023 15:56:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/service/issueJob/IssueJobMainServiceImpl.java       | 6 ++++++
 .../service/issueRequest/IssueRequestMainServiceImpl.java   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java
index ca2ab15b..185a738e 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java
@@ -42,6 +42,7 @@ import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.jobsetting.JobsettingService;
 import com.win.module.wms.service.location.LocationService;
+import com.win.module.wms.service.supplieritem.SupplieritemService;
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
@@ -74,6 +75,8 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*;
 @Validated
 public class IssueJobMainServiceImpl implements IssueJobMainService {
 
+    @Resource
+    private SupplieritemService supplieritemService;
     @Resource
     private LocationService locationService;
     @Resource
@@ -447,6 +450,9 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
             onlinesettlementRecordDetailDO.setAreaCode(item.getToAreaCode());
             onlinesettlementRecordDetailDO.setMasterId(onlinesettlementRecordMainDO.getId());
             onlinesettlementRecordDetailDO.setNumber(number);
+            onlinesettlementRecordDetailDO.setSupplierCode(item.getSupplierCode());
+            // 查询 供应商物品 赋值 供应商物品代码
+            onlinesettlementRecordDetailDO.setSupplierItemCode(supplieritemService.selectSupplierItemExist(item.getSupplierCode(),item.getItemCode()).getSupplierItemCode());
             onlinesettlementRecordDetailDO.setId(null);
             onlinesettlementRecordDetailDO.setCreator(null);
             onlinesettlementRecordDetailDO.setCreateTime(null);
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java
index 00df111e..ea458d02 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java
@@ -607,6 +607,7 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
     private void generateJob (IssueRequestMainDO mainDO, List<IssueRequestDetailDO> detailDO) {
         //跳过任务直接生成记录
         if("TRUE".equals(mainDO.getDirectCreateRecord())) {
+//            TODO: 发料申请 跳过任务直接生成记录 未做！！
 //            PurchasereceiptRecordMainCreateReqVO purchasereceiptRecordMainCreateReqVO = new PurchasereceiptRecordMainCreateReqVO();
 //            BeanUtils.copyProperties(mainDO, purchasereceiptRecordMainCreateReqVO);
 //            purchasereceiptRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());