From 8e03afd73c162aac77b441af8c58c972a097b6af Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 6 Apr 2022 18:05:24 +0800 Subject: [PATCH] 20211213 --- .../base/controller/BaseController.java | 26 + .../gaotao/modules/base/dao/BaseMapper.java | 11 +- .../modules/base/entity/SORoutingData.java | 498 ++++++++++++++++++ .../modules/base/service/BaseService.java | 11 + .../base/service/Impl/BaseServiceImpl.java | 5 +- .../SearchProductionLineOutputReportData.java | 6 +- src/main/resources/mapper/base/BaseMapper.xml | 17 + 7 files changed, 569 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/gaotao/modules/base/entity/SORoutingData.java diff --git a/src/main/java/com/gaotao/modules/base/controller/BaseController.java b/src/main/java/com/gaotao/modules/base/controller/BaseController.java index e4f7edd..93b489c 100644 --- a/src/main/java/com/gaotao/modules/base/controller/BaseController.java +++ b/src/main/java/com/gaotao/modules/base/controller/BaseController.java @@ -1594,4 +1594,30 @@ public class BaseController { baseService.updateCESShift(inData); return R.ok(); } + //=============维护工艺路线组件=================== + /** + * @Description 维护工艺路线信息查询 + * @Title searchRoutingWithPartNo + * @param indata + * @author rq + * @date 2022/1/14 13:46 + * @return Object + * @throw + */ + @PostMapping("/getSORoutingData") + @ResponseBody + public Object getSORoutingData(@RequestBody SORoutingData indata){ + Map map = new HashMap<>(); + try { + List resultList = baseService.getSORoutingData(indata); + map.put("success", true); + map.put("rows", resultList); + map.put("total", resultList.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } + } diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java index 433fbcd..7384dcb 100644 --- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java +++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java @@ -1351,5 +1351,14 @@ public interface BaseMapper { * @throw */ int updateCESShift(CalendarExceptionShiftData inData); - + /** + * @Description 查数据 + * @Title getSORoutingData + * @param indata + * @author rq + * @date 2022/4/6 15:00 + * @return List + * @throw + */ + List getSORoutingData(SORoutingData indata); } diff --git a/src/main/java/com/gaotao/modules/base/entity/SORoutingData.java b/src/main/java/com/gaotao/modules/base/entity/SORoutingData.java new file mode 100644 index 0000000..678701d --- /dev/null +++ b/src/main/java/com/gaotao/modules/base/entity/SORoutingData.java @@ -0,0 +1,498 @@ +package com.gaotao.modules.base.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Alias("SORoutingData") +public class SORoutingData { + /** + * + */ + private String site; + + /** + * + */ + private String orderNo; + + /** + * + */ + private Double itemNo; + + /** + * + */ + private String operationDesc; + + /** + * + */ + private String workCenterNo; + + /** + * + */ + private Double machSetupTime; + + /** + * + */ + private Double machRunFactor; + + /** + * + */ + private String factorUnitDb; + + /** + * + */ + private String factorUnit; + + /** + * + */ + private Double qtyRequired; + + /** + * + */ + private Double qtyReported; + + /** + * + */ + private Double qtyApprove; + private String workCenterDesc; + /** + * + */ + private Double timeRequired; + + /** + * + */ + private Double timeReported; + + /** + * + */ + private Double efficiency; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date planStartTime; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date planFinishTime; + + /** + * + */ + private String barcodeID; + + /** + * + */ + private String remark; + + /** + * + */ + private String partNo; + private String partDesc; + /** + * + */ + private Double crewsize; + + /** + * + */ + private String closedFlag; + + /** + * + */ + private String actionNotes; + + /** + * + */ + private Double qtyScrapt; + + /** + * + */ + private String outWorkFlag; + + /** + * + */ + private String outWorkPartNo; + + /** + * + */ + private Double qtyOnPR; + + /** + * + */ + private Double qtyOnPO; + + /** + * + */ + private Double preItemNo; + + /** + * + */ + private Double nextItemNo; + + /** + * + */ + private String scheduledFlag; + + /** + * + */ + private Double qtyScheduled; + + /** + * + */ + private Date sScheduledDate; + + /** + * + */ + private String sResourceID; + + /** + * + */ + private Integer sScheduledSeqNo; + + /** + * + */ + private String sShiftNo; + + 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 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 Double getMachSetupTime() { + return machSetupTime; + } + + public void setMachSetupTime(Double machSetupTime) { + this.machSetupTime = machSetupTime; + } + + public Double getMachRunFactor() { + return machRunFactor; + } + + public void setMachRunFactor(Double machRunFactor) { + this.machRunFactor = machRunFactor; + } + + public String getFactorUnitDb() { + return factorUnitDb; + } + + public void setFactorUnitDb(String factorUnitDb) { + this.factorUnitDb = factorUnitDb; + } + + public String getFactorUnit() { + return factorUnit; + } + + public void setFactorUnit(String factorUnit) { + this.factorUnit = factorUnit; + } + + public Double getQtyRequired() { + return qtyRequired; + } + + public void setQtyRequired(Double qtyRequired) { + this.qtyRequired = qtyRequired; + } + + public Double getQtyReported() { + return qtyReported; + } + + public void setQtyReported(Double qtyReported) { + this.qtyReported = qtyReported; + } + + public Double getQtyApprove() { + return qtyApprove; + } + + public void setQtyApprove(Double qtyApprove) { + this.qtyApprove = qtyApprove; + } + + public Double getTimeRequired() { + return timeRequired; + } + + public void setTimeRequired(Double timeRequired) { + this.timeRequired = timeRequired; + } + + public Double getTimeReported() { + return timeReported; + } + + public void setTimeReported(Double timeReported) { + this.timeReported = timeReported; + } + + public Double getEfficiency() { + return efficiency; + } + + public void setEfficiency(Double efficiency) { + this.efficiency = efficiency; + } + + public Date getPlanStartTime() { + return planStartTime; + } + + public void setPlanStartTime(Date planStartTime) { + this.planStartTime = planStartTime; + } + + public Date getPlanFinishTime() { + return planFinishTime; + } + + public void setPlanFinishTime(Date planFinishTime) { + this.planFinishTime = planFinishTime; + } + + public String getBarcodeID() { + return barcodeID; + } + + public void setBarcodeID(String barcodeID) { + this.barcodeID = barcodeID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public Double getCrewsize() { + return crewsize; + } + + public void setCrewsize(Double crewsize) { + this.crewsize = crewsize; + } + + public String getClosedFlag() { + return closedFlag; + } + + public void setClosedFlag(String closedFlag) { + this.closedFlag = closedFlag; + } + + public String getActionNotes() { + return actionNotes; + } + + public void setActionNotes(String actionNotes) { + this.actionNotes = actionNotes; + } + + public Double getQtyScrapt() { + return qtyScrapt; + } + + public void setQtyScrapt(Double qtyScrapt) { + this.qtyScrapt = qtyScrapt; + } + + public String getOutWorkFlag() { + return outWorkFlag; + } + + public void setOutWorkFlag(String outWorkFlag) { + this.outWorkFlag = outWorkFlag; + } + + public String getOutWorkPartNo() { + return outWorkPartNo; + } + + public void setOutWorkPartNo(String outWorkPartNo) { + this.outWorkPartNo = outWorkPartNo; + } + + public Double getQtyOnPR() { + return qtyOnPR; + } + + public void setQtyOnPR(Double qtyOnPR) { + this.qtyOnPR = qtyOnPR; + } + + public Double getQtyOnPO() { + return qtyOnPO; + } + + public void setQtyOnPO(Double qtyOnPO) { + this.qtyOnPO = qtyOnPO; + } + + public Double getPreItemNo() { + return preItemNo; + } + + public void setPreItemNo(Double preItemNo) { + this.preItemNo = preItemNo; + } + + public Double getNextItemNo() { + return nextItemNo; + } + + public void setNextItemNo(Double nextItemNo) { + this.nextItemNo = nextItemNo; + } + + public String getScheduledFlag() { + return scheduledFlag; + } + + public void setScheduledFlag(String scheduledFlag) { + this.scheduledFlag = scheduledFlag; + } + + public Double getQtyScheduled() { + return qtyScheduled; + } + + public void setQtyScheduled(Double qtyScheduled) { + this.qtyScheduled = qtyScheduled; + } + + public Date getsScheduledDate() { + return sScheduledDate; + } + + public void setsScheduledDate(Date sScheduledDate) { + this.sScheduledDate = sScheduledDate; + } + + public String getsResourceID() { + return sResourceID; + } + + public void setsResourceID(String sResourceID) { + this.sResourceID = sResourceID; + } + + public Integer getsScheduledSeqNo() { + return sScheduledSeqNo; + } + + public void setsScheduledSeqNo(Integer sScheduledSeqNo) { + this.sScheduledSeqNo = sScheduledSeqNo; + } + + public String getsShiftNo() { + return sShiftNo; + } + + public void setsShiftNo(String sShiftNo) { + this.sShiftNo = sShiftNo; + } + + public String getPartDesc() { + return partDesc; + } + + public void setPartDesc(String partDesc) { + this.partDesc = partDesc; + } + + public String getWorkCenterDesc() { + return workCenterDesc; + } + + public void setWorkCenterDesc(String workCenterDesc) { + this.workCenterDesc = workCenterDesc; + } +} + diff --git a/src/main/java/com/gaotao/modules/base/service/BaseService.java b/src/main/java/com/gaotao/modules/base/service/BaseService.java index e2f94e9..06afdd6 100644 --- a/src/main/java/com/gaotao/modules/base/service/BaseService.java +++ b/src/main/java/com/gaotao/modules/base/service/BaseService.java @@ -765,4 +765,15 @@ public interface BaseService { * @throw */ void updateCESShift(CalendarExceptionShiftData inData); + + /** + * @Description 查数据 + * @Title getSORoutingData + * @param indata + * @author rq + * @date 2022/4/6 15:00 + * @return List + * @throw + */ + List getSORoutingData(SORoutingData indata); } diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java index 5c9f65a..56c1a01 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java @@ -1628,7 +1628,10 @@ public class BaseServiceImpl implements BaseService { if(index==0){ throw new RuntimeException("修改失败，数据可能已被修改，请刷新页面！"); } + } - + @Override + public List getSORoutingData(SORoutingData indata){ + return baseMapper.getSORoutingData(indata); } } diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionLineOutputReportData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionLineOutputReportData.java index 527f569..8fca1da 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionLineOutputReportData.java +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionLineOutputReportData.java @@ -27,7 +27,7 @@ public class SearchProductionLineOutputReportData { private Double reportedSetupTime; private Double reportedManfTime; private Double reportedCleanupTime; - private Double scrapReason; + private String scrapReason; private String downTimeReason; private String reverseflag; private Double relevantSeqNo; @@ -198,11 +198,11 @@ public class SearchProductionLineOutputReportData { this.reportedCleanupTime = reportedCleanupTime; } - public Double getScrapReason() { + public String getScrapReason() { return scrapReason; } - public void setScrapReason(Double scrapReason) { + public void setScrapReason(String scrapReason) { this.scrapReason = scrapReason; } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index e5a1234..df5a12d 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -938,4 +938,21 @@ dbo.Get_Part_DescSpec(site,WX_PartNo) as wxSpec,dbo.Get_WorkCenter_Type(Site,Wor ,endexacttime=#{endexacttime},starttime=#{starttime},endtime=#{endtime} where site=#{site} and CalendarID=#{calendarId} and ScheduleDate=#{scheduledate} and ShiftNo=#{shiftno} + + \ No newline at end of file