From d50ca019c35c14e817e1b64e3f20d68a41c54d33 Mon Sep 17 00:00:00 2001 From: jing's Date: Sun, 3 Dec 2023 19:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/api/user/OptionalMbomApi.java | 2 + .../service/OptionalMbomCompareService.java | 3 +- .../aggreg/AggregOptionConfigService.java | 2 + .../bomnew/service/aggreg/PublishService.java | 60 ++++++++ .../master/OptionalEbomConfigMapper.xml | 5 +- .../master/OptionalMbomCompareMapper.xml | 137 +----------------- 6 files changed, 72 insertions(+), 137 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishService.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java index 32a69415..7ea49bab 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java @@ -1,6 +1,7 @@ package com.nflg.product.bomnew.api.user; +import cn.hutool.crypto.digest.MD5; import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.base.core.conmon.util.SessionUtil; @@ -63,6 +64,7 @@ public class OptionalMbomApi extends BaseApi { @ApiOperation("已发布机型分页数据") public ResultVO> getPublishListPage(@RequestBody OptionalEbomConfigListQuery query) { query.setCreatedBy(SessionUtil.getUserCode()); + return ResultVO.success(this.optionalEbomConfigService.getPublishListPage(query)); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomCompareService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomCompareService.java index 3157b9bf..0ff1be95 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomCompareService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomCompareService.java @@ -10,8 +10,7 @@ import org.springframework.stereotype.Service; /** * 用户选配比对是否相同(OptionalMbomCompare)表服务实现类 * - * @author makejava - * @since 2023-11-26 22:19:49 + */ @Service public class OptionalMbomCompareService extends ServiceImpl { 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 76da5982..1676cc43 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 @@ -257,4 +257,6 @@ public class AggregOptionConfigService { + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishService.java new file mode 100644 index 00000000..f98713bc --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishService.java @@ -0,0 +1,60 @@ +package com.nflg.product.bomnew.service.aggreg; + +import cn.hutool.crypto.digest.MD5; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.nflg.product.bomnew.pojo.entity.OptionalMbomCompareEntity; +import com.nflg.product.bomnew.pojo.vo.OptionalEbomImportChildVO; +import com.nflg.product.bomnew.service.OptionalEbomConfigService; +import com.nflg.product.bomnew.service.OptionalMbomCompareService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + + +@Service +public class PublishService { +@Resource +private OptionalMbomCompareService optionalMbomCompareService; + + + @Resource + private OptionalEbomConfigService optionalEbomConfigService; + + + /** + * 发布 + * 1.获取物料信息 + * 2.更改状态 + * 3.上传sap + * @param rowId + */ + + public void publish(Long rowId) { + + List previewOptionList= optionalEbomConfigService.getPreviewOptionList(rowId); + List materialNoList = previewOptionList.stream().map(OptionalEbomImportChildVO::getMaterialNo).collect(Collectors.toList()); + + Collections.sort(materialNoList); + + String result = materialNoList.stream().map(String::valueOf).collect(Collectors.joining(",")); + + String signMd5= MD5.create().digestHex(result); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(OptionalMbomCompareEntity::getSignMd5, signMd5); + + OptionalMbomCompareEntity optionalMbomCompareEntity = optionalMbomCompareService.getOne(queryWrapper); + + System.out.println(result); + System.out.println(signMd5); + } + + + + + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml index b732c5c3..29338b9e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml @@ -94,9 +94,12 @@ t1.created_by, t2.choose_status from t_optional_ebom_config_r as t2 LEFT JOIN t_optional_ebom_import_child as t1 on t2.option_row_id=t1.row_id - where t1.is_enable=1 and t2.parent_row_id=#{rowId} and (t1.material_no!=null or t1.material_no!='') + where t1.is_enable=1 and t2.choose_status =1 and t2.parent_row_id=#{rowId} and (t1.material_no!=null or t1.material_no!='') + + + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomCompareMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomCompareMapper.xml index cca7a4d0..959642b1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomCompareMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomCompareMapper.xml @@ -3,8 +3,8 @@ - - + + @@ -16,146 +16,15 @@ row_id,parent_row_id,created_time,material_no,material_name,material_desc,drawing_no,child_row_ids,sign_md5, - - - - - - - - - insert into t_optional_mbom_compare(parent_row_id,created_time,material_no,material_name,material_desc,drawing_no,child_row_ids,sign_md5,) - values (#{parentRowId},#{createdTime},#{materialNo},#{materialName},#{materialDesc},#{drawingNo},#{childRowIds},#{signMd5},) - - - insert into t_optional_mbom_compare(parent_row_id,created_time,material_no,material_name,material_desc,drawing_no,child_row_ids,sign_md5,) - values - - (#{entity.parentRowId},#{entity.createdTime},#{entity.materialNo},#{entity.materialName},#{entity.materialDesc},#{entity.drawingNo},#{entity.childRowIds},#{entity.signMd5},) - - - - insert into t_optional_mbom_compare(parent_row_id,created_time,material_no,material_name,material_desc,drawing_no,child_row_ids,sign_md5,) - values - - (#{entity.parentRowId}#{entity.createdTime}#{entity.materialNo}#{entity.materialName}#{entity.materialDesc}#{entity.drawingNo}#{entity.childRowIds}#{entity.signMd5}) - - on duplicate key update -parent_row_id = values(parent_row_id),created_time = values(created_time),material_no = values(material_no),material_name = values(material_name),material_desc = values(material_desc),drawing_no = values(drawing_no),child_row_ids = values(child_row_ids),sign_md5 = values(sign_md5), - - - - update t_optional_mbom_compare - - - parent_row_id = #{parentRowId}, - - - created_time = #{createdTime}, - - - material_no = #{materialNo}, - - - material_name = #{materialName}, - - - material_desc = #{materialDesc}, - - - drawing_no = #{drawingNo}, - - - child_row_ids = #{childRowIds}, - - - sign_md5 = #{signMd5}, - - - where row_id = #{rowId} - - - - delete from t_optional_mbom_compare where row_id = #{rowId} - +