From 389937749dbcf5ff16056fa0ae02daf0722cbc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 16 Aug 2024 15:20:35 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=AE=A2=E8=AF=89=E9=80=9A=E7=9F=A5=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AE=A2=E8=AF=89=E9=80=9A=E7=9F=A5service=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86sn=E5=8F=B7=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=BE=97?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E7=BB=84=EF=BC=8C=E6=95=B0=E7=BB=84=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E8=B5=8B=E5=80=BC=E7=BB=99=E6=95=B0=E9=87=8F=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...salesComplaintNoticeDetailServiceImpl.java | 75 +++++++++++-------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeDetailServiceImpl.java index 00de6a31..8e0d0acc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeDetailServiceImpl.java @@ -140,6 +140,7 @@ public class AftersalesComplaintNoticeDetailServiceImpl implements IAftersalesCo complaintNoticeDetail.setCreateBy(loginName); complaintNoticeDetail.setCreateTime(DateUtils.getNowDate()); String makeNo = complaintNoticeDetail.getMakeNo(); + int enterpriseSum = 0; //保存信息到AftersalesComplaintNotice数据表中 complaintNotice.setComplaintNoticeCode(newCode); complaintNotice.setCreateBy(loginName); @@ -171,10 +172,13 @@ public class AftersalesComplaintNoticeDetailServiceImpl implements IAftersalesCo complaintNoticeDetail.setAdverseReportUrl(aftersalesMaterialVO.getAdverseReportUrl()); // int totalQuantity = warehouseOutOrderMapper.sumOutOrderQuantityByMakeNo(makeNo); complaintNoticeDetail.setShippedGoodsSum(aftersalesMaterialVO.getShippedGoodsSum()); - complaintNotice.setEnterpriseSum(aftersalesMaterialVO.getShippedGoodsSum()); + String snCodes = aftersalesMaterialVO.getSnCode(); + String[] snCodeArray = snCodes.split(","); + enterpriseSum += snCodeArray.length; aftersalesComplaintNoticeDetailMapper.insertAftersalesComplaintNoticeDetail(complaintNoticeDetail); } - } + complaintNotice.setEnterpriseSum(enterpriseSum); + } complaintNoticeMapper.insertAftersalesComplaintNotice(complaintNotice); return 1; } @@ -191,6 +195,7 @@ public class AftersalesComplaintNoticeDetailServiceImpl implements IAftersalesCo { AftersalesComplaintNotice aftersalesComplaintNotice = new AftersalesComplaintNotice(); String loginName = ShiroUtils.getLoginName(); + int enterpriseSum = 0; //更新主表内容 aftersalesComplaintNotice.setComplaintNoticeCode(aftersalesComplaintNoticeDetail.getComplaintNoticeCode()); aftersalesComplaintNotice.setUpdateBy(loginName); @@ -201,44 +206,48 @@ public class AftersalesComplaintNoticeDetailServiceImpl implements IAftersalesCo aftersalesComplaintNotice.setCustomerName(aftersalesComplaintNoticeDetail.getCustomerName()); aftersalesComplaintNotice.setCustomerId(aftersalesComplaintNoticeDetail.getCustomerId()); aftersalesComplaintNotice.setClosingProcedures(aftersalesComplaintNoticeDetail.getClosingProcedures()); - complaintNoticeMapper.updateAftersalesComplaintNotice(aftersalesComplaintNotice); String complaintNoticeCode = aftersalesComplaintNoticeDetail.getComplaintNoticeCode(); List aftersalesMaterialVOs = aftersalesComplaintNoticeDetail.getAftersalesMaterialVOs(); //如果前面相关物料信息为空 if (StringUtils.isEmpty(aftersalesMaterialVOs)){ //删除子表中的数据 int result = aftersalesComplaintNoticeDetailMapper.deleteAftersalesComplaintNoticeDetailByCode(complaintNoticeCode); - return result; - } - //如果有物料信息 - int result = aftersalesComplaintNoticeDetailMapper.deleteAftersalesComplaintNoticeDetailByCode(complaintNoticeCode); - for (AftersalesMaterialVO aftersalesMaterialVO : aftersalesMaterialVOs) { - AftersalesComplaintNoticeDetail complaintNoticeDetail = new AftersalesComplaintNoticeDetail(); - complaintNoticeDetail.setComplaintNoticeCode(complaintNoticeCode); - complaintNoticeDetail.setCreateBy(aftersalesComplaintNoticeDetail.getCreateBy()); - complaintNoticeDetail.setCreateTime(aftersalesComplaintNoticeDetail.getCreateTime()); - complaintNoticeDetail.setUpdateBy(loginName); - complaintNoticeDetail.setUpdateTime(DateUtils.getNowDate()); - complaintNoticeDetail.setCustomerId(aftersalesComplaintNoticeDetail.getCustomerId()); - complaintNoticeDetail.setCustomerName(aftersalesComplaintNoticeDetail.getCustomerName()); - complaintNoticeDetail.setEmergencyDegree(aftersalesComplaintNoticeDetail.getEmergencyDegree()); - complaintNoticeDetail.setMakeNo(aftersalesComplaintNoticeDetail.getMakeNo()); - complaintNoticeDetail.setRemark(aftersalesComplaintNoticeDetail.getRemark()); - complaintNoticeDetail.setMaterialType(aftersalesMaterialVO.getMaterialType()); - complaintNoticeDetail.setMaterialUnit(aftersalesMaterialVO.getMaterialUnit()); - complaintNoticeDetail.setMaterialProcessMethod(aftersalesMaterialVO.getMaterialProcessMethod()); - complaintNoticeDetail.setMaterialName(aftersalesMaterialVO.getMaterialName()); - complaintNoticeDetail.setMaterialDescribe(aftersalesMaterialVO.getMaterialDescribe()); - complaintNoticeDetail.setMaterialNo(aftersalesMaterialVO.getMaterialNo()); - complaintNoticeDetail.setMaterialPhotourl(aftersalesMaterialVO.getMaterialPhotourl()); - complaintNoticeDetail.setMaterialBrand(aftersalesMaterialVO.getMaterialBrand()); - complaintNoticeDetail.setComplaintProblem(aftersalesMaterialVO.getComplaintProblem()); - complaintNoticeDetail.setSnCode(aftersalesMaterialVO.getSnCode()); - complaintNoticeDetail.setAdverseReportUrl(aftersalesMaterialVO.getAdverseReportUrl()); - complaintNoticeDetail.setShippedGoodsSum(aftersalesMaterialVO.getShippedGoodsSum()); - complaintNoticeDetail.setClosingProcedures("1"); - aftersalesComplaintNoticeDetailMapper.insertAftersalesComplaintNoticeDetail(complaintNoticeDetail); + }else{ + //如果有物料信息 + int result = aftersalesComplaintNoticeDetailMapper.deleteAftersalesComplaintNoticeDetailByCode(complaintNoticeCode); + for (AftersalesMaterialVO aftersalesMaterialVO : aftersalesMaterialVOs) { + AftersalesComplaintNoticeDetail complaintNoticeDetail = new AftersalesComplaintNoticeDetail(); + complaintNoticeDetail.setComplaintNoticeCode(complaintNoticeCode); + complaintNoticeDetail.setCreateBy(aftersalesComplaintNoticeDetail.getCreateBy()); + complaintNoticeDetail.setCreateTime(aftersalesComplaintNoticeDetail.getCreateTime()); + complaintNoticeDetail.setUpdateBy(loginName); + complaintNoticeDetail.setUpdateTime(DateUtils.getNowDate()); + complaintNoticeDetail.setCustomerId(aftersalesComplaintNoticeDetail.getCustomerId()); + complaintNoticeDetail.setCustomerName(aftersalesComplaintNoticeDetail.getCustomerName()); + complaintNoticeDetail.setEmergencyDegree(aftersalesComplaintNoticeDetail.getEmergencyDegree()); + complaintNoticeDetail.setMakeNo(aftersalesComplaintNoticeDetail.getMakeNo()); + complaintNoticeDetail.setRemark(aftersalesComplaintNoticeDetail.getRemark()); + complaintNoticeDetail.setMaterialType(aftersalesMaterialVO.getMaterialType()); + complaintNoticeDetail.setMaterialUnit(aftersalesMaterialVO.getMaterialUnit()); + complaintNoticeDetail.setMaterialProcessMethod(aftersalesMaterialVO.getMaterialProcessMethod()); + complaintNoticeDetail.setMaterialName(aftersalesMaterialVO.getMaterialName()); + complaintNoticeDetail.setMaterialDescribe(aftersalesMaterialVO.getMaterialDescribe()); + complaintNoticeDetail.setMaterialNo(aftersalesMaterialVO.getMaterialNo()); + complaintNoticeDetail.setMaterialPhotourl(aftersalesMaterialVO.getMaterialPhotourl()); + complaintNoticeDetail.setMaterialBrand(aftersalesMaterialVO.getMaterialBrand()); + complaintNoticeDetail.setComplaintProblem(aftersalesMaterialVO.getComplaintProblem()); + complaintNoticeDetail.setSnCode(aftersalesMaterialVO.getSnCode()); + complaintNoticeDetail.setAdverseReportUrl(aftersalesMaterialVO.getAdverseReportUrl()); + complaintNoticeDetail.setShippedGoodsSum(aftersalesMaterialVO.getShippedGoodsSum()); + complaintNoticeDetail.setClosingProcedures("1"); + String snCodes = aftersalesMaterialVO.getSnCode(); + String[] snCodeArray = snCodes.split(","); + enterpriseSum += snCodeArray.length; + aftersalesComplaintNoticeDetailMapper.insertAftersalesComplaintNoticeDetail(complaintNoticeDetail); + } } + aftersalesComplaintNotice.setEnterpriseSum(enterpriseSum); + complaintNoticeMapper.updateAftersalesComplaintNotice(aftersalesComplaintNotice); return 1; }