From c8f4b6e697ee9377a2bb12a75e5a4c9dcc25a948 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 22 Jan 2024 09:32:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=20=E7=A7=BB=E5=8A=A8=E7=A0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/OptionalMBom/OpMBomImortSap.java  | 12 +++++++++---
 .../mapper/master/OptionalEbomMainMapper.xml         |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java
index 2df0abd3..3a001cc1 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java
@@ -1,16 +1,22 @@
 package com.nflg.product.bomnew.service.domain.OptionalMBom;
 
 import com.nflg.product.bomnew.constant.BomConstant;
+import com.nflg.product.bomnew.constant.FactoryCodeEnum;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
+import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialListVO;
+
+import java.util.List;
 
 public class OpMBomImortSap {
 
 
 
-    public ImportSapParamDTO buildSap(){
+    public ImportSapParamDTO buildSap(List<OptionalMbomMaterialListVO> list){
+
+        
         ImportSapParamDTO result=new ImportSapParamDTO();
-       // result.setZID(parent.getRowId().toString());
-       // result.setI_WERKS(parent.getFacCode());
+        // result.setZID(parent.getRowId().toString());
+        result.setI_WERKS(FactoryCodeEnum.FACTORY_1010.getValue());
         result.setI_STLAN(BomConstant.SAP_YDBOM);
         return  result;
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
index e76e74ba..8468eb3c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
@@ -22,7 +22,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         row_id,version,
-        ,device_no,device_name,remark,is_enable,dept_row_id,dept_name,created_by,created_time,updated_time,updated_by,real_name,is_del,serial_no
+        device_no,device_name,remark,is_enable,dept_row_id,dept_name,created_by,created_time,updated_time,updated_by,real_name,is_del,serial_no
     </sql>
 
     <sql id="where_whr">

From 0f7031bea7b347243d5145725d9a23d6ffd9af93 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 22 Jan 2024 10:04:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/OptionalEbomConfigService.java | 8 ++++++++
 .../bomnew/service/aggreg/AggregOptionConfigService.java  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
index 4da266ae..dcd037c2 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -88,6 +89,9 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
         if (optionalEbomMainVO == null || StrUtil.isEmpty(optionalEbomMainVO.getDeviceNo())) {
             throw new NflgBusinessException(STATE.SystemErr, "查询设备数据不存在");
         }
+
+       OptionalEbomMainEntity mainEntity= SpringUtil.getBean(OptionalEbomMainService.class).getById(dto.getRowId());
+
         OptionalEbomConfigEntity optionalEbomConfigEntity = new OptionalEbomConfigEntity();
         optionalEbomConfigEntity.setParentRowId(dto.getRowId());
         optionalEbomConfigEntity.setRemark(dto.getRemark());
@@ -102,6 +106,10 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
         optionalEbomConfigEntity.setCurrentVersion(optionalEbomMainVO.getVersion());
         optionalEbomConfigEntity.setConfigNo(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmssSSS"));
         optionalEbomConfigEntity.setEditStatus(OptionalBomConstant.PublishEnum.TMP.getValue());
+        if(mainEntity!=null){
+            optionalEbomConfigEntity.setCurrentVersion(mainEntity.getVersion());
+        }
+
         this.saveOrUpdate(optionalEbomConfigEntity);
 
       insertConfigRelation(optionalEbomConfigEntity.getRowId(), dto.getOptions());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
index 216c1559..f528e3ab 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
@@ -281,7 +281,7 @@ public class AggregOptionConfigService {
        // optionalEbomConfigEntity.setUpdatedTime(new Date());
         optionalEbomConfigService.updateById(optionalEbomConfigEntity);
 
-        if(entity.getEditStatus()==OptionalBomConstant.PublishEnum.TMP.getValue()) {
+        if(entity.getEditStatus().equals(OptionalBomConstant.PublishEnum.TMP.getValue())) {
             return optionalEbomConfigService.insertConfigRelation(dto.getRowId(), dto.getOptions());
         }
         return true;