From 7445517de52b2c787b049b2430c9ab3d697bbb1a Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 13 Jun 2025 14:05:52 +0800 Subject: [PATCH] =?UTF-8?q?2025-06-13=20=E6=96=99=E5=8F=B7=E6=B2=A1?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E6=9D=A5=20=E5=BF=85=E5=A1=AB=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E5=8E=BB=E6=8E=89=20=E9=80=89=E6=8B=A9=E6=96=B0?= =?UTF-8?q?=E6=96=99=E5=8F=B7=E9=9C=80=E8=A6=81=E6=8E=92=E9=99=A4=E5=9C=A8?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=8F=82=E6=95=B0=E5=8D=A1=E4=B8=AD=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChangeManagementController.java | 4 ++-- .../change/entity/ChangeRequestDetailEntity.java | 4 +++- .../change/service/ChangeManagementService.java | 2 +- .../service/impl/ChangeManagementServiceImpl.java | 12 ++++++++++-- .../mapper/change/ChangeManagementMapper.xml | 8 +++++++- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java b/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java index ecd42fda..d0ff719b 100644 --- a/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java +++ b/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 map = changeManagementService.changeRequestTempSave(data); + return R.ok().put("rows", map); } /** diff --git a/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java b/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java index 564aaff3..4969e93f 100644 --- a/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java +++ b/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; } diff --git a/src/main/java/com/spring/modules/change/service/ChangeManagementService.java b/src/main/java/com/spring/modules/change/service/ChangeManagementService.java index b756a3be..87cf0bd6 100644 --- a/src/main/java/com/spring/modules/change/service/ChangeManagementService.java +++ b/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 changeRequestTempSave(TransNoEntity data); void deleteChangeFiles(ChangeRequestEntity data); diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index c37e3512..e17a7a58 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -148,7 +148,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl changeRequestTempSave(TransNoEntity data) { // 获取变更单号 String changeNo = transNoControlService.transNo(data.getSite(), data.getTransType()); // 新增变更申请 @@ -180,7 +180,15 @@ public class ChangeManagementServiceImpl extends ServiceImpl chooseDataList = changeManagementMapper.requestDetailSearch(inData); + HashMap map = new HashMap<>(); + map.put("changeNo", changeNo); + map.put("chooseDataList", chooseDataList); + return map; } /** diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index 590ab4c3..6412a0ca 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/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 a.site = #{query.site} + and d.test_part_no is null + and T.PART_NO is null AND a.bu_no = #{query.buNo} @@ -1369,6 +1374,7 @@ AND a.Part_desc like #{query.partDesc} + and a.RealFlag = 'Y'