From 9248214549c770563d2edc49a43bd3a33f1ccb08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Wed, 6 Mar 2024 09:58:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=97=A5=E5=BF=97=202=E3=80=81?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8E=82=203?= =?UTF-8?q?=E3=80=81=E8=BD=ACMBOM=E6=97=B6=EF=BC=8C=E6=97=A7=E7=9A=84?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=E5=8E=86=E5=8F=B2=E4=B8=94=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E4=BB=A5B=E5=BC=80=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nflg/BomnewApplication.java | 2 +- .../product/bomnew/api/user/BomNewLogApi.java | 50 +++++++++++++++ .../bomnew/mapper/master/BomNewLogMapper.java | 6 +- .../mapper/master/BomNewMbomParentMapper.java | 5 ++ .../bomnew/pojo/entity/BomNewLogEntity.java | 23 ++++--- .../bomnew/pojo/query/BomNewLogQuery.java | 61 +++++++++++++++++++ .../bomnew/service/BomNewLogService.java | 11 +++- .../service/BomNewPbomParentService.java | 7 ++- .../domain/PBom/ConvertToMBomBase.java | 17 ++++-- .../service/log/DbLogRecordServiceImpl.java | 1 + .../nflg/product/bomnew/util/VersionUtil.java | 11 ++++ .../mapper/master/BomNewLogMapper.xml | 32 ++++++++-- .../mapper/master/BomNewMbomParentMapper.xml | 11 ++++ 13 files changed, 213 insertions(+), 24 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomNewLogApi.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewLogQuery.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/BomnewApplication.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/BomnewApplication.java index ab7f98c6..a4435c1a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/BomnewApplication.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/BomnewApplication.java @@ -21,7 +21,7 @@ import java.util.TimeZone; @EnableDiscoveryClient @EnableScheduling @EnableFeignClients -@EnableLogRecord(tenant = "com.nflg") +@EnableLogRecord(tenant = "BOM") public class BomnewApplication { public static void main(String[] args) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomNewLogApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomNewLogApi.java new file mode 100644 index 00000000..15908bc1 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomNewLogApi.java @@ -0,0 +1,50 @@ +package com.nflg.product.bomnew.api.user; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nflg.product.base.core.api.BaseApi; +import com.nflg.product.bomnew.pojo.entity.BomNewLogEntity; +import com.nflg.product.bomnew.pojo.query.BomNewLogQuery; +import com.nflg.product.bomnew.service.BomNewLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import nflg.product.common.vo.ResultVO; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * t_bom_new_log 表控制层 + * + * + * @author makejava + * @since 2024-03-06 08:30:00 + */ +@Api(tags = "日志") +@RestController +@RequestMapping("bomNewLogEntity") +public class BomNewLogApi extends BaseApi { + + /** + * 服务对象 + */ + @Resource + private BomNewLogService bomNewLogService; + + /** + * 分页查询所有数据 + * + * @param query Query 查询实体 + * @return 所有数据 + */ + @PostMapping("getListByPage") + @ApiOperation("auto-获取日志") + public ResultVO> selectBomNewLogEntityPageByCondition(@RequestBody BomNewLogQuery query) { + return ResultVO.success(bomNewLogService.getListByPage(query)); + } + + + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewLogMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewLogMapper.java index 27f5c6b7..4d54a52d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewLogMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewLogMapper.java @@ -1,8 +1,10 @@ package com.nflg.product.bomnew.mapper.master; -import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.bomnew.pojo.entity.BomNewLogEntity; +import com.nflg.product.bomnew.pojo.query.BomNewLogQuery; +import org.apache.ibatis.annotations.Param; /** * t_bom_new_log 表数据库访问层 @@ -12,4 +14,6 @@ import com.nflg.product.bomnew.pojo.entity.BomNewLogEntity; * @since 2024-03-01 17:10:57 */ public interface BomNewLogMapper extends BaseMapper { + + Page getListByPage(Page page , @Param("query") BomNewLogQuery query); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java index 5715c0c4..38d90fe4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java @@ -48,6 +48,11 @@ public interface BomNewMbomParentMapper extends BaseMapper { + public IPage getListByPage(BomNewLogQuery query){ + Page page=new Page<>(query.getPage(),query.getPageSize()); + return this.getBaseMapper().getListByPage(page,query); + } + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 964caca9..936400b7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -616,17 +616,18 @@ public class BomNewPbomParentService extends ServiceImpl{ try { List allBom = this.getAllBomTree(k.getBomRowId()); - List rowIds = allBom.stream().map(u -> u.getRowId()).collect(Collectors.toList()); + List rowIds =new ArrayList<>(); + rowIds.add(k.getRowId()); + rowIds.addAll(allBom.stream().map(u -> u.getRowId()).collect(Collectors.toList())); if(CollUtil.isNotEmpty(rowIds)) { pbomChildService.getBaseMapper().setProductionFactoryCode(k.getProductionFactoryCode(), rowIds); } - } catch (ExecutionException e) { e.printStackTrace(); } catch (InterruptedException e) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBomBase.java index 3644e8c4..905a92ea 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBomBase.java @@ -77,21 +77,26 @@ public class ConvertToMBomBase { protected BomNewMbomParentEntity buildMBomParent(String facCode) { BomNewMbomParentEntity mBomParent = new BomNewMbomParentEntity(); BeanUtil.copyProperties(parent, mBomParent); - BomNewMbomParentEntity oldParent = SpringUtil.getBean(BomNewMbomParentService.class).lambdaQuery().eq(BomNewMbomParentEntity::getMaterialNo, parent.getMaterialNo()) - .eq(BomNewMbomParentEntity::getLastVersionIs, 1).eq(BomNewMbomParentEntity::getFacCode, facCode).one(); + BomNewMbomParentEntity oldParent = SpringUtil.getBean(BomNewMbomParentService.class).lambdaQuery().eq(BomNewMbomParentEntity::getMaterialNo, parent.getMaterialNo()).eq(BomNewMbomParentEntity::getFacCode, facCode) + .last(" order by current_version desc limit 1").one(); if (Objects.nonNull(oldParent)) { if (MBomConstantEnum.MBomStatusEnum.PUB_SAP.equalsValue(oldParent.getStatus())) { + //将数据迁移到历史表 + SpringUtil.getBean(BomNewMbomParentService.class).getBaseMapper().insertMBomIntoHistory(oldParent.getRowId()); - mBomParent.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion())); - oldParent.setLastVersionIs(0); - this.mBomParentResult.add(oldParent); + mBomParent.setCurrentVersion(VersionUtil.getMBomNextVersion(oldParent.getCurrentVersion())); + + SpringUtil.getBean(BomNewMbomDetailService.class).getBaseMapper().deleteByMap(ImmutableMap.of("bom_row_id", oldParent.getRowId())); + SpringUtil.getBean(BomNewMbomParentService.class).getBaseMapper().deleteById(oldParent.getRowId()); +// oldParent.setLastVersionIs(0); +// this.mBomParentResult.add(oldParent); } else { SpringUtil.getBean(BomNewMbomDetailService.class).getBaseMapper().deleteByMap(ImmutableMap.of("bom_row_id", oldParent.getRowId())); SpringUtil.getBean(BomNewMbomParentService.class).getBaseMapper().deleteById(oldParent.getRowId()); mBomParent.setCurrentVersion(oldParent.getCurrentVersion()); } } else { - mBomParent.setCurrentVersion(VersionUtil.getNextVersion("")); + mBomParent.setCurrentVersion(VersionUtil.getMBomNextVersion("")); } mBomParent.setRowId(IdWorker.getId()); mBomParent.setFacCode(facCode); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/log/DbLogRecordServiceImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/log/DbLogRecordServiceImpl.java index 0c607ffc..0ebf58a3 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/log/DbLogRecordServiceImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/log/DbLogRecordServiceImpl.java @@ -22,6 +22,7 @@ public class DbLogRecordServiceImpl implements ILogRecordService { BomNewLogEntity logEnt=new BomNewLogEntity(); logEnt.setRowId(IdWorker.getId()); + logEnt.setModelName(logRecord.getTenant()); logEnt.setOpBizNo(logRecord.getBizNo()); logEnt.setOpAction(logRecord.getType()); logEnt.setOpContent(logRecord.getAction()); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/VersionUtil.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/VersionUtil.java index c09d32be..40b9c2fe 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/VersionUtil.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/VersionUtil.java @@ -19,6 +19,8 @@ public class VersionUtil { static final String versionPrefix = "A"; + static final String mBomVersionPrefix = "B"; + /** * 获取下一个版本号(大版本) */ @@ -32,6 +34,15 @@ public class VersionUtil { } + public static String getMBomNextVersion(String preVersion) { + if (StrUtil.isBlank(preVersion)) { + return mBomVersionPrefix + "00"; + } + + Integer versionNum = Convert.toInt(StrUtil.replace(preVersion, mBomVersionPrefix, "")) + 1; + return mBomVersionPrefix + StrUtil.padPre(versionNum.toString(), 2, '0'); + } + /** * 获取下一个小版本号(小版本) */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml index 14a69140..43b6749b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml @@ -6,18 +6,42 @@ - + + - + - row_id, op_biz_no, op_action, op_content, op_content_ext, op_user_job_no, op_user_name, op_time ,dpt_name - + row_id, model_name, op_biz_no, op_action, op_content, op_content_ext, op_user_job_no, op_user_name, op_time, dpt_name + + + + and model_name like concat('%',#{query.modelName},'%') + + + and op_action like concat('%',#{query.opAction},'%') + + + and op_user_name =#{query.opUserName} + + + and op_user_job_no =#{query.opUserJobNo} + + + and op_time >= #{query.startDate} and op_time <= #{query.endDate} + + + + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml index 7e141eea..5133a16b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml @@ -187,5 +187,16 @@ + + + INSERT INTO `nflg`.`t_bom_new_mbom_parent_history` (`row_id`, `batch_no`, `drawing_no`, `fac_code`, `material_no`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `current_version`, `num`, `last_version_is`, `status`, `sysn_sap_user_name`, `sysn_sap_time`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `expire_end_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `order_no`, `modify_time`) + select `row_id`, `batch_no`, `drawing_no`, `fac_code`, `material_no`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `current_version`, `num`, `last_version_is`, `status`, `sysn_sap_user_name`, `sysn_sap_time`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `expire_end_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `order_no`, `modify_time` from t_bom_new_mbom_parent where row_id=#{rowId}; + + + INSERT INTO `nflg`.`t_bom_new_mbom_detail_history` (`row_id`, `bom_row_id`, `parent_row_id`, `drawing_no`, `fac_code`, `material_no`, `current_version`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `num`, `project_type`, `super_material_status`, `virtual_part_is`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `modify_time`, `material_back_status`, `virtual_part_type`) + + select `row_id`, `bom_row_id`, `parent_row_id`, `drawing_no`, `fac_code`, `material_no`, `current_version`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `num`, `project_type`, `super_material_status`, `virtual_part_is`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `modify_time`, `material_back_status`, `virtual_part_type` from t_bom_new_mbom_detail where bom_row_id=#{rowId}; + +