From 857b37787c3c8b54d1c1151559d643499f8a7a08 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Mon, 12 Aug 2024 20:31:42 +0800 Subject: [PATCH] =?UTF-8?q?2024.8.12=20=E2=91=A0=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=94=B6=E9=9B=86-=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=A2=E6=88=B7=E9=80=89=E6=8B=A9=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/controller/EamProjectController.java | 31 +++++++++++++++++-- .../modules/pms/mapper/EamProjectMapper.java | 4 ++- .../pms/service/EamProjectService.java | 4 ++- .../service/Impl/EamProjectServiceImpl.java | 20 +++++++++--- .../resources/mapper/pms/EamProjectMapper.xml | 18 ++++++++--- 5 files changed, 63 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java index 63a723ae..27e24304 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java @@ -130,9 +130,34 @@ public class EamProjectController { return responseData; } - @PostMapping("/getTestPartNo") - public String getTestPareamProjectInfoDeletetNo() { - return eamProjectService.getTestPartNo(); + /** + * @Description 获取客户编码中最大的客户编码 + * @Title getCustomerNo + * @param inData + * @author jiayang_yue + * @data 2024/8/12 19:01 + * @return com.xujie.sys.common.utils.R + **/ + @PostMapping("/getCustomerNo") + @ResponseBody + public R getCustomerNo(@RequestBody EamProjectInfoData inData) { + EamProjectInfoData data = eamProjectService.getCustomerNo(inData); + return R.ok().put("data", data); + } + + /** + * @Description 保存新的客户信息 + * @Title saveNewCustomer + * @param inData + * @author jiayang_yue + * @data 2024/8/12 19:02 + * @return com.xujie.sys.common.utils.R + **/ + @PostMapping("/saveNewCustomer") + @ResponseBody + public R saveNewCustomer(@RequestBody EamProjectInfoData inData) { + eamProjectService.saveNewCustomer(inData); + return R.ok(); } /** diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java index 2cd85cff..794624b6 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java @@ -36,7 +36,9 @@ public interface EamProjectMapper { void saveFormalPartNo(EamProjectInfoData inData); - List getTestPartNo(); + List getCustomerNo(EamProjectInfoData inData); + + void saveNewCustomer (EamProjectInfoData inData); List checkProjectDelete(EamProjectInfoData inData); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java index 24130196..aeb3292d 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java @@ -30,7 +30,9 @@ public interface EamProjectService { ResponseData eamProjectDelete(EamProjectInfoData data); - String getTestPartNo(); + EamProjectInfoData getCustomerNo(EamProjectInfoData inData); + + void saveNewCustomer(EamProjectInfoData inData); PageUtils eamProjectPartSearch(EamProjectPartInfoData data); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java index 09a2486e..da9c9460 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java @@ -182,12 +182,24 @@ public class EamProjectServiceImpl implements EamProjectService { } @Override - public String getTestPartNo() { - List resultList = EamProjectMapper.getTestPartNo(); + public EamProjectInfoData getCustomerNo(EamProjectInfoData inData) { + List resultList = EamProjectMapper.getCustomerNo(inData); if (resultList.isEmpty()) { - return ""; + return null; } - return resultList.get(0); + else { + for (EamProjectInfoData data : resultList) { + if (data.getCustomerDesc().equals(inData.getCustomerDesc())) { + throw new RuntimeException("该客户已存在，请重新输入客户名称!"); + } + } + return resultList.get(0); + } + } + + @Override + public void saveNewCustomer(EamProjectInfoData inData){ + EamProjectMapper.saveNewCustomer(inData); } @Override diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml index 11440bd1..b87c82fb 100644 --- a/src/main/resources/mapper/pms/EamProjectMapper.xml +++ b/src/main/resources/mapper/pms/EamProjectMapper.xml @@ -133,14 +133,22 @@ LEFT JOIN plm_project_part as b ON a.id = b.project_id WHERE a.project_no = #{projectNo} and a.site = #{site} and a.bu_no = #{buNo} - SELECT - test_part_no + customer_no, + customer_desc, + active FROM - plm_project_part AS a - LEFT JOIN plm_project_info AS b ON a.project_id = b.id - ORDER BY test_part_no DESC + plm_customer_information AS a + where site = #{site} and active = 'Y' + ORDER BY customer_no DESC + + INSERT INTO plm_customer_information + (site,customer_no,customer_desc,create_date,create_by,active) + VALUES + (#{site},#{customerNo},#{customerDesc},GETDATE(),#{createBy},'Y') +