From 27e4d298bf9245e9b78f27622a243d4f0e579d1f Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 13 Oct 2025 13:42:58 +0800 Subject: [PATCH] =?UTF-8?q?2025-10-13=20=E7=94=9F=E4=BA=A7=E6=B4=BE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8=20=E4=B8=8A=E7=A7=BB?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SchedulingController.java | 26 ++++++++ .../schedule/data/SearchScheduleData.java | 10 +++ .../schedule/service/SchedulingService.java | 18 ++++++ .../service/impl/SchedulingServiceImpl.java | 64 +++++++++++++++++++ .../mapper/schedule/ScheduleMapper.xml | 2 +- .../mapper/shopOrder/ShopOrderMapper.xml | 1 + 6 files changed, 120 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 5942024..892d518 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java @@ -637,4 +637,30 @@ public class SchedulingController extends AbstractController { return R.ok().put("rows", list); } + /** + * @Author AI + * @Description 派工单上移 + * @Date 2025/10/13 + * @Param inData + * @return R + **/ + @PostMapping(value = "resortJobUp") + public R resortJobUp(@RequestBody SearchScheduleData inData){ + schedulingService.resortJobUp(inData); + return R.ok("上移成功，请刷新数据！"); + } + + /** + * @Author AI + * @Description 派工单下移 + * @Date 2025/10/13 + * @Param inData + * @return R + **/ + @PostMapping(value = "resortJobDown") + public R resortJobDown(@RequestBody SearchScheduleData inData){ + schedulingService.resortJobDown(inData); + return R.ok("下移成功，请刷新数据！"); + } + } 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 22bd182..543ecb3 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -163,6 +163,8 @@ public class SearchScheduleData extends BaseData { private Float lotSize;//具体对应的字段 2022-08-17 private Integer moveScheduleSeqNo; // 移动到的派工单位置 + + private String resortDirection; // 调整方向 S向上 D向下 public String getDirectRepackageflag() { return directRepackageflag; @@ -1146,4 +1148,12 @@ public class SearchScheduleData extends BaseData { public void setExportFlag(String exportFlag) { this.exportFlag = exportFlag; } + + public String getResortDirection() { + return resortDirection; + } + + public void setResortDirection(String resortDirection) { + this.resortDirection = resortDirection; + } } \ No newline at end of file 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 6d1e06c..e70e2c5 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java @@ -382,4 +382,22 @@ public interface SchedulingService { */ void saveProductionReportAndDefect(String site, String orderNo, Float itemNo, Integer seqNo, String rollNo, String operator, List reportList); + + /** + * @Author AI + * @Description 派工单上移 + * @DateTime 2025-10-13 + * @Param [inData] + * @return void + **/ + void resortJobUp(SearchScheduleData inData); + + /** + * @Author AI + * @Description 派工单下移 + * @DateTime 2025-10-13 + * @Param [inData] + * @return void + **/ + void resortJobDown(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 62e2988..3aeeccf 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 @@ -1388,4 +1388,68 @@ public class SchedulingServiceImpl implements SchedulingService { schedulingMapper.batchInsertSfdcDefectHist(defectList); } } + + @Override + @Transactional + public void resortJobUp(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String workCenterNo = inData.getWorkCenterNo(); + String resourceId = inData.getResourceId(); + Integer scheduledSeqNo = inData.getScheduleSeqNo(); + String resortDirection = "S"; // 向上 + + //调用存储过程 + Map resultMap = this.resortJobNormal(site, workCenterNo, resourceId, scheduledSeqNo, resortDirection); + //判断是否检验成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if ("400".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + String objectId = String.valueOf(resultMap.get("objectId")); + throw new XJException(msg,objectId); + } + } + + @Override + @Transactional + public void resortJobDown(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String workCenterNo = inData.getWorkCenterNo(); + String resourceId = inData.getResourceId(); + Integer scheduledSeqNo = inData.getScheduleSeqNo(); + String resortDirection = "D"; // 向下 + + //调用存储过程 + Map resultMap = this.resortJobNormal(site, workCenterNo, resourceId, scheduledSeqNo, resortDirection); + //判断是否检验成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if ("400".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + String objectId = String.valueOf(resultMap.get("objectId")); + throw new XJException(msg,objectId); + } + } + + /** + * @Author AI + * @Description 调用派工单上移下移存储过程 + * @DateTime 2025-10-13 + * @Param [site, workCenterNo, resourceId, scheduledSeqNo, resortDirection] + * @return void + **/ + public Map resortJobNormal(String site, String workCenterNo, String resourceId, Integer scheduledSeqNo, String resortDirection) { + List params = new ArrayList<>(); + params.add(site); + params.add(workCenterNo); + params.add(resourceId); + params.add(scheduledSeqNo); + params.add(resortDirection); + + //执行存储过程 + String procedureName = "S".equals(resortDirection) ? "soschedule_resortjob_normal_Up" : "soschedule_resortjob_normal_Down"; + List> resultList = procedureMapper.getProcedureData(procedureName, params); + //处理返回的结果 + return resultList.get(0); + } } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index c4a42fe..c02f1e9 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -263,7 +263,7 @@ and T.ClosedFlag = #{closedFlag} - Order by T.PlanStartTime ASC, T.PlanFinishTime desc + Order by E.S_ScheduledSeqNo asc diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml index c5d56c8..3aefafd 100644 --- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml +++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml @@ -208,6 +208,7 @@ AND dateadd( DAY, 1, #{date6} ) > T.PlanFinishTime ${sql} + order by d.bu_no, T.S_ResourceID,E.S_ScheduledSeqNo