1127

src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java

@@ -41,6 +41,10 @@ public class PropertiesServiceImpl implements PropertiesService {
             inData.setValueType("文本");
             inData.setMaxValue(null);
             inData.setMinValue(null);
+        }else if("S".equals(inData.getValueTypeDb())){
+            inData.setValueType("超链接");
+            inData.setMaxValue(null);
+            inData.setMinValue(null);
         }else {
             inData.setValueType("数字");
             if(inData.getMaxValue() != null&&inData.getMinValue()!=null){
@@ -66,7 +70,11 @@ public class PropertiesServiceImpl implements PropertiesService {
             inData.setValueType("文本");
             inData.setMaxValue(null);
             inData.setMinValue(null);
-        }else {
+        }else if("S".equals(inData.getValueTypeDb())){
+            inData.setValueType("超链接");
+            inData.setMaxValue(null);
+            inData.setMinValue(null);
+        } else {
             inData.setValueType("数字");
             if(inData.getMaxValue() != null&&inData.getMinValue() != null) {
                 if (inData.getMaxValue() < inData.getMinValue()) {
@@ -131,12 +139,9 @@ public class PropertiesServiceImpl implements PropertiesService {
     public void propertiesModelSave(PlmPropertiesModelHeaderData inData){
         List<PlmPropertiesModelHeaderData> checkPropertiesModel = propertiesMapper.checkPropertiesModel(inData);
         if(checkPropertiesModel.size() > 0) {
-            if("A".equals(inData.getFunctionType())) {
-                throw new RuntimeException("该模板编码已存在!");
-            }
-            if("B".equals(inData.getFunctionType())) {
+
                 throw new RuntimeException("该模板编码已存在!");
-            }
+
 
         }
         propertiesMapper.plmPropertiesModelSave(inData);
@@ -166,18 +171,15 @@ public class PropertiesServiceImpl implements PropertiesService {
             itemDate.setUserId(inData.getUserId());
             List<PlmPropertiesModelDetailData> checkDetail = propertiesMapper.checkModalDetails(itemDate);
             if(checkDetail.size() > 0){
-                if("A".equals(inData.getFunctionType()) || "B".equals(inData.getFunctionType())) {
-                    throw new RuntimeException("该项目已存在在这个模板中!");
-                }
+
+                    throw new RuntimeException("该属性已存在在这个模板中!");
+
             }
             List<PlmPropertiesModelDetailData> checkItem = propertiesMapper.checkItem(itemDate);
             if(checkItem.size() == 0){
-                if("A".equals(inData.getFunctionType())) {
-                    throw new RuntimeException("该项目编码不存在!");
-                }
-                if("B".equals(inData.getFunctionType())) {
-                    throw new RuntimeException("该项目编码不存在!");
-                }
+
+                    throw new RuntimeException("该属性编码不存在!");
+
             }
             itemDate.setSeqNo(propertiesMapper.getModalDetailSeqNo(itemDate));
             itemDate.setOrderId(propertiesMapper.getModalDetailOrderId(itemDate));
@@ -297,7 +299,7 @@ public class PropertiesServiceImpl implements PropertiesService {
             List<PlmBmModelDetailData> checkDetail = propertiesMapper.checkModalDetailsForBM(itemDate);
             if(checkDetail.size() > 0){
 
-                    throw new RuntimeException("该项目已存在在这个模板中!");
+                    throw new RuntimeException("该属性已存在在这个模板中!");
 
             }
             itemDate.setSeqNo(propertiesMapper.getModalDetailSeqNoForBM(itemDate));

src/main/java/com/spring/modules/part/vo/RoutingDetailVo.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.RoutingDetailEntity;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 public class RoutingDetailVo extends RoutingDetailEntity {
@@ -16,4 +20,10 @@ public class RoutingDetailVo extends RoutingDetailEntity {
      * 上一个版本对象
      */
     private RoutingDetailEntity previousVersion;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date phaseInDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date phaseOutDate;
 }

src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java

@@ -8,10 +8,7 @@ import com.spring.modules.base.data.PlmBmModelHeaderData;
 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.part.vo.*;
 import com.spring.modules.project.data.PlmProjectPartData;
 import com.spring.modules.project.data.TechnicalCustomerInfoData;
 import com.spring.modules.sampleManagement.dao.UpBMRevNoData;
@@ -1061,7 +1058,7 @@ public class TechnicalSpecificationController {
     @PostMapping(value="/searchRouteDetail")
     @ResponseBody
     public R searchRouteDetail(@RequestBody RoutingDetailEntity data){
-        List<RoutingDetailEntity> rows= technicalSpecificationService.searchRouteDetail(data);
+        List<RoutingDetailVo> rows= technicalSpecificationService.searchRouteDetail(data);
         return R.ok().put("rows", rows);
     }
 }

src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@@ -8,10 +8,7 @@ import com.spring.modules.part.entity.BomDetailEntity;
 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.part.vo.*;
 import com.spring.modules.project.data.PlmProjectInfoData;
 import com.spring.modules.project.data.PlmProjectPartData;
 import com.spring.modules.project.data.TechnicalCustomerInfoData;
@@ -1104,5 +1101,5 @@ public interface TechnicalSpecificationMapper {
      * @return RoutingDetailEntity
      * @throw
      */
-    List<RoutingDetailEntity> searchRouteDetail(RoutingDetailEntity data);
+    List<RoutingDetailVo> searchRouteDetail(RoutingDetailEntity data);
 }

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -18,10 +18,7 @@ import com.spring.modules.part.entity.*;
 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.part.vo.*;
 import com.spring.modules.project.data.*;
 import com.spring.modules.project.entity.PlmProjectTeam;
 import com.spring.modules.quotation.mapper.QuotationInformationMapper;
@@ -936,7 +933,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
 
     }
     @Override
-    public List<RoutingDetailEntity> searchRouteDetail(RoutingDetailEntity data){
+    public List<RoutingDetailVo> searchRouteDetail(RoutingDetailEntity data){
         return technicalSpecificationMapper.searchRouteDetail(data);
     }
 }

src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java

@@ -6,10 +6,7 @@ import com.spring.modules.base.data.PlmBmPropertiesValueData;
 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.part.vo.*;
 import com.spring.modules.project.data.PlmProjectInfoData;
 import com.spring.modules.project.data.PlmProjectPartData;
 import com.spring.modules.project.data.TechnicalCustomerInfoData;
@@ -924,5 +921,5 @@ public interface TechnicalSpecificationService {
      * @return RoutingDetailEntity
      * @throw
      */
-    List<RoutingDetailEntity> searchRouteDetail(RoutingDetailEntity data);
+    List<RoutingDetailVo> searchRouteDetail(RoutingDetailEntity data);
 }

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -808,9 +808,10 @@ a.routing_alternative_no alternativeNo,b.final_part_no  partNo
     routing_alternative_no=#{routingAlternativeNo} where  site=#{site} and code_no=#{codeNo}
 </update>
 
-<select id="searchRouteDetail" resultType="com.spring.modules.part.entity.RoutingDetailEntity">
-    select site,part_no,routing_revision,routing_type,alternative_no,alternative_description,status,official_flag
-    from plm_routing_detail where site=#{site} and part_no=#{partNo}
+<select id="searchRouteDetail" resultType="com.spring.modules.part.vo.RoutingDetailVo">
+    select a.site,a.part_no,a.routing_revision,a.routing_type,a.alternative_no,a.alternative_description,a.status,a.official_flag,b.phase_in_date,b.phase_out_date
+    from plm_routing_detail a left join plm_routing_header b on a.site=b.site  and a.part_no=b.part_NO AND A.routing_revision=B.routing_revision
+     where a.site=#{site} and a.part_no=#{partNo}  and a.routing_type!='Repair'
 </select>
 
 </mapper>