feat(移动破): 从主物料表同步信息

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java

@@ -40,6 +40,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -514,7 +516,17 @@ public class OptionalEbomApi extends BaseApi {
 
     }
 
-
+    /**
+     * 从主物料表同步信息
+     * @return
+     */
+    @GetMapping("syncMaterailInfo")
+    @ApiOperation("从主物料表同步信息")
+    @LogRecord(success = "从主物料表同步信息,操作结果:{{#_ret}}", bizNo = "", extra = "{{#rowId}}", type = "移动破-从主物料表同步信息")
+    public ResultVO<Void> syncMaterailInfo(@Valid @RequestParam("rowId") @NotNull Long rowId) {
+        optionalEbomMainService.syncMaterailInfo(rowId);
+        return ResultVO.success();
+    }
 
 
 }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomMainMapper.java

@@ -1,21 +1,12 @@
 package com.nflg.product.bomnew.mapper.master;
 
- 
 
- 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
- import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
+import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity;
- import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery;
- import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nflg.product.bomnew.pojo.vo.OptionalEbomMainVO;
- import com.nflg.product.base.core.vo.PageVO;
- import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity;
- import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery;
- import com.nflg.product.bomnew.pojo.query.OptionalEbomMainQuery;
- import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
- import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
- import com.nflg.product.bomnew.pojo.vo.OptionalEbomMainVO;
- import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,5 +21,7 @@ int updateRow(OptionalEbomMainEntity entity);
 
  int insertBatch(@Param("entities") List<OptionalEbomMainEntity> entities);
  int deleteByRowIds(@Param("rowIds") String rowIds);
+
+ void syncMaterailInfo(Long rowId);
 }
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainService.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.base.core.vo.PageVO;
@@ -16,16 +15,10 @@ import com.nflg.product.bomnew.mapper.master.OptionalEbomMainMapper;
 import com.nflg.product.bomnew.pojo.dto.OptionalEbomMainDTO;
 import com.nflg.product.bomnew.pojo.dto.OptionalEbomMainDelDTO;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigEntity;
-import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigREntity;
-import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportEntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity;
 import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery;
-import com.nflg.product.bomnew.pojo.query.OptionalEbomMainQuery;
-import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
 import com.nflg.product.bomnew.pojo.vo.OptionalEbomMainVO;
-import com.nflg.product.bomnew.service.OptionalEbomMainService;
 import nflg.product.common.constant.STATE;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -186,5 +179,8 @@ public class OptionalEbomMainService extends ServiceImpl<OptionalEbomMainMapper,
     }
 
 
+    public void syncMaterailInfo(Long rowId) {
+        this.getBaseMapper().syncMaterailInfo(rowId);
+    }
 }
 

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml

@@ -134,5 +134,17 @@
         </set>
         where row_id = #{rowId}
     </update>
+    <update id="syncMaterailInfo">
+        UPDATE t_optional_ebom_import_child
+            JOIN t_optional_ebom_main ON t_optional_ebom_import_child.root_row_id = t_optional_ebom_main.row_id
+                AND t_optional_ebom_import_child.material_no != '无'
+                AND t_optional_ebom_import_child.material_name != '无'
+            JOIN t_material_main ON t_optional_ebom_import_child.material_no = t_material_main.material_no
+                AND t_optional_ebom_import_child.material_name != t_material_main.material_desc
+        SET t_optional_ebom_import_child.material_desc=t_material_main.material_desc,
+            t_optional_ebom_import_child.material_name=t_material_main.material_desc,
+            t_optional_ebom_import_child.drawing_no=t_material_main.drawing_no
+        WHERE t_optional_ebom_main.row_id = #{rowId};
+    </update>
 
 </mapper>