diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ReportFormSearchController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ReportFormSearchController.java new file mode 100644 index 0000000..5011340 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ReportFormSearchController.java @@ -0,0 +1,208 @@ +package com.gaotao.modules.shopOrder.controller; + +import com.gaotao.modules.shopOrder.entity.*; +import com.gaotao.modules.shopOrder.service.ReportFormSearchService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * + * @ClassName: ReportFormSearchController + * @Description: 看板查询controller + * @author rq + * @date 2021年9月25日 + * + */ +@Controller +@RequestMapping(value="/reportFormSearch") +public class ReportFormSearchController { + + @Autowired + private ReportFormSearchService reportFormSearchService; + + + //=============查询-生产订单不良=================== + /** + * 查询-生产订单不良 + * @param + * @return + */ + @PostMapping(value="/searchShopOrderScript") + @ResponseBody + public Object searchShopOrderScript(@RequestBody SearchShopOrderScriptData indata){ + Map map = new HashMap<>(); + try { + List result = reportFormSearchService.searchShopOrderScript(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } + + + + //=============查询-生产订单工序浪费=================== + /** + *查询-生产订单工序浪费 + * @param + * @return + */ + @PostMapping(value="/searchShopOrderItemWaste") + @ResponseBody + public Object searchShopOrderItemWaste(@RequestBody SearchShopOrderItemWasteData indata){ + Map map = new HashMap<>(); + try { + List result = reportFormSearchService.searchShopOrderItemWaste(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } + + //=============查询-机台效率=================== + /** + *查询-机台效率 + * @param + * @return + */ + @PostMapping(value="/searchMachineEfficiency") + @ResponseBody + public Object searchMachineEfficiency(@RequestBody SearchMachineEfficiencyData indata){ + Map map = new HashMap<>(); + try { + List result = reportFormSearchService.searchMachineEfficiency(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } + + //=============查询-生产订单效率=================== + /** + *查询-生产订单效率 + * @param + * @return + */ + @PostMapping(value="/searchShopOrderEfficiency") + @ResponseBody + public Object searchShopOrderEfficiency(@RequestBody SearchShopOrderEfficiencyData indata){ + Map map = new HashMap<>(); + try { + List result = reportFormSearchService.searchShopOrderEfficiency(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } +//=============查询-加工中心产能负荷=================== + /** + *查询-加工中心产能负荷 + * @param + * @return + */ + @PostMapping(value="/searchWorkCenterCapacity") + @ResponseBody + public Object searchWorkCenterCapacity(@RequestBody SearchWorkCenterCapacityData indata){ + Map map = new HashMap<>(); + try { + List result = reportFormSearchService.searchWorkCenterCapacity(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } + + //=============查询-机台产能负荷=================== + /** + *查询-机台产能负荷 + * @param + * @return + */ + @PostMapping(value="/searchResourceCapacity") + @ResponseBody + public Object searchResourceCapacity(@RequestBody SearchResourceCapacityData indata){ + Map map = new HashMap<>(); + try { + List result = reportFormSearchService.searchResourceCapacity(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } + + //=============查询-生产订单状态检查=================== + /** + *查询-生产订单状态检查 + * @param + * @return + */ + @PostMapping(value="/searchShopOrderStatusCheck") + @ResponseBody + public Object searchShopOrderStatusCheck(@RequestBody SearchShopOrderStatusCheckData indata){ + Map map = new HashMap<>(); + try { + List result = reportFormSearchService.searchShopOrderStatusCheck(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } + + //=============查询-生产订单生产异常记录=================== + /** + *查询-生产订单状态检查 + * @param + * @return + */ + @PostMapping(value="/searchShopOrderAbnormalRecord") + @ResponseBody + public Object searchShopOrderAbnormalRecord(@RequestBody CExceptionLogData indata){ + Map map = new HashMap<>(); + try { + List result = reportFormSearchService.searchShopOrderAbnormalRecord(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/dao/ReportFormSearchMapper.java b/src/main/java/com/gaotao/modules/shopOrder/dao/ReportFormSearchMapper.java new file mode 100644 index 0000000..57355d6 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ReportFormSearchMapper.java @@ -0,0 +1,126 @@ +package com.gaotao.modules.shopOrder.dao; + +import com.gaotao.modules.shopOrder.entity.*; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ReportFormSearchMapper { + //=============查询-生产订单不良=================== + /** + * @Description 查询-生产订单不良 + * @Title searchShopOrderScript + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderScript(SearchShopOrderScriptData indata); + + //=============查询-生产订单工序浪费=================== + /** + * @Description 查询-生产订单不良 + * @Title searchShopOrderItemWaste + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderItemWaste(SearchShopOrderItemWasteData indata); + /** + * @Description 查询-生产订单不良 + * @Title searchScheduledItemWaste + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchScheduledItemWaste(SearchShopOrderItemWasteData indata); + + + //=============查询-机台效率=================== + /** + * @Description 查询-机台效率 + * @Title searchMachineEfficiency + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchMachineEfficiency(SearchMachineEfficiencyData indata); + + //=============查询-生产订单效率=================== + /** + * @Description 查询-生产订单效率 + * @Title searchShopOrderEfficiency + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderEfficiency(SearchShopOrderEfficiencyData indata); + /** + * @Description 查询-生产订单(派工单)效率 + * @Title searchShopOrderEfficiency + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchScheduleEfficiency(SearchShopOrderEfficiencyData indata); + + //=============查询-加工中心产能负荷=================== + /** + * @Description 查询-加工中心产能负荷 + * @Title searchWorkCenterCapacity + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchWorkCenterCapacity(SearchWorkCenterCapacityData indata); + + //=============查询-机台产能负荷=================== + /** + * @Description 查询-机台产能负荷 + * @Title searchResourceCapacity + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchResourceCapacity(SearchResourceCapacityData indata); + + //=============查询-生产订单状态检查=================== + /** + * @Description 查询-生产订单状态检查 + * @Title searchShopOrderStatusCheck + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderStatusCheck(SearchShopOrderStatusCheckData indata); + + //=============查询-生产订单生产异常记录=================== + /** + * @Description 查询-生产订单生产异常记录 + * @Title searchShopOrderAbnormalRecord + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderAbnormalRecord(CExceptionLogData indata); +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/CExceptionLogData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/CExceptionLogData.java new file mode 100644 index 0000000..111d64f --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/CExceptionLogData.java @@ -0,0 +1,209 @@ +package com.gaotao.modules.shopOrder.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +public class CExceptionLogData { + /** + * + */ + private Integer logID; + + /** + * + */ + private String site; + + /** + * + */ + private String orderNo; + + /** + * + */ + private Double itemNo; + + /** + * + */ + private Integer seqNo; + + /** + * + */ + private String rollNo; + + /** + * + */ + private String actionTypeDb; + + /** + * + */ + private String actionType; + + /** + * + */ + private String reason; + + /** + * + */ + private String remark; + + /** + * + */ + private Date createdDate; + + /** + * + */ + private String createdBy; + + /** + * + */ + private String otherInfo; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + private String user; + + public Integer getLogID() { + return logID; + } + + public void setLogID(Integer logID) { + this.logID = logID; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public Double getItemNo() { + return itemNo; + } + + public void setItemNo(Double itemNo) { + this.itemNo = itemNo; + } + + public Integer getSeqNo() { + return seqNo; + } + + public void setSeqNo(Integer seqNo) { + this.seqNo = seqNo; + } + + public String getRollNo() { + return rollNo; + } + + public void setRollNo(String rollNo) { + this.rollNo = rollNo; + } + + public String getActionTypeDb() { + return actionTypeDb; + } + + public void setActionTypeDb(String actionTypeDb) { + this.actionTypeDb = actionTypeDb; + } + + public String getActionType() { + return actionType; + } + + public void setActionType(String actionType) { + this.actionType = actionType; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Date getCreatedDate() { + return createdDate; + } + + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getOtherInfo() { + return otherInfo; + } + + public void setOtherInfo(String otherInfo) { + this.otherInfo = otherInfo; + } + + public Date getDate1() { + return date1; + } + + public void setDate1(Date date1) { + this.date1 = date1; + } + + public Date getDate2() { + return date2; + } + + public void setDate2(Date date2) { + this.date2 = date2; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } +} + diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchMachineEfficiencyData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchMachineEfficiencyData.java new file mode 100644 index 0000000..61a7f99 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchMachineEfficiencyData.java @@ -0,0 +1,132 @@ +package com.gaotao.modules.shopOrder.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +public class SearchMachineEfficiencyData { + private String sWorkCenterNo; + private String workCenterDesc; + private String sResourceID; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date reportDate; + private String site; + private String shiftNo; + private BigDecimal calTotalActTime; + private BigDecimal calTotalEstTime; + private BigDecimal calOtherActTime; + private BigDecimal resouceEfficiency; + private String user; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + public String getsWorkCenterNo() { + return sWorkCenterNo; + } + + public void setsWorkCenterNo(String sWorkCenterNo) { + this.sWorkCenterNo = sWorkCenterNo; + } + + public String getWorkCenterDesc() { + return workCenterDesc; + } + + public void setWorkCenterDesc(String workCenterDesc) { + this.workCenterDesc = workCenterDesc; + } + + public String getsResourceID() { + return sResourceID; + } + + public void setsResourceID(String sResourceID) { + this.sResourceID = sResourceID; + } + + public Date getReportDate() { + return reportDate; + } + + public void setReportDate(Date reportDate) { + this.reportDate = reportDate; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getShiftNo() { + return shiftNo; + } + + public void setShiftNo(String shiftNo) { + this.shiftNo = shiftNo; + } + + public BigDecimal getCalTotalActTime() { + return calTotalActTime; + } + + public void setCalTotalActTime(BigDecimal calTotalActTime) { + this.calTotalActTime = calTotalActTime; + } + + public BigDecimal getCalTotalEstTime() { + return calTotalEstTime; + } + + public void setCalTotalEstTime(BigDecimal calTotalEstTime) { + this.calTotalEstTime = calTotalEstTime; + } + + public BigDecimal getCalOtherActTime() { + return calOtherActTime; + } + + public void setCalOtherActTime(BigDecimal calOtherActTime) { + this.calOtherActTime = calOtherActTime; + } + + public BigDecimal getResouceEfficiency() { + return resouceEfficiency; + } + + public void setResouceEfficiency(BigDecimal resouceEfficiency) { + this.resouceEfficiency = resouceEfficiency; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public Date getDate1() { + return date1; + } + + public void setDate1(Date date1) { + this.date1 = date1; + } + + public Date getDate2() { + return date2; + } + + public void setDate2(Date date2) { + this.date2 = date2; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchResourceCapacityData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchResourceCapacityData.java new file mode 100644 index 0000000..10aa9dd --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchResourceCapacityData.java @@ -0,0 +1,133 @@ +package com.gaotao.modules.shopOrder.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +public class SearchResourceCapacityData { + private String site; + private String resourceID; + private String workCenterNo; + private String workCenterDesc; + private String resourceDesc; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date scheduleDate; + private BigDecimal seqNo1; + private BigDecimal seqNo2; + private BigDecimal timeCapacity; + private BigDecimal timeLoading; + private String user; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getResourceID() { + return resourceID; + } + + public void setResourceID(String resourceID) { + this.resourceID = resourceID; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getWorkCenterDesc() { + return workCenterDesc; + } + + public void setWorkCenterDesc(String workCenterDesc) { + this.workCenterDesc = workCenterDesc; + } + + public String getResourceDesc() { + return resourceDesc; + } + + public void setResourceDesc(String resourceDesc) { + this.resourceDesc = resourceDesc; + } + + public Date getScheduleDate() { + return scheduleDate; + } + + public void setScheduleDate(Date scheduleDate) { + this.scheduleDate = scheduleDate; + } + + public BigDecimal getSeqNo1() { + return seqNo1; + } + + public void setSeqNo1(BigDecimal seqNo1) { + this.seqNo1 = seqNo1; + } + + public BigDecimal getSeqNo2() { + return seqNo2; + } + + public void setSeqNo2(BigDecimal seqNo2) { + this.seqNo2 = seqNo2; + } + + public BigDecimal getTimeCapacity() { + return timeCapacity; + } + + public void setTimeCapacity(BigDecimal timeCapacity) { + this.timeCapacity = timeCapacity; + } + + public BigDecimal getTimeLoading() { + return timeLoading; + } + + public void setTimeLoading(BigDecimal timeLoading) { + this.timeLoading = timeLoading; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public Date getDate1() { + return date1; + } + + public void setDate1(Date date1) { + this.date1 = date1; + } + + public Date getDate2() { + return date2; + } + + public void setDate2(Date date2) { + this.date2 = date2; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderEfficiencyData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderEfficiencyData.java new file mode 100644 index 0000000..7b97c42 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderEfficiencyData.java @@ -0,0 +1,360 @@ +package com.gaotao.modules.shopOrder.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +public class SearchShopOrderEfficiencyData { + private String site; + private String orderNo; + private String partNo; + private String partDesc; + private Double plannedQty; + private Double cmpltQty; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date closeDate; + private Double itemNo; + private Integer seqNo; + private String operationDesc; + private String workCenterNo; + private String workCenterDesc; + private String operatorID; + private String operatorDesc; + private String sResourceid; + private BigDecimal setupTimeRequired; + private BigDecimal reportedSetupTime; + private BigDecimal gapSetuptime; + private BigDecimal actEfficiencySetuptime; + private BigDecimal manTimeRequired; + private BigDecimal reportedManfTime; + private BigDecimal gapManftime; + private BigDecimal actEfficiencyManftime; + private BigDecimal totalTimeRequired; + private BigDecimal reportedTotalTime; + private BigDecimal gapTotalTime; + private BigDecimal actEfficiencyTotaltime; + private BigDecimal approveQty; + private BigDecimal reportQty; + private BigDecimal qtyRequired; + private String sostatus; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date seqCloseDate; + private String seqCloseFlag; + private Double efficiency; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + private String user; + private String sumType; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getPartDesc() { + return partDesc; + } + + public void setPartDesc(String partDesc) { + this.partDesc = partDesc; + } + + public Double getPlannedQty() { + return plannedQty; + } + + public void setPlannedQty(Double plannedQty) { + this.plannedQty = plannedQty; + } + + public Double getCmpltQty() { + return cmpltQty; + } + + public void setCmpltQty(Double cmpltQty) { + this.cmpltQty = cmpltQty; + } + + public Date getCloseDate() { + return closeDate; + } + + public void setCloseDate(Date closeDate) { + this.closeDate = closeDate; + } + + public Double getItemNo() { + return itemNo; + } + + public void setItemNo(Double itemNo) { + this.itemNo = itemNo; + } + + public Integer getSeqNo() { + return seqNo; + } + + public void setSeqNo(Integer seqNo) { + this.seqNo = seqNo; + } + + public String getOperationDesc() { + return operationDesc; + } + + public void setOperationDesc(String operationDesc) { + this.operationDesc = operationDesc; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getWorkCenterDesc() { + return workCenterDesc; + } + + public void setWorkCenterDesc(String workCenterDesc) { + this.workCenterDesc = workCenterDesc; + } + + public String getOperatorID() { + return operatorID; + } + + public void setOperatorID(String operatorID) { + this.operatorID = operatorID; + } + + public String getOperatorDesc() { + return operatorDesc; + } + + public void setOperatorDesc(String operatorDesc) { + this.operatorDesc = operatorDesc; + } + + public String getsResourceid() { + return sResourceid; + } + + public void setsResourceid(String sResourceid) { + this.sResourceid = sResourceid; + } + + public BigDecimal getSetupTimeRequired() { + return setupTimeRequired; + } + + public void setSetupTimeRequired(BigDecimal setupTimeRequired) { + this.setupTimeRequired = setupTimeRequired; + } + + public BigDecimal getReportedSetupTime() { + return reportedSetupTime; + } + + public void setReportedSetupTime(BigDecimal reportedSetupTime) { + this.reportedSetupTime = reportedSetupTime; + } + + public BigDecimal getGapSetuptime() { + return gapSetuptime; + } + + public void setGapSetuptime(BigDecimal gapSetuptime) { + this.gapSetuptime = gapSetuptime; + } + + public BigDecimal getActEfficiencySetuptime() { + return actEfficiencySetuptime; + } + + public void setActEfficiencySetuptime(BigDecimal actEfficiencySetuptime) { + this.actEfficiencySetuptime = actEfficiencySetuptime; + } + + public BigDecimal getManTimeRequired() { + return manTimeRequired; + } + + public void setManTimeRequired(BigDecimal manTimeRequired) { + this.manTimeRequired = manTimeRequired; + } + + public BigDecimal getReportedManfTime() { + return reportedManfTime; + } + + public void setReportedManfTime(BigDecimal reportedManfTime) { + this.reportedManfTime = reportedManfTime; + } + + public BigDecimal getGapManftime() { + return gapManftime; + } + + public void setGapManftime(BigDecimal gapManftime) { + this.gapManftime = gapManftime; + } + + public BigDecimal getActEfficiencyManftime() { + return actEfficiencyManftime; + } + + public void setActEfficiencyManftime(BigDecimal actEfficiencyManftime) { + this.actEfficiencyManftime = actEfficiencyManftime; + } + + public BigDecimal getTotalTimeRequired() { + return totalTimeRequired; + } + + public void setTotalTimeRequired(BigDecimal totalTimeRequired) { + this.totalTimeRequired = totalTimeRequired; + } + + public BigDecimal getReportedTotalTime() { + return reportedTotalTime; + } + + public void setReportedTotalTime(BigDecimal reportedTotalTime) { + this.reportedTotalTime = reportedTotalTime; + } + + public BigDecimal getGapTotalTime() { + return gapTotalTime; + } + + public void setGapTotalTime(BigDecimal gapTotalTime) { + this.gapTotalTime = gapTotalTime; + } + + public BigDecimal getActEfficiencyTotaltime() { + return actEfficiencyTotaltime; + } + + public void setActEfficiencyTotaltime(BigDecimal actEfficiencyTotaltime) { + this.actEfficiencyTotaltime = actEfficiencyTotaltime; + } + + public BigDecimal getApproveQty() { + return approveQty; + } + + public void setApproveQty(BigDecimal approveQty) { + this.approveQty = approveQty; + } + + public BigDecimal getReportQty() { + return reportQty; + } + + public void setReportQty(BigDecimal reportQty) { + this.reportQty = reportQty; + } + + public BigDecimal getQtyRequired() { + return qtyRequired; + } + + public void setQtyRequired(BigDecimal qtyRequired) { + this.qtyRequired = qtyRequired; + } + + public String getSostatus() { + return sostatus; + } + + public void setSostatus(String sostatus) { + this.sostatus = sostatus; + } + + public Date getSeqCloseDate() { + return seqCloseDate; + } + + public void setSeqCloseDate(Date seqCloseDate) { + this.seqCloseDate = seqCloseDate; + } + + public String getSeqCloseFlag() { + return seqCloseFlag; + } + + public void setSeqCloseFlag(String seqCloseFlag) { + this.seqCloseFlag = seqCloseFlag; + } + + public Double getEfficiency() { + return efficiency; + } + + public void setEfficiency(Double efficiency) { + this.efficiency = efficiency; + } + + public Date getDate1() { + return date1; + } + + public void setDate1(Date date1) { + this.date1 = date1; + } + + public Date getDate2() { + return date2; + } + + public void setDate2(Date date2) { + this.date2 = date2; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String getSumType() { + return sumType; + } + + public void setSumType(String sumType) { + this.sumType = sumType; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderItemWasteData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderItemWasteData.java new file mode 100644 index 0000000..9a8c269 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderItemWasteData.java @@ -0,0 +1,346 @@ +package com.gaotao.modules.shopOrder.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +public class SearchShopOrderItemWasteData { + private String site; + private String orderNo; + private String partNo; + private String partDesc; + private String status; + private String type; + private BigDecimal opPlannedQty; + private BigDecimal opCompQty; + private BigDecimal orderPlannedQty; + private BigDecimal orderCompQty; + private Double itemNo; + private String operationDesc; + private String workCenterNo; + private String workCenterDesc; + private String compPartNo; + private String compPartDesc; + private String keyRMFlag; + private BigDecimal qPA; + private Double sAPBOMItemNo; + private BigDecimal unitCost; + private BigDecimal unitCostConverted; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date closedate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createdate; + private Double seqNo; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date seqCreatedate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date seqClosedate; + private BigDecimal qtyIssued; + private BigDecimal qtyRequired; + private BigDecimal waste; + private BigDecimal wasterate; + private BigDecimal wasteValue; + private String exceptionReason; + private String user; + private String searchType; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getPartDesc() { + return partDesc; + } + + public void setPartDesc(String partDesc) { + this.partDesc = partDesc; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public BigDecimal getOpPlannedQty() { + return opPlannedQty; + } + + public void setOpPlannedQty(BigDecimal opPlannedQty) { + this.opPlannedQty = opPlannedQty; + } + + public BigDecimal getOpCompQty() { + return opCompQty; + } + + public void setOpCompQty(BigDecimal opCompQty) { + this.opCompQty = opCompQty; + } + + public BigDecimal getOrderPlannedQty() { + return orderPlannedQty; + } + + public void setOrderPlannedQty(BigDecimal orderPlannedQty) { + this.orderPlannedQty = orderPlannedQty; + } + + public BigDecimal getOrderCompQty() { + return orderCompQty; + } + + public void setOrderCompQty(BigDecimal orderCompQty) { + this.orderCompQty = orderCompQty; + } + + public Double getItemNo() { + return itemNo; + } + + public void setItemNo(Double itemNo) { + this.itemNo = itemNo; + } + + public String getOperationDesc() { + return operationDesc; + } + + public void setOperationDesc(String operationDesc) { + this.operationDesc = operationDesc; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getWorkCenterDesc() { + return workCenterDesc; + } + + public void setWorkCenterDesc(String workCenterDesc) { + this.workCenterDesc = workCenterDesc; + } + + public String getCompPartNo() { + return compPartNo; + } + + public void setCompPartNo(String compPartNo) { + this.compPartNo = compPartNo; + } + + public String getCompPartDesc() { + return compPartDesc; + } + + public void setCompPartDesc(String compPartDesc) { + this.compPartDesc = compPartDesc; + } + + public String getKeyRMFlag() { + return keyRMFlag; + } + + public void setKeyRMFlag(String keyRMFlag) { + this.keyRMFlag = keyRMFlag; + } + + public BigDecimal getqPA() { + return qPA; + } + + public void setqPA(BigDecimal qPA) { + this.qPA = qPA; + } + + public Double getsAPBOMItemNo() { + return sAPBOMItemNo; + } + + public void setsAPBOMItemNo(Double sAPBOMItemNo) { + this.sAPBOMItemNo = sAPBOMItemNo; + } + + public BigDecimal getUnitCost() { + return unitCost; + } + + public void setUnitCost(BigDecimal unitCost) { + this.unitCost = unitCost; + } + + public BigDecimal getUnitCostConverted() { + return unitCostConverted; + } + + public void setUnitCostConverted(BigDecimal unitCostConverted) { + this.unitCostConverted = unitCostConverted; + } + + public Date getClosedate() { + return closedate; + } + + public void setClosedate(Date closedate) { + this.closedate = closedate; + } + + public Date getCreatedate() { + return createdate; + } + + public void setCreatedate(Date createdate) { + this.createdate = createdate; + } + + public Double getSeqNo() { + return seqNo; + } + + public void setSeqNo(Double seqNo) { + this.seqNo = seqNo; + } + + public Date getSeqCreatedate() { + return seqCreatedate; + } + + public void setSeqCreatedate(Date seqCreatedate) { + this.seqCreatedate = seqCreatedate; + } + + public Date getSeqClosedate() { + return seqClosedate; + } + + public void setSeqClosedate(Date seqClosedate) { + this.seqClosedate = seqClosedate; + } + + public BigDecimal getQtyIssued() { + return qtyIssued; + } + + public void setQtyIssued(BigDecimal qtyIssued) { + this.qtyIssued = qtyIssued; + } + + public BigDecimal getQtyRequired() { + return qtyRequired; + } + + public void setQtyRequired(BigDecimal qtyRequired) { + this.qtyRequired = qtyRequired; + } + + public BigDecimal getWaste() { + return waste; + } + + public void setWaste(BigDecimal waste) { + this.waste = waste; + } + + public BigDecimal getWasterate() { + return wasterate; + } + + public void setWasterate(BigDecimal wasterate) { + this.wasterate = wasterate; + } + + public BigDecimal getWasteValue() { + return wasteValue; + } + + public void setWasteValue(BigDecimal wasteValue) { + this.wasteValue = wasteValue; + } + + public String getExceptionReason() { + return exceptionReason; + } + + public void setExceptionReason(String exceptionReason) { + this.exceptionReason = exceptionReason; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String getSearchType() { + return searchType; + } + + public void setSearchType(String searchType) { + this.searchType = searchType; + } + + public Date getDate1() { + return date1; + } + + public void setDate1(Date date1) { + this.date1 = date1; + } + + public Date getDate2() { + return date2; + } + + public void setDate2(Date date2) { + this.date2 = date2; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderScriptData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderScriptData.java new file mode 100644 index 0000000..1b601b7 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderScriptData.java @@ -0,0 +1,194 @@ +package com.gaotao.modules.shopOrder.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +public class SearchShopOrderScriptData { + private String user; + private String site; + private String orderno; + private String partno; + private String partdesc; + private Integer seqno; + private Double qtyRequired; + private Double itemno; + private String operdesc; + private String sResourceID; + private String workCenterNo; + private String workCenterDesc; + private String rollno; + private String defectcode; + private String defectdesc; + private Double defectqty; + private String reportedby; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date reportDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getOrderno() { + return orderno; + } + + public void setOrderno(String orderno) { + this.orderno = orderno; + } + + public String getPartno() { + return partno; + } + + public void setPartno(String partno) { + this.partno = partno; + } + + public String getPartdesc() { + return partdesc; + } + + public void setPartdesc(String partdesc) { + this.partdesc = partdesc; + } + + public Integer getSeqno() { + return seqno; + } + + public void setSeqno(Integer seqno) { + this.seqno = seqno; + } + + public Double getQtyRequired() { + return qtyRequired; + } + + public void setQtyRequired(Double qtyRequired) { + this.qtyRequired = qtyRequired; + } + + public Double getItemno() { + return itemno; + } + + public void setItemno(Double itemno) { + this.itemno = itemno; + } + + public String getOperdesc() { + return operdesc; + } + + public void setOperdesc(String operdesc) { + this.operdesc = operdesc; + } + + public String getsResourceID() { + return sResourceID; + } + + public void setsResourceID(String sResourceID) { + this.sResourceID = sResourceID; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getWorkCenterDesc() { + return workCenterDesc; + } + + public void setWorkCenterDesc(String workCenterDesc) { + this.workCenterDesc = workCenterDesc; + } + + public String getRollno() { + return rollno; + } + + public void setRollno(String rollno) { + this.rollno = rollno; + } + + public String getDefectcode() { + return defectcode; + } + + public void setDefectcode(String defectcode) { + this.defectcode = defectcode; + } + + public String getDefectdesc() { + return defectdesc; + } + + public void setDefectdesc(String defectdesc) { + this.defectdesc = defectdesc; + } + + public Double getDefectqty() { + return defectqty; + } + + public void setDefectqty(Double defectqty) { + this.defectqty = defectqty; + } + + public String getReportedby() { + return reportedby; + } + + public void setReportedby(String reportedby) { + this.reportedby = reportedby; + } + + public Date getReportDate() { + return reportDate; + } + + public void setReportDate(Date reportDate) { + this.reportDate = reportDate; + } + + public Date getDate1() { + return date1; + } + + public void setDate1(Date date1) { + this.date1 = date1; + } + + public Date getDate2() { + return date2; + } + + public void setDate2(Date date2) { + this.date2 = date2; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderStatusCheckData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderStatusCheckData.java new file mode 100644 index 0000000..18f94d3 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrderStatusCheckData.java @@ -0,0 +1,196 @@ +package com.gaotao.modules.shopOrder.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +public class SearchShopOrderStatusCheckData { + private String orderno; + private String site; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date enterDate; + private String partno; + private String partdesc; + private BigDecimal lotsize; + private String status; + private String sAPStatus; + private String sAPCloseFlag; + private String sOpenFlag; + private String sUnTransFlag; + private String sWIPRollFlag; + private String sUnRecRollFlag; + private String canCloseFlag; + private BigDecimal actIssueCost; + private BigDecimal actReceiveCost; + private BigDecimal variance; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + private String user; + + public String getOrderno() { + return orderno; + } + + public void setOrderno(String orderno) { + this.orderno = orderno; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public Date getEnterDate() { + return enterDate; + } + + public void setEnterDate(Date enterDate) { + this.enterDate = enterDate; + } + + public String getPartno() { + return partno; + } + + public void setPartno(String partno) { + this.partno = partno; + } + + public String getPartdesc() { + return partdesc; + } + + public void setPartdesc(String partdesc) { + this.partdesc = partdesc; + } + + public BigDecimal getLotsize() { + return lotsize; + } + + public void setLotsize(BigDecimal lotsize) { + this.lotsize = lotsize; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getsAPStatus() { + return sAPStatus; + } + + public void setsAPStatus(String sAPStatus) { + this.sAPStatus = sAPStatus; + } + + public String getsAPCloseFlag() { + return sAPCloseFlag; + } + + public void setsAPCloseFlag(String sAPCloseFlag) { + this.sAPCloseFlag = sAPCloseFlag; + } + + public String getsOpenFlag() { + return sOpenFlag; + } + + public void setsOpenFlag(String sOpenFlag) { + this.sOpenFlag = sOpenFlag; + } + + public String getsUnTransFlag() { + return sUnTransFlag; + } + + public void setsUnTransFlag(String sUnTransFlag) { + this.sUnTransFlag = sUnTransFlag; + } + + public String getsWIPRollFlag() { + return sWIPRollFlag; + } + + public void setsWIPRollFlag(String sWIPRollFlag) { + this.sWIPRollFlag = sWIPRollFlag; + } + + public String getsUnRecRollFlag() { + return sUnRecRollFlag; + } + + public void setsUnRecRollFlag(String sUnRecRollFlag) { + this.sUnRecRollFlag = sUnRecRollFlag; + } + + public String getCanCloseFlag() { + return canCloseFlag; + } + + public void setCanCloseFlag(String canCloseFlag) { + this.canCloseFlag = canCloseFlag; + } + + public BigDecimal getActIssueCost() { + return actIssueCost; + } + + public void setActIssueCost(BigDecimal actIssueCost) { + this.actIssueCost = actIssueCost; + } + + public BigDecimal getActReceiveCost() { + return actReceiveCost; + } + + public void setActReceiveCost(BigDecimal actReceiveCost) { + this.actReceiveCost = actReceiveCost; + } + + public BigDecimal getVariance() { + return variance; + } + + public void setVariance(BigDecimal variance) { + this.variance = variance; + } + + public Date getDate1() { + return date1; + } + + public void setDate1(Date date1) { + this.date1 = date1; + } + + public Date getDate2() { + return date2; + } + + public void setDate2(Date date2) { + this.date2 = date2; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchWorkCenterCapacityData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchWorkCenterCapacityData.java new file mode 100644 index 0000000..b05aab7 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchWorkCenterCapacityData.java @@ -0,0 +1,115 @@ +package com.gaotao.modules.shopOrder.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +public class SearchWorkCenterCapacityData { + private String site; + private String workCenterNo; + private String workCenterDesc; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date scheduleDate; + private String seqNo1; + private String seqNo2; + private String timeCapacity; + private String timeLoading; + private String user; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getWorkCenterDesc() { + return workCenterDesc; + } + + public void setWorkCenterDesc(String workCenterDesc) { + this.workCenterDesc = workCenterDesc; + } + + public Date getScheduleDate() { + return scheduleDate; + } + + public void setScheduleDate(Date scheduleDate) { + this.scheduleDate = scheduleDate; + } + + public String getSeqNo1() { + return seqNo1; + } + + public void setSeqNo1(String seqNo1) { + this.seqNo1 = seqNo1; + } + + public String getSeqNo2() { + return seqNo2; + } + + public void setSeqNo2(String seqNo2) { + this.seqNo2 = seqNo2; + } + + public String getTimeCapacity() { + return timeCapacity; + } + + public void setTimeCapacity(String timeCapacity) { + this.timeCapacity = timeCapacity; + } + + public String getTimeLoading() { + return timeLoading; + } + + public void setTimeLoading(String timeLoading) { + this.timeLoading = timeLoading; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public Date getDate1() { + return date1; + } + + public void setDate1(Date date1) { + this.date1 = date1; + } + + public Date getDate2() { + return date2; + } + + public void setDate2(Date date2) { + this.date2 = date2; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ReportFormSearchServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ReportFormSearchServiceImpl.java new file mode 100644 index 0000000..3be3015 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ReportFormSearchServiceImpl.java @@ -0,0 +1,79 @@ +package com.gaotao.modules.shopOrder.service.Impl; + +import com.gaotao.modules.shopOrder.dao.ReportFormSearchMapper; +import com.gaotao.modules.shopOrder.entity.*; +import com.gaotao.modules.shopOrder.service.ReportFormSearchService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class ReportFormSearchServiceImpl implements ReportFormSearchService { + @Autowired + private ReportFormSearchMapper reportFormSearchMapper; + //=============查询-生产订单不良================== + @Override + public List searchShopOrderScript(SearchShopOrderScriptData indata){ + List result = reportFormSearchMapper.searchShopOrderScript(indata); + return result; + } + + //=============查询-生产订单工序浪费================== + @Override + public List searchShopOrderItemWaste(SearchShopOrderItemWasteData indata){ + List result=new ArrayList<>(); + if(indata.getSearchType().equals("生产订单")) { + result = reportFormSearchMapper.searchShopOrderItemWaste(indata); + }else{ + result = reportFormSearchMapper.searchScheduledItemWaste(indata); + } + return result; + } + //=============查询-机台效率================== + @Override + public List searchMachineEfficiency(SearchMachineEfficiencyData indata){ + List result = reportFormSearchMapper.searchMachineEfficiency(indata); + return result; + } + //=============查询-生产订单效率================== + @Override + public List searchShopOrderEfficiency(SearchShopOrderEfficiencyData indata){ + List result=new ArrayList<>(); + if(indata.getSumType().equals("生产订单")) { + result = reportFormSearchMapper.searchShopOrderEfficiency(indata); + }else{ + result = reportFormSearchMapper.searchScheduleEfficiency(indata); + } + return result; + } + + //=============查询-加工中心产能负荷================== + @Override + public List searchWorkCenterCapacity(SearchWorkCenterCapacityData indata){ + List result = reportFormSearchMapper.searchWorkCenterCapacity(indata); + return result; + } + + //=============查询-机台产能负荷================== + @Override + public List searchResourceCapacity(SearchResourceCapacityData indata){ + List result = reportFormSearchMapper.searchResourceCapacity(indata); + return result; + } + + //=============查询-生产订单状态检查================== + @Override + public List searchShopOrderStatusCheck(SearchShopOrderStatusCheckData indata){ + List result = reportFormSearchMapper.searchShopOrderStatusCheck(indata); + return result; + } + + //=============查询-生产订单生产异常记录================== + @Override + public List searchShopOrderAbnormalRecord(CExceptionLogData indata){ + List result = reportFormSearchMapper.searchShopOrderAbnormalRecord(indata); + return result; + } +} diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/ReportFormSearchService.java b/src/main/java/com/gaotao/modules/shopOrder/service/ReportFormSearchService.java new file mode 100644 index 0000000..39c50a6 --- /dev/null +++ b/src/main/java/com/gaotao/modules/shopOrder/service/ReportFormSearchService.java @@ -0,0 +1,103 @@ +package com.gaotao.modules.shopOrder.service; + +import com.gaotao.modules.shopOrder.entity.*; + +import java.util.List; + +public interface ReportFormSearchService { + //=============查询-生产订单不良=================== + /** + * @Description 查询-生产订单不良 + * @Title searchShopOrderScript + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderScript(SearchShopOrderScriptData indata); + + //=============查询-生产订单工序浪费=================== + /** + * @Description 查询-生产订单不良 + * @Title searchShopOrderItemWaste + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderItemWaste(SearchShopOrderItemWasteData indata); + + //=============查询-机台效率=================== + /** + * @Description 查询-机台效率 + * @Title searchMachineEfficiency + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchMachineEfficiency(SearchMachineEfficiencyData indata); + + //=============查询-生产订单效率=================== + /** + * @Description 查询-生产订单效率 + * @Title searchShopOrderEfficiency + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderEfficiency(SearchShopOrderEfficiencyData indata); + + //=============查询-加工中心产能负荷=================== + /** + * @Description 查询-加工中心产能负荷 + * @Title searchWorkCenterCapacity + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchWorkCenterCapacity(SearchWorkCenterCapacityData indata); + + //=============查询-机台产能负荷=================== + /** + * @Description 查询-机台产能负荷 + * @Title searchResourceCapacity + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchResourceCapacity(SearchResourceCapacityData indata); + + //=============查询-生产订单状态检查=================== + /** + * @Description 查询-生产订单状态检查 + * @Title searchShopOrderStatusCheck + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderStatusCheck(SearchShopOrderStatusCheckData indata); + + //=============查询-生产订单生产异常记录=================== + /** + * @Description 查询-生产订单生产异常记录 + * @Title searchShopOrderAbnormalRecord + * @param indata + * @author rq + * @date 2021/10/10 22:05 + * @return List + * @throw + */ + List searchShopOrderAbnormalRecord(CExceptionLogData indata); +} diff --git a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml new file mode 100644 index 0000000..363f899 --- /dev/null +++ b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml @@ -0,0 +1,678 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file