Merge remote-tracking branch 'origin/master'

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());

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 {