2024-10-17

优化

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -1219,7 +1219,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             ReceiveRequestInfoParam receiveRequestInfoParam = new ReceiveRequestInfoParam(
                     paramData.getUserId(),
                     "PLM",
-                    paramData.getWorkflowId(),
+                    paramData.getWorkflowId() + paramData.getRequestId(),
                     paramData.getRequestName(),
                     paramData.getWorkflowName(),
                     String.valueOf(isRemarks.get(0).get("nodeName")),
@@ -1705,7 +1705,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 ReceiveRequestInfoParam receiveRequestInfoParam = new ReceiveRequestInfoParam(
                         paramData.getUserId(),
                         "PLM",
-                        paramData.getWorkflowId(),
+                        paramData.getWorkflowId() + paramData.getRequestId(),
                         paramData.getRequestName(),
                         paramData.getWorkflowName(),
                         String.valueOf(isRemarks.get(0).get("nodeName")),
@@ -1827,7 +1827,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 ReceiveRequestInfoParam receiveRequestInfoParam = new ReceiveRequestInfoParam(
                         paramData.getUserId(),
                         "PLM",
-                        paramData.getWorkflowId(),
+                        paramData.getWorkflowId() + paramData.getRequestId(),
                         paramData.getRequestName(),
                         paramData.getWorkflowName(),
                         String.valueOf(isRemarks.get(0).get("nodeName")),

src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java

@@ -1816,10 +1816,10 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                 List<PartIfsInventoryRevision> revisionList = partInformationMapper.getPartRevisionList(ifsPart); // revision对象
 
                 // 校验revision
-                boolean b = revisionList.stream().anyMatch(a -> a.getEffPhaseOutDate() == null || a.getEffPhaseOutDate().isEmpty() || a.getEngRevision() == null || a.getEngRevision().isEmpty());
-                if (b) {
-                    throw new RuntimeException("请维护库存件版本的失效时间 和 工程版本号!");
-                }
+//                boolean b = revisionList.stream().anyMatch(a -> a.getEffPhaseOutDate() == null || a.getEffPhaseOutDate().isEmpty() || a.getEngRevision() == null || a.getEngRevision().isEmpty());
+//                if (b) {
+//                    throw new RuntimeException("请维护库存件版本的失效时间 和 工程版本号!");
+//                }
 
                 // 1.1 库存件主表数据
                 String getInventoryPartURL = apiUrl + "/part/ifs/getInventoryPart";

src/main/java/com/spring/modules/project/data/PlmProjectPartData.java

@@ -49,6 +49,16 @@ public class PlmProjectPartData extends PlmProjectPart {
     private String plmPartNo;
     private String nowBm;
 
+    private String customerPartNo;
+
+    public String getCustomerPartNo() {
+        return customerPartNo;
+    }
+
+    public void setCustomerPartNo(String customerPartNo) {
+        this.customerPartNo = customerPartNo;
+    }
+
     public String getPlmPartNo() {
         return plmPartNo;
     }

src/main/resources/mapper/project/ProjectDao.xml

@@ -282,10 +282,12 @@
     a.unit_price,
     a.tax_unit_price,
     a.bu_no,
-    dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc
+    dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc,
+    d.customer_part_no
     from plm_project_part as a
     LEFT JOIN part as b on a.site = b.site and a.test_part_no = b.part_no
     left join plm_project_info as c on a.site = c.site and a.project_id = c.project_id
+    left join plm_customer_part_info as d on c.site = d.site and c.customer_id = d.customer_no and a.test_part_no = d.part_no
     where a.site = #{site} and a.project_id = #{projectId}
 </select>
 
@@ -480,36 +482,52 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_
 
     <select id="projectInfoPartSearch" resultType="PlmProjectPartData">
         select
-        id,
-        site,
-        project_id,
-        test_part_no,
-        part_type,
-        part_desc,
-        part_spec,
-        material_number,
-        remark,
-        create_date,
-        create_by,
-        update_date,
-        part_name,
-        update_by,
-        dbo.get_family_name(site, part_type) as partTypeDesc,
-        final_part_no,
-        code_no,
-        dbo.get_code_desc(site, code_no, 'IP') as codeDesc,
-        group_id,
-        dbo.get_group_name(site, group_id) as groupName,
-        product_group_id1,
-        dbo.get_product_group_name(site, product_group_id1, '1') as productGroupName1,
-        product_group_id2,
-        dbo.get_product_group_name(site, product_group_id2, '2') as productGroupName2
-        from view_Project_Part where site=#{query.site}
+        a.id,
+        a.site,
+        a.bu_no,
+        a.project_id,
+        a.test_part_no,
+        a.final_part_no,
+        a.material_number,
+        a.part_name,
+        a.part_desc,
+        a.part_spec,
+        a.create_date,
+        a.create_by,
+        a.update_date,
+        a.update_by,
+        a.code_no,
+        dbo.get_code_desc(a.site, a.code_no, 'IP') as codeDesc,
+        a.um_id,
+        a.group_id,
+        dbo.get_group_name(a.site, a.group_id) as groupName,
+        a.part_type,
+        dbo.get_family_name(a.site, a.part_type) as partTypeDesc,
+        a.type,
+        a.product_group_id1,
+        dbo.get_product_group_name(a.site, a.product_group_id1, '1') as productGroupName1,
+        a.product_group_id2,
+        dbo.get_product_group_name(a.site, a.product_group_id2, '2') as productGroupName2,
+        a.remark,
+        c.customer_part_no
+        from view_Project_Part as a
+        left join plm_project_info as b on a.site = b.site and a.project_id = b.project_id
+        left join plm_customer_part_info as c on b.site = c.site and b.customer_id = c.customer_no and a.test_part_no = c.part_no
+        where a.site = #{query.site}
+        <if test = "query.buNo != null and query.buNo != ''">
+            AND a.bu_no = #{query.buNo}
+        </if>
+        <if test = "query.customerPartNo != null and query.customerPartNo != ''">
+            AND c.customer_part_no like #{query.customerPartNo}
+        </if>
+        <if test = "query.finalPartNo != null and query.finalPartNo != ''">
+            AND a.final_part_no like #{query.finalPartNo}
+        </if>
         <if test="query.testPartNo != null and query.testPartNo != ''">
-            and test_part_no like #{query.testPartNo}
+            and a.test_part_no like #{query.testPartNo}
         </if>
         <if test="query.projectId != null and query.projectId != ''">
-            and project_id like #{query.projectId}
+            and a.project_id like #{query.projectId}
         </if>
     </select>