1127

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

@@ -11,6 +11,7 @@ import com.spring.modules.base.service.PropertiesBUService;
 import com.spring.modules.base.service.PropertiesGroupService;
 import com.spring.modules.base.service.PropertiesService;
 import com.spring.modules.base.utils.ResponseData;
+import com.spring.modules.part.mapper.PartInformationMapper;
 import com.spring.modules.project.dao.ProjectDao;
 import com.spring.modules.project.data.PlmProjectPartData;
 import com.spring.modules.report.dao.ProcedureDao;
@@ -39,7 +40,8 @@ public class PropertiesServiceImpl implements PropertiesService {
     private PropertiesGroupService propertiesGroupService;
     @Autowired
     private PropertiesBUService propertiesBUService;
-
+    @Autowired
+    private PartInformationMapper partInformationMapper;
     @Override
     public PageUtils propertiesItemSearch(PlmPropertiesItemData inData){
         IPage<PlmPropertiesItemData> resultList = this.propertiesMapper.plmPropertiesItemSearch(new Page<PlmPropertiesItemData>(inData.getPage(), inData.getLimit()), inData);
@@ -362,7 +364,14 @@ public class PropertiesServiceImpl implements PropertiesService {
     @Transactional
     public List<PartSubPropertiesValueData> getPropertiesListByPartAndCodeNo(PartSubPropertiesValueData inData){
 
-        return propertiesMapper.getPropertiesListByPartAndCodeNo(inData);
+        List<PartSubPropertiesValueData>  result=  propertiesMapper.getPropertiesListByPartAndCodeNo(inData);
+        for (int i = 0; i < result.size(); i++) {
+            if ("Y".equals(result.get(i).getValueChooseFlag())) {
+                List<PlmPropertiesItemAvailableData> availableList = partInformationMapper.getAvailableValueList(result.get(i));
+                result.get(i).setAvailableValueList(availableList);
+            }
+        }
+        return result;
     }
 
     @Override

src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java

@@ -41,6 +41,7 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     private String peOperaterName;
     private String csOperaterName;
     private String dccOperaterName;
+    private String finalCustomerId;
 
     private String userName;
 
@@ -388,4 +389,12 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     public void setMpOperatorName(String mpOperatorName) {
         this.mpOperatorName = mpOperatorName;
     }
+
+    public String getFinalCustomerId() {
+        return finalCustomerId;
+    }
+
+    public void setFinalCustomerId(String finalCustomerId) {
+        this.finalCustomerId = finalCustomerId;
+    }
 }

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

@@ -80,7 +80,7 @@
      SELECT top 1 a.id,a.site,a.code_no,a.project_id,a.test_part_no,a.status,a.rev_no,a.work_center_no,a.ECN_flag,a.ECN_no,c.bu_no,
         a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,dbo.plm_get_projectBaseDesc(b.part_type,'part_type') partTypeDesc,
         b.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc,a.proofing_no,
-        dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,stage,process,remarkPage,
+        dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,stage,dbo.plm_get_dictDataLabel('bm_process',process,a.site) process,remarkPage,
         dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id,a.ori_code_no,
         a.cqcOperator, a.faiOperator,dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName,dbo.get_userDisPlay(a.faiOperator) faiOperatorName
         ,a.overPrintOperator, a.printOperator,dbo.get_userDisPlay(a.overPrintOperator) overPrintOperatorName,dbo.get_userDisPlay(a.printOperator) printOperatorName
@@ -143,6 +143,15 @@
          AND a.project_id in ( select project_id from AccessProject where site=#{site} and username=#{username} and searchFlag='Y' )
          <if test="proofingNo!= null and proofingNo != ''">
             AND a.proofing_no like #{proofingNo}
+         </if>
+           <if test="projectId!= null and projectId != ''">
+            AND a.project_id like #{projectId}
+         </if>
+           <if test="customerId!= null and customerId != ''">
+            AND b.customer_id like #{customerId}
+         </if>
+              <if test="finalCustomerId!= null and finalCustomerId != ''">
+            AND b.final_customer_id like #{finalCustomerId}
          </if>
          and c.status = 'Y'
      </where>