From e33288a8b8ecfc18983c5aa2826f3c456eab99a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 18 Dec 2023 15:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparetoissue/PreparetoissueMainServiceImpl.java        | 5 ++++-
 .../src/main/java/com/win/module/wms/util/JobUtils.java      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java
index ee18fe5f..1088d1b4 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java
@@ -18,6 +18,7 @@ import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert;
 import com.win.module.wms.convert.production.ProductionDetailConvert;
 import com.win.module.wms.convert.production.ProductionMainConvert;
 import com.win.module.wms.dal.dataobject.bom.BomDO;
+import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO;
 import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO;
@@ -102,7 +103,9 @@ public class PreparetoissueMainServiceImpl implements PreparetoissueMainService
         }
         String number = serialNumberApi.generateCode(RuleCodeEnum.MATERIAL_PREPARE_PLAN.getCode());
         mainDO.setNumber(number);
-        mainDO.setBusinessType("Issue"); // 业务类型：发料
+        // 业务类型
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MaterialPreparePlan");
+        mainDO.setBusinessType(businesstypeDO.getCode());
         preparetoissueMainMapper.insert(mainDO);
         for (PreparetoissueDetailDO detailDO : subDOList) {
             detailDO.setMasterId(mainDO.getId());
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
index e324ca50..31f511b1 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
@@ -950,7 +950,7 @@ public class JobUtils {
         bomExportReqVO.setAvailable("TRUE");
         List<BomDO> bomDOList = bomService.getBomList(bomExportReqVO);
         bomDOList.forEach(item -> {
-            // 判断物品是否是虚零件 TODO: 拆解BOM 子零件是否要按照父零件版本进行查询？？
+            // 判断物品是否是虚零件 拆解BOM 子零件按照父零件版本进行查询
             if (itembasicService.selectItembasic(item.getComponentItemCode()).getIsPhantom().equals("TRUE")) {
                 this.BomRecursion(item.getComponentItemCode(), item.getVersion(), list);
             } else {