From 6143575a5ea0c1aed730f3517ff84decf94b1b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 27 May 2024 15:02:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=A7=BB=E5=8A=A8=E7=A0=B4):=20=E4=BB=8E?= =?UTF-8?q?=E4=B8=BB=E7=89=A9=E6=96=99=E8=A1=A8=E5=90=8C=E6=AD=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/api/user/OptionalEbomApi.java | 14 ++++++++++- .../mapper/master/OptionalEbomMainMapper.java | 23 +++++++------------ .../service/OptionalEbomMainService.java | 10 +++----- .../mapper/master/OptionalEbomMainMapper.xml | 12 ++++++++++ 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java index 5769979a..fd166301 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java +++ b/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 syncMaterailInfo(@Valid @RequestParam("rowId") @NotNull Long rowId) { + optionalEbomMainService.syncMaterailInfo(rowId); + return ResultVO.success(); + } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomMainMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomMainMapper.java index 99232dc3..5ad53971 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomMainMapper.java +++ b/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.extension.plugins.pagination.Page; - 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 com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity; +import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery; +import com.nflg.product.bomnew.pojo.vo.OptionalEbomMainVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,5 +21,7 @@ int updateRow(OptionalEbomMainEntity entity); int insertBatch(@Param("entities") List entities); int deleteByRowIds(@Param("rowIds") String rowIds); + + void syncMaterailInfo(Long rowId); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainService.java index 789b1a80..23294dd4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainService.java +++ b/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 where row_id = #{rowId} + + 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}; +