2025-06-13

料号没带出来
必填标识去掉
选择新料号需要排除在技术参数卡中存在的

src/main/java/com/spring/modules/change/controller/ChangeManagementController.java

@@ -74,8 +74,8 @@ public class ChangeManagementController {
     @PostMapping(value="/changeRequestTempSave")
     @ResponseBody
     public R changeRequestTempSave(@RequestBody TransNoEntity data) {
-        String changeNo = changeManagementService.changeRequestTempSave(data);
-        return R.ok().put("changeNo", changeNo);
+        Map<String, Object> map = changeManagementService.changeRequestTempSave(data);
+        return R.ok().put("rows", map);
     }
 
     /**

src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java

@@ -87,7 +87,9 @@ public class ChangeRequestDetailEntity extends QueryPage implements Serializable
     @TableField(exist = false)
     private String buNo;
 
-
     @TableField(exist = false)
     private String plmPartNo;
+
+    @TableField(exist = false)
+    private String ifsPartNo;
 }

src/main/java/com/spring/modules/change/service/ChangeManagementService.java

@@ -21,7 +21,7 @@ public interface ChangeManagementService {
 
     void changeRequestSave(ChangeRequestVo data);
 
-    String changeRequestTempSave(TransNoEntity data);
+    Map<String, Object> changeRequestTempSave(TransNoEntity data);
 
     void deleteChangeFiles(ChangeRequestEntity data);
 

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

@@ -148,7 +148,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
      */
     @Override
     @Transactional
-    public String changeRequestTempSave(TransNoEntity data) {
+    public Map<String, Object> changeRequestTempSave(TransNoEntity data) {
         // 获取变更单号
         String changeNo = transNoControlService.transNo(data.getSite(), data.getTransType());
         // 新增变更申请
@@ -180,7 +180,15 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         executionUpdate(executionInfo);
         // 编辑会签信息
         countersignatureUpdate(executionInfo);
-        return changeNo;
+        // 查询变更单明细
+        ChangeRequestEntity inData = new ChangeRequestEntity();
+        inData.setSite(data.getSite());
+        inData.setChangeNo(changeNo);
+        List<ChangeRequestDetailEntity> chooseDataList = changeManagementMapper.requestDetailSearch(inData);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("changeNo", changeNo);
+        map.put("chooseDataList", chooseDataList);
+        return map;
     }
 
     /**

src/main/resources/mapper/change/ChangeManagementMapper.xml

@@ -598,7 +598,8 @@
             a.create_by,
             a.update_date,
             a.update_by,
-            b.plm_part_no
+            b.plm_part_no,
+            b.ifs_part_no
         FROM plm_change_request_detail as a
         left join part as b on a.site = b.site and a.part_no = b.ifs_part_no and b.show_in_query_flag ='Y'
         where a.site = #{site} and a.change_no = #{changeNo}
@@ -1352,8 +1353,12 @@
         FROM view_Project_final_Part as a
         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 pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
+        left join plm_technical_specification_sheet d on a.site = d.site  and a.test_part_no = d.test_part_no
+        left join plm_change_request_detail T ON A.SITE = T.SITE AND A.FINAL_PART_NO = T.PART_NO
         <where>
             a.site = #{query.site}
+            and d.test_part_no is null
+            and T.PART_NO is null
             <if test="query.buNo != null and query.buNo != ''">
                 AND a.bu_no = #{query.buNo}
             </if>
@@ -1369,6 +1374,7 @@
             <if test="query.partDesc != null and query.partDesc != ''">
                 AND a.Part_desc like #{query.partDesc}
             </if>
+            and a.RealFlag = 'Y'
         </where>
     </select>