From 2726af418930f893988eb2ee1ee1016b8611b509 Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Tue, 12 Apr 2022 15:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E8=AE=A2=E5=8D=95=20=20?= =?UTF-8?q?=E6=96=B0=E7=94=B5=E8=84=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SchedulingController.java | 17 ++++++++++++ .../schedule/data/SearchScheduleData.java | 9 +++++++ .../schedule/mapper/SchedulingMapper.java | 9 +++++++ .../schedule/service/SchedulingService.java | 9 +++++++ .../service/impl/SchedulingServiceImpl.java | 7 ++++- .../mapper/schedule/SchedulingMapper.xml | 26 +++++++++++++++++++ 6 files changed, 76 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java index ed49633..0a435a1 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java @@ -405,4 +405,21 @@ public class SchedulingController { .put("msg", "操作成功!"); } + /** + * @Author LR + * @Description 获取分切订单的分卷数据 + * @DateTime 2022/4/12 14:32 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getSplitScheduleSeparateRolls") + public R getSplitScheduleSeparateRolls(@RequestBody SearchScheduleData inData){ + List> resultList = schedulingService.getSplitScheduleSeparateRolls(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!") + .put("rows", resultList) + .put("total", resultList.size()); + } + } diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java index fd4452a..99c0cef 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -144,6 +144,7 @@ public class SearchScheduleData extends BaseData { private String customerId;//客户编码 private String fgPartNo;//产品编码 private String supplierId;//供应商编码 + private String splitType;//分切的类型 private int rollCount; @@ -1021,4 +1022,12 @@ public class SearchScheduleData extends BaseData { public void setSupplierId(String supplierId) { this.supplierId = supplierId; } + + public String getSplitType() { + return splitType; + } + + public void setSplitType(String splitType) { + this.splitType = splitType; + } } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java index 9fedf19..9960ea8 100644 --- a/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java @@ -92,4 +92,13 @@ public interface SchedulingMapper { * @return java.util.List **/ List getShopOrderList(SearchScheduleData inData); + + /** + * @Author LR + * @Description 获取分切订单的分卷数据 + * @DateTime 2022/4/12 14:37 + * @Param [inData] + * @return java.util.List> + **/ + List> getSplitScheduleSeparateRolls(SearchScheduleData inData); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java index 5b4dee7..3f90b2d 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java @@ -238,4 +238,13 @@ public interface SchedulingService { * @return void **/ void createSplitScheduleSeparateRoll(SearchScheduleData inData); + + /** + * @Author LR + * @Description 获取分切订单的分卷数据 + * @DateTime 2022/4/12 14:36 + * @Param [inData] + * @return java.util.List> + **/ + List> getSplitScheduleSeparateRolls(SearchScheduleData inData); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java index 97f0853..52e571d 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java @@ -854,7 +854,7 @@ public class SchedulingServiceImpl implements SchedulingService { int rollNums = inData.getRollNums(); String rollNo = inData.getRollNo(); String rollDate = DateUtil.getStringDate(new Date(), "yyyy-MM-dd"); - String splitType = "S"; + String splitType = inData.getSplitType(); String supplierNote = ""; //首先调用存储过程校验 @@ -897,4 +897,9 @@ public class SchedulingServiceImpl implements SchedulingService { return resultList.get(0); } + @Override + public List> getSplitScheduleSeparateRolls(SearchScheduleData inData) { + return schedulingMapper.getSplitScheduleSeparateRolls(inData); + } + } diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index 6ab0118..433c97e 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -220,6 +220,32 @@ + + +