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..633fe4af 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 @@ -274,7 +274,7 @@ public class BackReceiveController extends BaseController { } } - @Log(title = "退料接收记录-web", businessType = BusinessType.INSERT) + @Log(title = "退料接收记录(数量接收/成套接收)-web", businessType = BusinessType.INSERT) @PostMapping("backReceiveRecordWeb") public AjaxResult backReceiveRecordWeb(@RequestBody BackApplyInfo record) { try { @@ -286,4 +286,19 @@ 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 26c50d59..58dc20ce 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 @@ -347,6 +347,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 6e607072..d7c2feb5 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 @@ -966,6 +966,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, @@ -1000,5 +1001,28 @@ WHERE bad.parent_id = #{parentId} + \ No newline at end of file