From 6a6161fb0bb380bf5cb9105b9c969959dd68a660 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 20 Mar 2024 18:07:16 +0800 Subject: [PATCH] 1127 --- .../java/com/spring/modules/part/vo/BomDetailVo.java | 11 +++++++++++ .../controller/TechnicalSpecificationController.java | 3 ++- .../dao/TechnicalSpecificationMapper.java | 3 ++- .../Impl/TechnicalSpecificationServiceImpl.java | 3 ++- .../service/TechnicalSpecificationService.java | 3 ++- .../sampleManagement/TechnicalSpecificationMapper.xml | 8 ++++---- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/spring/modules/part/vo/BomDetailVo.java b/src/main/java/com/spring/modules/part/vo/BomDetailVo.java index fa877884..6250f942 100644 --- a/src/main/java/com/spring/modules/part/vo/BomDetailVo.java +++ b/src/main/java/com/spring/modules/part/vo/BomDetailVo.java @@ -1,8 +1,12 @@ package com.spring.modules.part.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.spring.modules.part.entity.BomDetailEntity; import com.spring.modules.part.entity.BomHeaderEntity; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; @Data public class BomDetailVo extends BomDetailEntity { @@ -15,4 +19,11 @@ public class BomDetailVo extends BomDetailEntity { * 上一个版本对象 */ private BomDetailEntity previousVersion; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date effPhaseInDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date effPhaseOutDate; } diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index 89316b91..67879c9f 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -9,6 +9,7 @@ import com.spring.modules.base.data.PlmBmPropertiesValueData; import com.spring.modules.part.entity.BomDetailEntity; import com.spring.modules.part.entity.RoutingDetailEntity; import com.spring.modules.part.vo.BomComponentVo; +import com.spring.modules.part.vo.BomDetailVo; import com.spring.modules.part.vo.PartInformationVo; import com.spring.modules.part.vo.RoutingComponentVo; import com.spring.modules.project.data.PlmProjectPartData; @@ -285,7 +286,7 @@ public class TechnicalSpecificationController { @PostMapping(value="/searchBMBomDetail") @ResponseBody public R searchBMBomDetail(@RequestBody BomDetailEntity data){ - List rows= technicalSpecificationService.searchBMBomDetail(data); + List rows= technicalSpecificationService.searchBMBomDetail(data); return R.ok().put("rows", rows); } /** diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index 150072b4..68515c57 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -9,6 +9,7 @@ import com.spring.modules.part.entity.BomHeaderEntity; import com.spring.modules.part.entity.RoutingDetailEntity; import com.spring.modules.part.entity.RoutingHeaderEntity; import com.spring.modules.part.vo.BomComponentVo; +import com.spring.modules.part.vo.BomDetailVo; import com.spring.modules.part.vo.PartInformationVo; import com.spring.modules.part.vo.RoutingComponentVo; import com.spring.modules.project.data.PlmProjectInfoData; @@ -280,7 +281,7 @@ public interface TechnicalSpecificationMapper { * @return List * @throw */ - List searchBMBomDetail(BomDetailEntity data); + List searchBMBomDetail(BomDetailEntity data); /** * @Description TODO * @Title saveBMRoutingDetail diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index 01c883d0..c19b81b5 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -19,6 +19,7 @@ import com.spring.modules.part.mapper.BomManagementMapper; import com.spring.modules.part.mapper.MasterPartInformationMapper; import com.spring.modules.part.mapper.PartInformationMapper; import com.spring.modules.part.vo.BomComponentVo; +import com.spring.modules.part.vo.BomDetailVo; import com.spring.modules.part.vo.PartInformationVo; import com.spring.modules.part.vo.RoutingComponentVo; import com.spring.modules.project.data.*; @@ -293,7 +294,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification return technicalSpecificationMapper.searchBMRoutingDetail(data); } @Override - public List searchBMBomDetail(BomDetailEntity data){ + public List searchBMBomDetail(BomDetailEntity data){ return technicalSpecificationMapper.searchBMBomDetail(data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index 97b502d4..b35c5901 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -7,6 +7,7 @@ import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData; import com.spring.modules.part.entity.BomDetailEntity; import com.spring.modules.part.entity.RoutingDetailEntity; import com.spring.modules.part.vo.BomComponentVo; +import com.spring.modules.part.vo.BomDetailVo; import com.spring.modules.part.vo.PartInformationVo; import com.spring.modules.part.vo.RoutingComponentVo; import com.spring.modules.project.data.PlmProjectInfoData; @@ -216,7 +217,7 @@ public interface TechnicalSpecificationService { * @return List * @throw */ - List searchBMBomDetail(BomDetailEntity data); + List searchBMBomDetail(BomDetailEntity data); /** * @Description 删除bom diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 0f77e698..4de03b2f 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -793,11 +793,11 @@ a.routing_alternative_no alternativeNo,b.final_part_no partNo - select a.site,a.part_no,a.alternative_no,a.alternative_description,a.bom_type,a.eng_chg_level,a.min_lot_qty,a.default_flag, - a.note_text,a.create_date,a.create_by,a.update_date,a.update_by,a.status,a.official_flag - from plm_bom_detail a - where part_no=#{partNo} and site=#{site} + a.note_text,a.create_date,a.create_by,a.update_date,a.update_by,a.status,a.official_flag,B.eff_phase_in_date,B.eff_phase_out_date + from plm_bom_detail a left join plm_bom_header b on a.site=b.site and a.part_no=b.part_NO AND A.eng_chg_level=B.eng_chg_level + where a.part_no=#{partNo} and a.site=#{site} and a.bom_type!='Repair' update plm_technical_specification_sheet set bom_type=#{bomType},eng_chg_level=#{engChgLevel,jdbcType=INTEGER},