From eafeddae6413bc013a0b31ae354ec136d94597c0 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Thu, 16 May 2024 13:37:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackReceiveController.java | 13 ++++++++++ .../sgzb/app/mapper/BackReceiveMapper.java | 2 ++ .../sgzb/app/service/BackReceiveService.java | 2 ++ .../service/impl/BackReceiveServiceImpl.java | 17 +++++++++++++ .../mapper/app/BackReceiveMapper.xml | 24 +++++++++++++++++++ .../service/impl/BackApplyServiceImpl.java | 12 ++++------ 6 files changed, 62 insertions(+), 8 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 2e756eff..b3411878 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -286,4 +286,17 @@ public class BackReceiveController extends BaseController { throw new RuntimeException(e); } } + + @Log(title = "退料接收记录（编码接收）-web", businessType = BusinessType.INSERT) + @PostMapping("backReceiveRecordWebPt") + public AjaxResult backReceiveRecordWebPt(@RequestBody BackApplyInfo record) { + try { + List list = backReceiveService.backReceiveRecordWebPt(record); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 724bb7da..fedaddd0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -202,4 +202,6 @@ public interface BackReceiveMapper { BackApplyInfo backReceiveRecordWeb(BackApplyInfo record); List getCtList(BackApplyInfo record); + + List backReceiveRecordWebPt(BackApplyInfo record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java index 634fc3c9..20fc688b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java @@ -97,4 +97,6 @@ public interface BackReceiveService { int revoke(BackApplyInfo record); List backReceiveRecordWeb(BackApplyInfo record); + + List backReceiveRecordWebPt(BackApplyInfo record); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index c66a710d..ba5d68ff 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -348,6 +348,23 @@ public class BackReceiveServiceImpl implements BackReceiveService { return backApplyInfoList; } + @Override + public List backReceiveRecordWebPt(BackApplyInfo record) { + String typeId = record.getTypeId(); + String[] split = typeId.split(","); + List backApplyInfoList = new ArrayList<>(); + for (String s : split) { + record.setTypeId(s); + List backApplyInfo = backReceiveMapper.backReceiveRecordWebPt(record); + if (backApplyInfo != null) { + for (BackApplyInfo applyInfo : backApplyInfo) { + backApplyInfoList.add(applyInfo); + } + } + } + return backApplyInfoList; + } + private int insertRad(int taskId, List wxList) { int result = 0; if (wxList != null) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index 60281b15..c4dd9005 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -963,6 +963,7 @@ SELECT mt2.type_name AS typeName, mt1.type_name AS typeCode, + ifnull(sum( bcd.back_num ), 0) AS backNum, SUM( CASE WHEN bcd.back_status = 1 THEN bcd.back_num ELSE 0 END ) AS hgNum, SUM( CASE WHEN bcd.back_status = 2 THEN bcd.back_num ELSE 0 END ) AS wxNum, SUM( CASE WHEN bcd.back_status = 3 THEN bcd.back_num ELSE 0 END ) AS bfNum, @@ -997,5 +998,28 @@ WHERE bad.parent_id = #{parentId} + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index d881b637..ba0ea659 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -88,14 +88,14 @@ public class BackApplyServiceImpl implements BackApplyService { Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); String taskNum = backApplyMapper.selectTaskNumByMonth(nowDate, 36); - if (StringHelper.isNotEmpty(taskNum)){ + if (StringHelper.isNotEmpty(taskNum)) { // 将字符串转换为整数 int num = Integer.parseInt(taskNum); // 执行加一操作 num++; // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 taskNum = String.format("%04d", num); - }else { + } else { taskNum = "0001"; } String code = "T" + format + "-" + taskNum; @@ -137,13 +137,9 @@ public class BackApplyServiceImpl implements BackApplyService { } if (companyId != null) { bean.setCompanyId(companyId.toString()); - List view = backApplyMapper.getView(bean); - return getMaTypeDetails(view); - } else { - List view = backApplyMapper.getView(bean); - return getMaTypeDetails(view); } - + List view = backApplyMapper.getView(bean); + return getMaTypeDetails(view); } private List getMaTypeDetails(List view) {