From bb51ce9d691ec582611f1c713cce9347b40fa56e Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Wed, 17 Nov 2021 17:28:48 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/data/BaseShopOrderData.java | 178 +++++++++++++++ .../schedule/data/BaseSoRoutingData.java | 137 ++++++++++++ .../schedule/data/ResourceOutData.java | 101 +++++++++ .../modules/schedule/data/ScheduleData.java | 9 - .../schedule/data/SearchScheduleData.java | 205 ++++++++++++++++++ .../mapper/schedule/ScheduleMapper.xml | 12 +- 6 files changed, 629 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/gaotao/modules/schedule/data/BaseShopOrderData.java create mode 100644 src/main/java/com/gaotao/modules/schedule/data/BaseSoRoutingData.java create mode 100644 src/main/java/com/gaotao/modules/schedule/data/ResourceOutData.java create mode 100644 src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java diff --git a/src/main/java/com/gaotao/modules/schedule/data/BaseShopOrderData.java b/src/main/java/com/gaotao/modules/schedule/data/BaseShopOrderData.java new file mode 100644 index 0000000..477781b --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/data/BaseShopOrderData.java @@ -0,0 +1,178 @@ +package com.gaotao.modules.schedule.data; + +import org.apache.ibatis.type.Alias; + +/** + * @author LR + * @Title: ShopOrderData + * 生产订单数据 + * @Date 2021/10/25 14:07 + */ +@Alias("BaseShopOrderData") +public class BaseShopOrderData extends BaseData { + private String orderNo;// + private Integer itemNo; + private String itemDesc;// + private String partNo;// + private String partDesc; + private Integer preItemNo;// + private String preItemDesc; + private String preScheduledFlag; + private Integer nextItemNo;// + private String nextItemDesc; + private String nextScheduledFlag; + private String workCenterNo; + private String workCenterDesc;//加工中心描述 + private String resourceId; + private String resourceDesc;//机台描述 + private Float machRunFactor; + private Float machSetupTime;// + private String factorUnit;// + + public BaseShopOrderData() { + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public Integer getItemNo() { + return itemNo; + } + + public void setItemNo(Integer itemNo) { + this.itemNo = itemNo; + } + + public String getItemDesc() { + return itemDesc; + } + + public void setItemDesc(String itemDesc) { + this.itemDesc = itemDesc; + } + + 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 getPreItemNo() { + return preItemNo; + } + + public void setPreItemNo(Integer preItemNo) { + this.preItemNo = preItemNo; + } + + public String getPreItemDesc() { + return preItemDesc; + } + + public void setPreItemDesc(String preItemDesc) { + this.preItemDesc = preItemDesc; + } + + public String getPreScheduledFlag() { + return preScheduledFlag; + } + + public void setPreScheduledFlag(String preScheduledFlag) { + this.preScheduledFlag = preScheduledFlag; + } + + public Integer getNextItemNo() { + return nextItemNo; + } + + public void setNextItemNo(Integer nextItemNo) { + this.nextItemNo = nextItemNo; + } + + public String getNextItemDesc() { + return nextItemDesc; + } + + public void setNextItemDesc(String nextItemDesc) { + this.nextItemDesc = nextItemDesc; + } + + public String getNextScheduledFlag() { + return nextScheduledFlag; + } + + public void setNextScheduledFlag(String nextScheduledFlag) { + this.nextScheduledFlag = nextScheduledFlag; + } + + 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 getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public String getResourceDesc() { + return resourceDesc; + } + + public void setResourceDesc(String resourceDesc) { + this.resourceDesc = resourceDesc; + } + + public Float getMachRunFactor() { + return machRunFactor; + } + + public void setMachRunFactor(Float machRunFactor) { + this.machRunFactor = machRunFactor; + } + + public Float getMachSetupTime() { + return machSetupTime; + } + + public void setMachSetupTime(Float machSetupTime) { + this.machSetupTime = machSetupTime; + } + + public String getFactorUnit() { + return factorUnit; + } + + public void setFactorUnit(String factorUnit) { + this.factorUnit = factorUnit; + } +} diff --git a/src/main/java/com/gaotao/modules/schedule/data/BaseSoRoutingData.java b/src/main/java/com/gaotao/modules/schedule/data/BaseSoRoutingData.java new file mode 100644 index 0000000..f896bed --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/data/BaseSoRoutingData.java @@ -0,0 +1,137 @@ +package com.gaotao.modules.schedule.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author LR + * @Title: ShopOrderData + * 生产订单数据 + * @Date 2021/10/25 14:07 + */ +@Alias("BaseSoRoutingData") +public class BaseSoRoutingData extends BaseData { + private String orderNo;// + private Integer itemNo; + private String itemDesc;// + private String partNo;// + private String partDesc; + private Integer preItemNo;// + private String preItemDesc; + private Integer nextItemNo;// + private String nextItemDesc; + private String workCenterNo; + private Float machRunFactor; + private Float machSetupTime;// + private Float factorUnit;// + + public BaseSoRoutingData() { + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public Integer getItemNo() { + return itemNo; + } + + public void setItemNo(Integer itemNo) { + this.itemNo = itemNo; + } + + public String getItemDesc() { + return itemDesc; + } + + public void setItemDesc(String itemDesc) { + this.itemDesc = itemDesc; + } + + 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 getPreItemNo() { + return preItemNo; + } + + public void setPreItemNo(Integer preItemNo) { + this.preItemNo = preItemNo; + } + + public String getPreItemDesc() { + return preItemDesc; + } + + public void setPreItemDesc(String preItemDesc) { + this.preItemDesc = preItemDesc; + } + + public Integer getNextItemNo() { + return nextItemNo; + } + + public void setNextItemNo(Integer nextItemNo) { + this.nextItemNo = nextItemNo; + } + + public String getNextItemDesc() { + return nextItemDesc; + } + + public void setNextItemDesc(String nextItemDesc) { + this.nextItemDesc = nextItemDesc; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public Float getMachRunFactor() { + return machRunFactor; + } + + public void setMachRunFactor(Float machRunFactor) { + this.machRunFactor = machRunFactor; + } + + public Float getMachSetupTime() { + return machSetupTime; + } + + public void setMachSetupTime(Float machSetupTime) { + this.machSetupTime = machSetupTime; + } + + public Float getFactorUnit() { + return factorUnit; + } + + public void setFactorUnit(Float factorUnit) { + this.factorUnit = factorUnit; + } +} diff --git a/src/main/java/com/gaotao/modules/schedule/data/ResourceOutData.java b/src/main/java/com/gaotao/modules/schedule/data/ResourceOutData.java new file mode 100644 index 0000000..c16b722 --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/data/ResourceOutData.java @@ -0,0 +1,101 @@ +package com.gaotao.modules.schedule.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author LR + * @Title: ResourceOutData + * 加工中心机台的信息 + * @Date 2021/10/28 8:59 + */ +@Alias("ResourceOutData") +public class ResourceOutData extends BaseData { + private String workCenterNo; + private String resourceId; + private String resourceDesc; + private Double efficiency; + private Double utilization; + private String active; + private String remark; + private String calendarId; + private String virturlFlag; + + public ResourceOutData() { + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public String getResourceDesc() { + return resourceDesc; + } + + public void setResourceDesc(String resourceDesc) { + this.resourceDesc = resourceDesc; + } + + public Double getEfficiency() { + return efficiency; + } + + public void setEfficiency(Double efficiency) { + this.efficiency = efficiency; + } + + public Double getUtilization() { + return utilization; + } + + public void setUtilization(Double utilization) { + this.utilization = utilization; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getCalendarId() { + return calendarId; + } + + public void setCalendarId(String calendarId) { + this.calendarId = calendarId; + } + + public String getVirturlFlag() { + return virturlFlag; + } + + public void setVirturlFlag(String virturlFlag) { + this.virturlFlag = virturlFlag; + } +} diff --git a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java index c61d177..2e151ec 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java @@ -40,7 +40,6 @@ public class ScheduleData extends BaseShopOrderData { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date planFinishTime; - private String resourceId; private String shiftNo;// private Float timeRequired; private Float timeReported; @@ -205,14 +204,6 @@ public class ScheduleData extends BaseShopOrderData { this.planFinishTime = planFinishTime; } - public String getResourceId() { - return resourceId; - } - - public void setResourceId(String resourceId) { - this.resourceId = resourceId; - } - public String getShiftNo() { return shiftNo; } diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java new file mode 100644 index 0000000..366a6c5 --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -0,0 +1,205 @@ +package com.gaotao.modules.schedule.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author LR + * @Title: ShiftSearchData + * 班次查询使用 + * @Date 2021/10/20 15:39 + */ +@Alias("SearchScheduleData") +public class SearchScheduleData extends BaseData { + private String orderNo;//工单 + private Integer itemNo;//工序 + private String seqNo;//派工单号 + private String partNo;//物料编码 + private String workCenterNo;//加工中心 + private String resourceId;//机台 + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date scheduleDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date enterTime1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date enterTime2; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date needTime1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date needTime2; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date planStartTime1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date planStartTime2; + private String calendarId; + private String username; + private String scheduledFlag; + private String closedFlag;//是否关闭 Y 是 N 否 + private String rollNo;//当前上机卷的数据 + private String referenceCustomerId;//关联客户编码 + + public SearchScheduleData() { + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public Integer getItemNo() { + return itemNo; + } + + public void setItemNo(Integer itemNo) { + this.itemNo = itemNo; + } + + public String getSeqNo() { + return seqNo; + } + + public void setSeqNo(String seqNo) { + this.seqNo = seqNo; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public Date getScheduleDate() { + return scheduleDate; + } + + public void setScheduleDate(Date scheduleDate) { + this.scheduleDate = scheduleDate; + } + + public Date getEnterTime1() { + return enterTime1; + } + + public void setEnterTime1(Date enterTime1) { + this.enterTime1 = enterTime1; + } + + public Date getEnterTime2() { + return enterTime2; + } + + public void setEnterTime2(Date enterTime2) { + this.enterTime2 = enterTime2; + } + + public Date getNeedTime1() { + return needTime1; + } + + public void setNeedTime1(Date needTime1) { + this.needTime1 = needTime1; + } + + public Date getNeedTime2() { + return needTime2; + } + + public void setNeedTime2(Date needTime2) { + this.needTime2 = needTime2; + } + + public Date getPlanStartTime1() { + return planStartTime1; + } + + public void setPlanStartTime1(Date planStartTime1) { + this.planStartTime1 = planStartTime1; + } + + public Date getPlanStartTime2() { + return planStartTime2; + } + + public void setPlanStartTime2(Date planStartTime2) { + this.planStartTime2 = planStartTime2; + } + + public String getCalendarId() { + return calendarId; + } + + public void setCalendarId(String calendarId) { + this.calendarId = calendarId; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getScheduledFlag() { + return scheduledFlag; + } + + public void setScheduledFlag(String scheduledFlag) { + this.scheduledFlag = scheduledFlag; + } + + public String getClosedFlag() { + return closedFlag; + } + + public void setClosedFlag(String closedFlag) { + this.closedFlag = closedFlag; + } + + public String getRollNo() { + return rollNo; + } + + public void setRollNo(String rollNo) { + this.rollNo = rollNo; + } + + public String getReferenceCustomerId() { + return referenceCustomerId; + } + + public void setReferenceCustomerId(String referenceCustomerId) { + this.referenceCustomerId = referenceCustomerId; + } +} diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 6519d20..b3956d7 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -129,10 +129,12 @@ T.SeqNo seqNo, T.QtyRequired qtyRequired, T.QtyReported qtyReported, T.QtyApprove qtyApprove, ROUND(T.TimeRequired, 3) timeRequired, T.TimeReported timeReported, T.PlanStartTime planStartTime, T.PlanFinishTime planFinishTime, T.BarcodeID barcodeId, T.Remark remark, T.Crewsize crewSize, T.ClosedFlag closedFlag, T.QtyScrapt qtyScrapt, T.OutWorkFlag outWorkFlag, T.S_ScheduledDate scheduledDate, - T.S_ResourceID resourceId, E.S_ScheduledSeqNo scheduledSeqNo, T.S_ShiftNo shiftNo, D.MachSetupTime machSetupTime, D.MachRunFactor machRunFactor, + T.S_ResourceID resourceId, dbo.getWorkCenterResourceDesc(T.Site, t.S_WorkCenterNo, T.S_ResourceID) resourceDesc, + E.S_ScheduledSeqNo scheduledSeqNo, T.S_ShiftNo shiftNo, D.MachSetupTime machSetupTime, D.MachRunFactor machRunFactor, D.FactorUnit factorUnit, D.Efficiency efficiency,D.NextItemNo nextItemNo, dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.NextItemNo) nextItemDesc, D.PreItemNo preItemNo,dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.PreItemNo) preItemDesc, SO.NeedDate needDate, T.ParkFlag parkFlag, - P.ConfigurationTemplateID customerName, P.Remark custPartNo, t.S_WorkCenterNo workCenterNo, T.QtyRequired_Original qtyRequiredOriginal, + P.ConfigurationTemplateID customerName, P.Remark custPartNo, t.S_WorkCenterNo workCenterNo, dbo.Get_WorkCenterDesc(T.Site, T.S_WorkCenterNo) workCenterDesc, + T.QtyRequired_Original qtyRequiredOriginal, T.ClosedBy closedBy, T.ClosedDate closedDate, SO.CostRollUpFlag costRollUpFlag, SO.RepairSOFlag repairSOFlag, SO.ManualFlag manualFlag from SOScheduledRouting as T Left Join SOScheduledList as E on E.Site=T.Site and E.LinkedSeqNo=T.SeqNo, @@ -211,10 +213,12 @@ T.SeqNo seqNo, T.QtyRequired qtyRequired, T.QtyReported qtyReported, T.QtyApprove qtyApprove, ROUND(T.TimeRequired, 3) timeRequired, T.TimeReported timeReported, T.PlanStartTime planStartTime, T.PlanFinishTime planFinishTime, T.BarcodeID barcodeId, T.Remark remark, T.Crewsize crewSize, T.ClosedFlag closedFlag, T.QtyScrapt qtyScrapt, T.OutWorkFlag outWorkFlag, T.S_ScheduledDate scheduledDate, - T.S_ResourceID resourceId, E.S_ScheduledSeqNo scheduledSeqNo, T.S_ShiftNo shiftNo, D.MachSetupTime machSetupTime, D.MachRunFactor machRunFactor, + T.S_ResourceID resourceId, dbo.getWorkCenterResourceDesc(T.Site, t.S_WorkCenterNo, T.S_ResourceID) resourceDesc, + E.S_ScheduledSeqNo scheduledSeqNo, T.S_ShiftNo shiftNo, D.MachSetupTime machSetupTime, D.MachRunFactor machRunFactor, D.FactorUnit factorUnit, D.Efficiency efficiency,D.NextItemNo nextItemNo, dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.NextItemNo) nextItemDesc, D.PreItemNo preItemNo,dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.PreItemNo) preItemDesc, SO.NeedDate needDate, T.ParkFlag parkFlag, - P.ConfigurationTemplateID customerName, P.Remark custPartNo, t.S_WorkCenterNo workCenterNo, T.QtyRequired_Original qtyRequiredOriginal, + P.ConfigurationTemplateID customerName, P.Remark custPartNo, t.S_WorkCenterNo workCenterNo, dbo.Get_WorkCenterDesc(T.Site, T.S_WorkCenterNo) workCenterDesc, + T.QtyRequired_Original qtyRequiredOriginal, T.ClosedBy closedBy, T.ClosedDate closedDate, SO.CostRollUpFlag costRollUpFlag, SO.RepairSOFlag repairSOFlag, SO.ManualFlag manualFlag from SOScheduledRouting as T Left Join SOScheduledList as E on E.Site=T.Site and E.LinkedSeqNo=T.SeqNo,