From 261b07c29559c08dd52ed7b5f82ee19a13f7ed8f Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Fri, 26 Nov 2021 18:07:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E4=BA=A7=20=E4=BA=A7=E9=87=8F=E6=8A=A5=E5=91=8A=20=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E5=8D=B7=E6=93=8D=E4=BD=9C=20=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ScheduleController.java | 89 +++++++++ .../modules/schedule/dao/ScheduleMapper.java | 54 ++++++ .../schedule/data/SearchScheduleData.java | 37 ++++ .../modules/schedule/data/SfdcData.java | 52 ++++++ .../schedule/service/ScheduleService.java | 54 ++++++ .../service/impl/ScheduleServiceImpl.java | 69 +++++++ .../mapper/schedule/ScheduleMapper.xml | 171 ++++++++++++++++++ 7 files changed, 526 insertions(+) create mode 100644 src/main/java/com/gaotao/modules/schedule/data/SfdcData.java diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java index 0f4ae72..3d648f3 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; /** * 生产订单排产 @@ -278,7 +279,95 @@ public class ScheduleController { .put("total", resultList.size()); } + /** + * TODO 获取卷的报工数据 + * @author LR + * @date 2021/11/25 18:02 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getSfdcDataByCon") + public R getSfdcDataByCon(@RequestBody SearchScheduleData inData){ + List resultList = scheduleService.getSfdcDataByCon(inData); + return R.ok() + .put("msg", "操作成功!") + .put("rows", resultList) + .put("total", resultList.size()); + } + + /** + * TODO 查询sfdc_rolls表中的汇总报工数据 + * @author LR + * @date 2021/11/26 16:13 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getSfdcRollReportedQty") + public R getSfdcRollReportedQty(@RequestBody SearchScheduleData inData){ + Float reportedQty = scheduleService.getSfdcRollReportedQty(inData); + return R.ok() + .put("msg", "操作成功!") + .put("reportedQty", reportedQty); + } + + /** + * TODO 查询当前是否存在报工的数据 + * @author LR + * @date 2021/11/26 16:14 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "countSfdcRollByRollNo") + public R countSfdcRollByRollNo(@RequestBody SearchScheduleData inData){ + Integer countNums = scheduleService.countSfdcRollByRollNo(inData); + return R.ok() + .put("msg", "操作成功!") + .put("countNums", countNums); + } + /** + * TODO 查询报告的不良数据 + * @author LR + * @date 2021/11/26 16:17 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getSfdcDefectDefectedQty") + public R getSfdcDefectDefectedQty(@RequestBody SearchScheduleData inData){ + Float defectedQty = scheduleService.getSfdcDefectDefectedQty(inData); + return R.ok() + .put("msg", "操作成功!") + .put("defectedQty", defectedQty); + } + + /** + * TODO 查询sfdc_time的时间汇总数据 + * @author LR + * @date 2021/11/26 16:20 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "countSfdcTimeQty") + public R countSfdcTimeQty(@RequestBody SearchScheduleData inData){ + Map result = scheduleService.countSfdcTimeQty(inData); + return R.ok() + .put("msg", "操作成功!") + .put("row", result); + } + + /** + * TODO 查询sfdc_time的最大和最小以及一些汇总数据 + * @author LR + * @date 2021/11/26 16:21 + * @param inData + * @return com.gaotao.common.utils.R + **/ + public R getSfdcTimeMaxAndMinTime(@RequestBody SearchScheduleData inData){ + Map result = scheduleService.getSfdcTimeMaxAndMinTime(inData); + return R.ok() + .put("msg", "操作成功!") + .put("row", result); + } } diff --git a/src/main/java/com/gaotao/modules/schedule/dao/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/dao/ScheduleMapper.java index 17f091a..6e2ce84 100644 --- a/src/main/java/com/gaotao/modules/schedule/dao/ScheduleMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/dao/ScheduleMapper.java @@ -5,6 +5,7 @@ import com.gaotao.modules.shopOrder.entity.OperatorData; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * @author LR @@ -177,4 +178,57 @@ public interface ScheduleMapper { List getSfdcRollByCon(SearchScheduleData inData); + /** + * TODO 获取卷的报工数据 + * @author LR + * @date 2021/11/25 18:04 + * @param inData + * @return java.util.List + **/ + List getSfdcDataByCon(SearchScheduleData inData); + + /** + * TODO 查询sfdcRolls表的汇总数据 + * @author LR + * @date 2021/11/26 16:31 + * @param inData + * @return java.lang.Float + **/ + Float getSfdcRollReportedQty(SearchScheduleData inData); + + /** + * TODO 统计sfdcRolls表的卷数 + * @author LR + * @date 2021/11/26 16:32 + * @param inData + * @return java.lang.Integer + **/ + Integer countSfdcRollByRollNo(SearchScheduleData inData); + + /** + * TODO 查询sfdcDefect不良数据 + * @author LR + * @date 2021/11/26 16:32 + * @param inData + * @return java.lang.Float + **/ + Float getSfdcDefectDefectedQty(SearchScheduleData inData); + + /** + * TODO 统计sfdcTime时间数据 + * @author LR + * @date 2021/11/26 16:33 + * @param inData + * @return java.util.List> + **/ + List> countSfdcTimeQty(SearchScheduleData inData); + + /** + * TODO 获取sfdcTime最大和最小时间数据 + * @author LR + * @date 2021/11/26 16:34 + * @param inData + * @return java.util.List> + **/ + List> getSfdcTimeMaxAndMinTime(SearchScheduleData inData); } 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 366a6c5..4612502 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -47,6 +47,11 @@ public class SearchScheduleData extends BaseData { private String closedFlag;//是否关闭 Y 是 N 否 private String rollNo;//当前上机卷的数据 private String referenceCustomerId;//关联客户编码 + private String finishedFlag; + private String keyRMFlag; + private String histType; + private String switchKey;//管控动态的SQL语句 + public SearchScheduleData() { } @@ -202,4 +207,36 @@ public class SearchScheduleData extends BaseData { public void setReferenceCustomerId(String referenceCustomerId) { this.referenceCustomerId = referenceCustomerId; } + + public String getFinishedFlag() { + return finishedFlag; + } + + public void setFinishedFlag(String finishedFlag) { + this.finishedFlag = finishedFlag; + } + + public String getKeyRMFlag() { + return keyRMFlag; + } + + public void setKeyRMFlag(String keyRMFlag) { + this.keyRMFlag = keyRMFlag; + } + + public String getHistType() { + return histType; + } + + public void setHistType(String histType) { + this.histType = histType; + } + + public String getSwitchKey() { + return switchKey; + } + + public void setSwitchKey(String switchKey) { + this.switchKey = switchKey; + } } diff --git a/src/main/java/com/gaotao/modules/schedule/data/SfdcData.java b/src/main/java/com/gaotao/modules/schedule/data/SfdcData.java new file mode 100644 index 0000000..deb5108 --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/data/SfdcData.java @@ -0,0 +1,52 @@ +package com.gaotao.modules.schedule.data; + +import org.apache.ibatis.type.Alias; + +/** + * @author LR + * @Title: SfdcData + * 报工数据汇总表 + * @Date 2021/11/25 16:51 + */ +@Alias("SfdcData") +public class SfdcData extends BaseRollData { + private Float approveQty;//良品数量 + private Float defectQty;//不良数量 + private Float reportedManfTime;//报告制造时间 + private Float downtime;//停机时间 + + public SfdcData() { + } + + public Float getApproveQty() { + return approveQty; + } + + public void setApproveQty(Float approveQty) { + this.approveQty = approveQty; + } + + public Float getDefectQty() { + return defectQty; + } + + public void setDefectQty(Float defectQty) { + this.defectQty = defectQty; + } + + public Float getReportedManfTime() { + return reportedManfTime; + } + + public void setReportedManfTime(Float reportedManfTime) { + this.reportedManfTime = reportedManfTime; + } + + public Float getDowntime() { + return downtime; + } + + public void setDowntime(Float downtime) { + this.downtime = downtime; + } +} diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java index b0fa72c..281076e 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -4,6 +4,7 @@ import com.gaotao.modules.schedule.data.*; import com.gaotao.modules.shopOrder.entity.OperatorData; import java.util.List; +import java.util.Map; /** * @author LR @@ -157,4 +158,57 @@ public interface ScheduleService { **/ List getSfdcRollByCon(SearchScheduleData inData); + /** + * TODO 获取卷的报工数据 + * @author LR + * @date 2021/11/25 18:03 + * @param inData + * @return java.util.List + **/ + List getSfdcDataByCon(SearchScheduleData inData); + + /** + * TODO 查询sfdc_rolls表中的汇总报工数据 + * @author LR + * @date 2021/11/26 16:13 + * @param inData + * @return java.lang.Float + **/ + Float getSfdcRollReportedQty(SearchScheduleData inData); + + /** + * TODO 查询当前是否存在报工的数据 + * @author LR + * @date 2021/11/26 16:15 + * @param inData + * @return java.lang.Integer + **/ + Integer countSfdcRollByRollNo(SearchScheduleData inData); + + /** + * TODO 查询报告的不良数据 + * @author LR + * @date 2021/11/26 16:18 + * @param inData + * @return java.lang.Float + **/ + Float getSfdcDefectDefectedQty(SearchScheduleData inData); + + /** + * TODO 查询sfdc_time的时间汇总数据 + * @author LR + * @date 2021/11/26 16:20 + * @param inData + * @return java.util.Map + **/ + Map countSfdcTimeQty(SearchScheduleData inData); + + /** + * TODO 查询sfdc_time的最大和最小以及一些汇总数据 + * @author LR + * @date 2021/11/26 16:22 + * @param inData + * @return java.util.Map + **/ + Map getSfdcTimeMaxAndMinTime(SearchScheduleData inData); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index fe784a1..c4d1e1c 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -8,7 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author LR @@ -119,4 +121,71 @@ public class ScheduleServiceImpl implements ScheduleService { public List getSfdcRollByCon(SearchScheduleData inData) { return scheduleMapper.getSfdcRollByCon(inData); } + + @Override + public List getSfdcDataByCon(SearchScheduleData inData) { + return scheduleMapper.getSfdcDataByCon(inData); + } + + @Override + public Float getSfdcRollReportedQty(SearchScheduleData inData) { + Float reportedQty = scheduleMapper.getSfdcRollReportedQty(inData); + //判断null + if(reportedQty == null){ + reportedQty = 0f; + } + return reportedQty; + } + + @Override + public Integer countSfdcRollByRollNo(SearchScheduleData inData) { + Integer countNums = scheduleMapper.countSfdcRollByRollNo(inData); + //判断null + if(countNums == null){ + countNums = 0; + } + return countNums; + } + + @Override + public Float getSfdcDefectDefectedQty(SearchScheduleData inData) { + Float defectedQty = scheduleMapper.getSfdcDefectDefectedQty(inData); + //判断null + if(defectedQty == null){ + defectedQty = 0f; + } + return defectedQty; + } + + @Override + public Map countSfdcTimeQty(SearchScheduleData inData) { + //返回数据 + Map result = new HashMap<>(); + //查询数据 + List> resultList = scheduleMapper.countSfdcTimeQty(inData); + //判断是否查询到结果数据 + if(resultList.size() > 0){ + result = resultList.get(0); + result.put("code", "200"); + }else{ + result.put("code", "500"); + } + return result; + } + + @Override + public Map getSfdcTimeMaxAndMinTime(SearchScheduleData inData) { + //返回数据 + Map result = new HashMap<>(); + //查询数据 + List> resultList = scheduleMapper.getSfdcTimeMaxAndMinTime(inData); + //判断是否查询到结果数据 + if(resultList.size() > 0){ + result = resultList.get(0); + result.put("code", "200"); + }else{ + result.put("code", "500"); + } + return result; + } } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index b3956d7..a3ca2a1 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -386,6 +386,15 @@ AND smh.RollNo = #{rollNo} + + AND smh.FinishFlag = #{finishedFlag} + + + AND smh.KeyRMFlag = #{keyRMFlag} + + + AND smh.HistType = #{histType} + ORDER BY smh.HistSeqNo DESC @@ -470,7 +479,169 @@ ORDER BY sfr.RollNo + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file