diff --git a/src/main/java/com/spring/modules/schedule/controller/ScheduleController.java b/src/main/java/com/spring/modules/schedule/controller/ScheduleController.java new file mode 100644 index 0000000..770ce24 --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/controller/ScheduleController.java @@ -0,0 +1,97 @@ +package com.spring.modules.schedule.controller; + +import com.spring.common.utils.R; +import com.spring.modules.schedule.data.BaseRollData; +import com.spring.modules.schedule.data.ScheduleData; +import com.spring.modules.schedule.data.SearchScheduleData; +import com.spring.modules.schedule.data.SfdcRollOpsData; +import com.spring.modules.schedule.service.ScheduleService; +import org.springframework.beans.factory.annotation.Autowired; +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.RestController; + +import java.text.ParseException; +import java.util.List; +import java.util.Map; + +/** + * 生产订单排产 + * @author LR + * @date 2021/10/20 11:04 + **/ +@RestController +@RequestMapping(value = "/schedule") +public class ScheduleController { + + @Autowired + private ScheduleService scheduleService; + + /** + * TODO 查询派工单的数据 + * @author LR + * @date 2021/10/25 16:07 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getProduceScheduleData") + public R getProduceScheduleData(@RequestBody SearchScheduleData inData){ + List resultList = scheduleService.getProduceScheduleData(inData); + return R.ok() + .put("code", 200) + .put("msg", "查询成功!") + .put("rows", resultList) + .put("total", resultList.size()); + } + + /** + * TODO 按照派工单号查询派工单的数据 + * @author LR + * @date 2021/11/8 14:23 + * @param seqNo + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getScheduleDataBySeqNo") + public R getScheduleDataBySeqNo(@RequestBody String seqNo){ + ScheduleData result = scheduleService.getScheduleDataBySeqNo(seqNo); + return R.ok() + .put("code", 200) + .put("msg", "查询成功!") + .put("row", result); + } + + /** + * TODO 获取当前的上机卷信息 + * @author LR + * @date 2021/11/9 16:02 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getCurrentRollOpsBySeqNo") + public R getCurrentRollOpsBySeqNo(@RequestBody BaseRollData inData){ + SfdcRollOpsData result = scheduleService.getCurrentRollOpsBySeqNo(inData); + return R.ok() + .put("code", 200) + .put("msg", "查询成功!") + .put("row", result); + } + + /** + * TODO 查询上机卷的记录数据 + * @author LR + * @date 2021/11/9 16:24 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getSfdcRollOpsByCon") + public R getSfdcRollOpsByCon(@RequestBody SearchScheduleData inData){ + List resultList = scheduleService.getSfdcRollOpsByCon(inData); + return R.ok() + .put("code", 200) + .put("msg", "查询成功!") + .put("rows", resultList) + .put("total", resultList.size()); + } + +} \ No newline at end of file diff --git a/src/main/java/com/spring/modules/schedule/data/BaseRollData.java b/src/main/java/com/spring/modules/schedule/data/BaseRollData.java new file mode 100644 index 0000000..4248a3c --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/data/BaseRollData.java @@ -0,0 +1,149 @@ +package com.spring.modules.schedule.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.spring.modules.report.data.BaseData; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author LR + * @Title: BaseRollData + * 卷信息基础表 + * @Date 2021/11/9 15:41 + */ +@Alias("BaseRollData") +public class BaseRollData extends BaseData { + private String orderNo; + private Integer itemNo; + private String seqNo; + private String rollNo; + private Float rollQty; + private Integer histSeqNo; + private String oriRollNo; + private String firstLevelRollNo; + private String finishedBy; + private String finishedFlag; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date finishedDate; + private String rollType; + private String rollTypeDb; + private String remark; + + public BaseRollData() { + } + + 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 getRollNo() { + return rollNo; + } + + public void setRollNo(String rollNo) { + this.rollNo = rollNo; + } + + public Float getRollQty() { + return rollQty; + } + + public void setRollQty(Float rollQty) { + this.rollQty = rollQty; + } + + public Integer getHistSeqNo() { + return histSeqNo; + } + + public void setHistSeqNo(Integer histSeqNo) { + this.histSeqNo = histSeqNo; + } + + public String getOriRollNo() { + return oriRollNo; + } + + public void setOriRollNo(String oriRollNo) { + this.oriRollNo = oriRollNo; + } + + public String getFirstLevelRollNo() { + return firstLevelRollNo; + } + + public void setFirstLevelRollNo(String firstLevelRollNo) { + this.firstLevelRollNo = firstLevelRollNo; + } + + public String getFinishedBy() { + return finishedBy; + } + + public void setFinishedBy(String finishedBy) { + this.finishedBy = finishedBy; + } + + public String getFinishedFlag() { + return finishedFlag; + } + + public void setFinishedFlag(String finishedFlag) { + this.finishedFlag = finishedFlag; + } + + public Date getFinishedDate() { + return finishedDate; + } + + public void setFinishedDate(Date finishedDate) { + this.finishedDate = finishedDate; + } + + public String getRollType() { + return rollType; + } + + public void setRollType(String rollType) { + this.rollType = rollType; + } + + public String getRollTypeDb() { + return rollTypeDb; + } + + public void setRollTypeDb(String rollTypeDb) { + this.rollTypeDb = rollTypeDb; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/src/main/java/com/spring/modules/schedule/data/BaseShopOrderData.java b/src/main/java/com/spring/modules/schedule/data/BaseShopOrderData.java new file mode 100644 index 0000000..d158627 --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/data/BaseShopOrderData.java @@ -0,0 +1,179 @@ +package com.spring.modules.schedule.data; + +import com.spring.modules.report.data.BaseData; +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/spring/modules/schedule/data/ScheduleData.java b/src/main/java/com/spring/modules/schedule/data/ScheduleData.java new file mode 100644 index 0000000..248216a --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/data/ScheduleData.java @@ -0,0 +1,522 @@ +package com.spring.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("ScheduleData") +public class ScheduleData extends BaseShopOrderData { + private String spec;// + private Float lotSize;// + private Float qtyRequired; + private Float qtyReported; + private Float qtyApprove; + private Float qtyScrapt;// + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date needDate;// + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date scheduledDate; + private String customerId;// + private String customerName;// + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date enterDate; + private String availResource;// + private String closedFlag; + private String scheduledSeqNo;// + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date planStartTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date planFinishTime; + private String shiftNo;// + private Float timeRequired; + private Float timeReported; + private Integer seqNo; + private String selectedFlag;// + private String sourceFlag; + private Float qtyScheduledPreOps;// + private String parkFlag;// + private Float timeRequiredOriginal; + private Float qtyRequiredOriginal;// + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date preOpsPlanStartTime;// + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date preOpsPlanFinishTime; + private String remark;// + private String oriSOOrderNo;// + private String custPartNo; + private Float eficiency;// + private Float delayHours;// + private String costRollUpFlag; + private String barcodeId;// + private Integer crewSize; + private String outWorkFlag;// + private Float efficiency;// + private String closedBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date closedDate;// + private String repairSOFlag;//印版已发 + private String manualFlag;//刀模已发 + private boolean checkedFlag;//是否选中 + private String orderType;//订单类型 + private String mergeStatusCon;//合并字段的内容 + private String laterShipFlag;//晚于发货时间 + private String earlierItemFlag;//早于上工序 + private String finishPreItemFlag;//早于上工序的标记 + private String preResourceInfo;//前道机台信息 + private Float preQtyFinished;//前道工序完成的 + private String colorStyle;//颜色样式 + private String matIssueFlag;//排料标记 + private String plateIssueFlag;//网版已发 + private String toolIssueFlag;//刀模已发 + + public ScheduleData() { + } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public Float getLotSize() { + return lotSize; + } + + public void setLotSize(Float lotSize) { + this.lotSize = lotSize; + } + + public Float getQtyRequired() { + return qtyRequired; + } + + public void setQtyRequired(Float qtyRequired) { + this.qtyRequired = qtyRequired; + } + + public Float getQtyReported() { + return qtyReported; + } + + public void setQtyReported(Float qtyReported) { + this.qtyReported = qtyReported; + } + + public Float getQtyApprove() { + return qtyApprove; + } + + public void setQtyApprove(Float qtyApprove) { + this.qtyApprove = qtyApprove; + } + + public Float getQtyScrapt() { + return qtyScrapt; + } + + public void setQtyScrapt(Float qtyScrapt) { + this.qtyScrapt = qtyScrapt; + } + + public Date getNeedDate() { + return needDate; + } + + public void setNeedDate(Date needDate) { + this.needDate = needDate; + } + + public Date getScheduledDate() { + return scheduledDate; + } + + public void setScheduledDate(Date scheduledDate) { + this.scheduledDate = scheduledDate; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public Date getEnterDate() { + return enterDate; + } + + public void setEnterDate(Date enterDate) { + this.enterDate = enterDate; + } + + public String getAvailResource() { + return availResource; + } + + public void setAvailResource(String availResource) { + this.availResource = availResource; + } + + public String getClosedFlag() { + return closedFlag; + } + + public void setClosedFlag(String closedFlag) { + this.closedFlag = closedFlag; + } + + public String getScheduledSeqNo() { + return scheduledSeqNo; + } + + public void setScheduledSeqNo(String scheduledSeqNo) { + this.scheduledSeqNo = scheduledSeqNo; + } + + 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 getShiftNo() { + return shiftNo; + } + + public void setShiftNo(String shiftNo) { + this.shiftNo = shiftNo; + } + + public Float getTimeRequired() { + return timeRequired; + } + + public void setTimeRequired(Float timeRequired) { + this.timeRequired = timeRequired; + } + + public Float getTimeReported() { + return timeReported; + } + + public void setTimeReported(Float timeReported) { + this.timeReported = timeReported; + } + + public Integer getSeqNo() { + return seqNo; + } + + public void setSeqNo(Integer seqNo) { + this.seqNo = seqNo; + } + + public String getSelectedFlag() { + return selectedFlag; + } + + public void setSelectedFlag(String selectedFlag) { + this.selectedFlag = selectedFlag; + } + + public String getSourceFlag() { + return sourceFlag; + } + + public void setSourceFlag(String sourceFlag) { + this.sourceFlag = sourceFlag; + } + + public Float getQtyScheduledPreOps() { + return qtyScheduledPreOps; + } + + public void setQtyScheduledPreOps(Float qtyScheduledPreOps) { + this.qtyScheduledPreOps = qtyScheduledPreOps; + } + + public String getParkFlag() { + return parkFlag; + } + + public void setParkFlag(String parkFlag) { + this.parkFlag = parkFlag; + } + + public Float getTimeRequiredOriginal() { + return timeRequiredOriginal; + } + + public void setTimeRequiredOriginal(Float timeRequiredOriginal) { + this.timeRequiredOriginal = timeRequiredOriginal; + } + + public Float getQtyRequiredOriginal() { + return qtyRequiredOriginal; + } + + public void setQtyRequiredOriginal(Float qtyRequiredOriginal) { + this.qtyRequiredOriginal = qtyRequiredOriginal; + } + + public Date getPreOpsPlanStartTime() { + return preOpsPlanStartTime; + } + + public void setPreOpsPlanStartTime(Date preOpsPlanStartTime) { + this.preOpsPlanStartTime = preOpsPlanStartTime; + } + + public Date getPreOpsPlanFinishTime() { + return preOpsPlanFinishTime; + } + + public void setPreOpsPlanFinishTime(Date preOpsPlanFinishTime) { + this.preOpsPlanFinishTime = preOpsPlanFinishTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getOriSOOrderNo() { + return oriSOOrderNo; + } + + public void setOriSOOrderNo(String oriSOOrderNo) { + this.oriSOOrderNo = oriSOOrderNo; + } + + public String getCustPartNo() { + return custPartNo; + } + + public void setCustPartNo(String custPartNo) { + this.custPartNo = custPartNo; + } + + public Float getEficiency() { + return eficiency; + } + + public void setEficiency(Float eficiency) { + this.eficiency = eficiency; + } + + public Float getDelayHours() { + return delayHours; + } + + public void setDelayHours(Float delayHours) { + this.delayHours = delayHours; + } + + public String getCostRollUpFlag() { + return costRollUpFlag; + } + + public void setCostRollUpFlag(String costRollUpFlag) { + this.costRollUpFlag = costRollUpFlag; + } + + public String getBarcodeId() { + return barcodeId; + } + + public void setBarcodeId(String barcodeId) { + this.barcodeId = barcodeId; + } + + public Integer getCrewSize() { + return crewSize; + } + + public void setCrewSize(Integer crewSize) { + this.crewSize = crewSize; + } + + public String getOutWorkFlag() { + return outWorkFlag; + } + + public void setOutWorkFlag(String outWorkFlag) { + this.outWorkFlag = outWorkFlag; + } + + public Float getEfficiency() { + return efficiency; + } + + public void setEfficiency(Float efficiency) { + this.efficiency = efficiency; + } + + public String getClosedBy() { + return closedBy; + } + + public void setClosedBy(String closedBy) { + this.closedBy = closedBy; + } + + public Date getClosedDate() { + return closedDate; + } + + public void setClosedDate(Date closedDate) { + this.closedDate = closedDate; + } + + public String getRepairSOFlag() { + return repairSOFlag; + } + + public void setRepairSOFlag(String repairSOFlag) { + this.repairSOFlag = repairSOFlag; + } + + public String getManualFlag() { + return manualFlag; + } + + public void setManualFlag(String manualFlag) { + this.manualFlag = manualFlag; + } + + public boolean isCheckedFlag() { + return checkedFlag; + } + + public void setCheckedFlag(boolean checkedFlag) { + this.checkedFlag = checkedFlag; + } + + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + public String getMergeStatusCon() { + return mergeStatusCon; + } + + public void setMergeStatusCon(String mergeStatusCon) { + this.mergeStatusCon = mergeStatusCon; + } + + public String getLaterShipFlag() { + return laterShipFlag; + } + + public void setLaterShipFlag(String laterShipFlag) { + this.laterShipFlag = laterShipFlag; + } + + public String getEarlierItemFlag() { + return earlierItemFlag; + } + + public void setEarlierItemFlag(String earlierItemFlag) { + this.earlierItemFlag = earlierItemFlag; + } + + public String getFinishPreItemFlag() { + return finishPreItemFlag; + } + + public void setFinishPreItemFlag(String finishPreItemFlag) { + this.finishPreItemFlag = finishPreItemFlag; + } + + public String getPreResourceInfo() { + return preResourceInfo; + } + + public void setPreResourceInfo(String preResourceInfo) { + this.preResourceInfo = preResourceInfo; + } + + public Float getPreQtyFinished() { + return preQtyFinished; + } + + public void setPreQtyFinished(Float preQtyFinished) { + this.preQtyFinished = preQtyFinished; + } + + public String getColorStyle() { + return colorStyle; + } + + public void setColorStyle(String colorStyle) { + this.colorStyle = colorStyle; + } + + public String getMatIssueFlag() { + return matIssueFlag; + } + + public void setMatIssueFlag(String matIssueFlag) { + this.matIssueFlag = matIssueFlag; + } + + public String getPlateIssueFlag() { + return plateIssueFlag; + } + + public void setPlateIssueFlag(String plateIssueFlag) { + this.plateIssueFlag = plateIssueFlag; + } + + public String getToolIssueFlag() { + return toolIssueFlag; + } + + public void setToolIssueFlag(String toolIssueFlag) { + this.toolIssueFlag = toolIssueFlag; + } +} diff --git a/src/main/java/com/spring/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/spring/modules/schedule/data/SearchScheduleData.java new file mode 100644 index 0000000..2b60d86 --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/data/SearchScheduleData.java @@ -0,0 +1,1130 @@ +package com.spring.modules.schedule.data; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.spring.modules.report.data.BaseData; +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") + private Date scheduleDate; + @DateTimeFormat(pattern = "HH:mm") + @JsonFormat(pattern = "HH:mm") + @JSONField(format = "HH:mm") + private Date scheduleTime;//排产的时分秒 + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date enterTime1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date enterTime2; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date needTime1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date needTime2; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planStartTime1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planStartTime2; + private String calendarId; + private String username; + private String scheduledFlag; + private String closedFlag;//是否关闭 Y 是 N 否 + private String rollNo;//当前上机卷的数据 + private String referenceCustomerId;//关联客户编码 + private String finishedFlag; + private String keyRMFlag; + private String histType; + private String switchKey;//管控动态的SQL语句 + private String currentTime;//当前的年月日 时分秒 + private String currentDate;//当前的年月日 + private String functionName;//当前的年月日 + private String operatorId;//操作员的账号 + private String operatorName;//操作员名称 + private boolean searchFlag;//是否查询 + private String rmRollNo;//材料卷号 + private String rmPartNo;//材料料号 + private Integer bomItemNo;//上机的行号 + private Integer histSeqNo;//需要换料的行号 + private String downTimeCode;//停机代码 + private String reportDate;//报告的年月日 + private String reportTime;//报告的时分 + private Float totalTime;//报告的时间 + private String defectCode;//不良代码 + private Float defectQty;//不良的数量 + private String toolInstanceId;//工具实例的编码 + private String shiftNo;//班次信息 + private String shiftDesc;//班次信息 + private Float approvedQty;//良品的总数量 + private String reportedTime;//组合好的日期 + private String oriToolInstanceId;//原工具实例的编码 + private Float consumeQty;//使用的数量 + private Float downTimeQty;//停机的时长 + private Float sfdcReportedQty;//报告数量 + private Float totalQty;//总数量 + private Float otherRollQty;//其他卷的数量 + private Float editNewRollQty; // 未生产的下机拆卷 + private Float sfdcApprovedQty;//合格数量 + private Float defectedQty;//不良的数量 + private Float sfdcSetupTime;//调机时间 + private Float sfdcProdTime;//生产时间 + private Float sfdcDownTime;//停机时间 + private String eventTime;//开工时间 + private String tillTime;//完工时间 + private String scheduledDate;//排产时间 + private String remark;//备注 + private Float sfdcSetupDownTime;//调机停机 + private Float sfdcProdSetupTime;//生产调机 + private Float sfdcManufactureTime;//制造时间 + private String exceptionFlag;//异常标记 + private String exceptionReason;//异常的原因 + private String showNoFinishedTimeFlag;//显示时间 + private String showNoFinishedToolFlag;//显示工具 + private String showNoFinishedMaterialFlag;//显示材料 + private String autoTool;//是否自动处理工具 + private Float transQty;//交易的数量 + private String oriRollNo;//原始卷号 + private String newRollNo;//新切换的卷号 + private Float newRollQty;//新卷的数量 + private Float rollQty;//当前卷的良品数量 + private Integer rollNums;//当前卷的数量 + private boolean newRollFlag;//是否是新卷 + private String specifiedTime;//是否制定排产的时间 + private Float scheduledQty;//排产的数量 + private Integer waitTimes;//等待时间 + private boolean currentRollFlag;//是否按照当前卷来查询 + private String createNewRollFlag;//是否创建当前新卷 + private Integer scheduleSeqNo;//排产页面的序号 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date planStartTime;//排产页面开始时间 + private String fulledItemFlag;//满足的工序 + private String preScheduledFlag;//前道已排 + // fqc(其它报工) , 切换卷参数 + private String repairOrderFlag; + private String checkMultipleRoll; // 切换卷参数 + private String directPass; + private String sFQCSlitFlag; // 分卷参数 + private Double newCreateRollQty; // 异常下级卷数量 + private String userSpecialSecurityNo; // 特殊权限编号 + private Date closedDate; // 关闭事件 + private String parkFlag; // 暂停状态 + private String virtualFlag;//虚拟排产标记 + private boolean checkFlag; //是否检查 + private String costRollUpFlag; // 生产已排产 状态 + private String orderChangeStatus; // 生产已排产 描述 + private String manualFlag; // 刀模已发 状态 + private String repairSOFlag; // 印版已发状态 + private Double qtytoSchedule; // 排产数量 + private Double timeRequired; // 预计重检时长 + private String directRepackageflag; // 是否是换包装 + private String sortField;//排序规则 + //2022-04-11 分切订单的参数 + private String partDesc;//物料描述 + private String customerId;//客户编码 + private String fgPartNo;//产品编码 + private String supplierId;//供应商编码 + private String splitType;//分切的类型 + private String transType;//临时表的交易类型 + private String oriPartNo;//原物料编码 + private String status;//状态 + private String userDisplay;//用户的名称 + private String matIssueFlag;//排料标记 + private String plateIssueFlag;//网版已发 + private String toolIssueFlag;//刀模已发 + private String exportFlag;//导出的标记 + + private int rollCount; + + private Float lotSize;//具体对应的字段 2022-08-17 + + private Integer moveScheduleSeqNo; // 移动到的派工单位置 + + public String getDirectRepackageflag() { + return directRepackageflag; + } + + public Integer getMoveScheduleSeqNo() { + return moveScheduleSeqNo; + } + + public void setMoveScheduleSeqNo(Integer moveScheduleSeqNo) { + this.moveScheduleSeqNo = moveScheduleSeqNo; + } + + public int getRollCount() { + return rollCount; + } + + public void setRollCount(int rollCount) { + this.rollCount = rollCount; + } + + public String isDirectRepackageflag() { + return directRepackageflag; + } + + public void setDirectRepackageflag(String directRepackageflag) { + this.directRepackageflag = directRepackageflag; + } + + public Double getTimeRequired() { + return timeRequired; + } + + public void setTimeRequired(Double timeRequired) { + this.timeRequired = timeRequired; + } + + public Double getQtytoSchedule() { + return qtytoSchedule; + } + + public void setQtytoSchedule(Double qtytoSchedule) { + this.qtytoSchedule = qtytoSchedule; + } + + public String getRepairSOFlag() { + return repairSOFlag; + } + + public void setRepairSOFlag(String repairSOFlag) { + this.repairSOFlag = repairSOFlag; + } + + public String getManualFlag() { + return manualFlag; + } + + public void setManualFlag(String manualFlag) { + this.manualFlag = manualFlag; + } + + public String getOrderChangeStatus() { + return orderChangeStatus; + } + + public void setOrderChangeStatus(String orderChangeStatus) { + this.orderChangeStatus = orderChangeStatus; + } + + public String getCostRollUpFlag() { + return costRollUpFlag; + } + + public void setCostRollUpFlag(String costRollUpFlag) { + this.costRollUpFlag = costRollUpFlag; + } + + public String getParkFlag() { + return parkFlag; + } + + public void setParkFlag(String parkFlag) { + this.parkFlag = parkFlag; + } + + public Date getClosedDate() { + return closedDate; + } + + public void setClosedDate(Date closedDate) { + this.closedDate = closedDate; + } + + public String getUserSpecialSecurityNo() { + return userSpecialSecurityNo; + } + + public void setUserSpecialSecurityNo(String userSpecialSecurityNo) { + this.userSpecialSecurityNo = userSpecialSecurityNo; + } + + public Double getNewCreateRollQty() { + return newCreateRollQty; + } + + public void setNewCreateRollQty(Double newCreateRollQty) { + this.newCreateRollQty = newCreateRollQty; + } + + public String getsFQCSlitFlag() { + return sFQCSlitFlag; + } + + public void setsFQCSlitFlag(String sFQCSlitFlag) { + this.sFQCSlitFlag = sFQCSlitFlag; + } + + public String getRepairOrderFlag() { + return repairOrderFlag; + } + + public void setRepairOrderFlag(String repairOrderFlag) { + this.repairOrderFlag = repairOrderFlag; + } + + public String getCheckMultipleRoll() { + return checkMultipleRoll; + } + + public void setCheckMultipleRoll(String checkMultipleRoll) { + this.checkMultipleRoll = checkMultipleRoll; + } + + public String getDirectPass() { + return directPass; + } + + public void setDirectPass(String directPass) { + this.directPass = directPass; + } + + 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; + } + + 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; + } + + public String getCurrentTime() { + return currentTime; + } + + public void setCurrentTime(String currentTime) { + this.currentTime = currentTime; + } + + public String getCurrentDate() { + return currentDate; + } + + public void setCurrentDate(String currentDate) { + this.currentDate = currentDate; + } + + public String getFunctionName() { + return functionName; + } + + public void setFunctionName(String functionName) { + this.functionName = functionName; + } + + public String getOperatorId() { + return operatorId; + } + + public void setOperatorId(String operatorId) { + this.operatorId = operatorId; + } + + public boolean isSearchFlag() { + return searchFlag; + } + + public void setSearchFlag(boolean searchFlag) { + this.searchFlag = searchFlag; + } + + public String getRmRollNo() { + return rmRollNo; + } + + public void setRmRollNo(String rmRollNo) { + this.rmRollNo = rmRollNo; + } + + public String getRmPartNo() { + return rmPartNo; + } + + public void setRmPartNo(String rmPartNo) { + this.rmPartNo = rmPartNo; + } + + public Integer getBomItemNo() { + return bomItemNo; + } + + public void setBomItemNo(Integer bomItemNo) { + this.bomItemNo = bomItemNo; + } + + public Integer getHistSeqNo() { + return histSeqNo; + } + + public void setHistSeqNo(Integer histSeqNo) { + this.histSeqNo = histSeqNo; + } + + public String getDownTimeCode() { + return downTimeCode; + } + + public void setDownTimeCode(String downTimeCode) { + this.downTimeCode = downTimeCode; + } + + public String getReportDate() { + return reportDate; + } + + public void setReportDate(String reportDate) { + this.reportDate = reportDate; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getReportedTime() { + return reportedTime; + } + + public void setReportedTime(String reportedTime) { + this.reportedTime = reportedTime; + } + + public Float getTotalTime() { + return totalTime; + } + + public void setTotalTime(Float totalTime) { + this.totalTime = totalTime; + } + + public String getDefectCode() { + return defectCode; + } + + public void setDefectCode(String defectCode) { + this.defectCode = defectCode; + } + + public Float getDefectQty() { + return defectQty; + } + + public void setDefectQty(Float defectQty) { + this.defectQty = defectQty; + } + + public String getToolInstanceId() { + return toolInstanceId; + } + + public void setToolInstanceId(String toolInstanceId) { + this.toolInstanceId = toolInstanceId; + } + + public String getShiftNo() { + return shiftNo; + } + + public void setShiftNo(String shiftNo) { + this.shiftNo = shiftNo; + } + + public String getShiftDesc() { + return shiftDesc; + } + + public void setShiftDesc(String shiftDesc) { + this.shiftDesc = shiftDesc; + } + + public Float getApprovedQty() { + return approvedQty; + } + + public void setApprovedQty(Float approvedQty) { + this.approvedQty = approvedQty; + } + + public String getOriToolInstanceId() { + return oriToolInstanceId; + } + + public void setOriToolInstanceId(String oriToolInstanceId) { + this.oriToolInstanceId = oriToolInstanceId; + } + + public Float getConsumeQty() { + return consumeQty; + } + + public void setConsumeQty(Float consumeQty) { + this.consumeQty = consumeQty; + } + + public Float getDownTimeQty() { + return downTimeQty; + } + + public void setDownTimeQty(Float downTimeQty) { + this.downTimeQty = downTimeQty; + } + + public Float getSfdcReportedQty() { + return sfdcReportedQty; + } + + public void setSfdcReportedQty(Float sfdcReportedQty) { + this.sfdcReportedQty = sfdcReportedQty; + } + + public Float getTotalQty() { + return totalQty; + } + + public void setTotalQty(Float totalQty) { + this.totalQty = totalQty; + } + + public Float getOtherRollQty() { + return otherRollQty; + } + + public void setOtherRollQty(Float otherRollQty) { + this.otherRollQty = otherRollQty; + } + + public Float getEditNewRollQty() { + return editNewRollQty; + } + + public void setEditNewRollQty(Float editNewRollQty) { + this.editNewRollQty = editNewRollQty; + } + + public Float getSfdcApprovedQty() { + return sfdcApprovedQty; + } + + public void setSfdcApprovedQty(Float sfdcApprovedQty) { + this.sfdcApprovedQty = sfdcApprovedQty; + } + + public Float getDefectedQty() { + return defectedQty; + } + + public void setDefectedQty(Float defectedQty) { + this.defectedQty = defectedQty; + } + + public Float getSfdcSetupTime() { + return sfdcSetupTime; + } + + public void setSfdcSetupTime(Float sfdcSetupTime) { + this.sfdcSetupTime = sfdcSetupTime; + } + + public Float getSfdcProdTime() { + return sfdcProdTime; + } + + public void setSfdcProdTime(Float sfdcProdTime) { + this.sfdcProdTime = sfdcProdTime; + } + + public Float getSfdcDownTime() { + return sfdcDownTime; + } + + public void setSfdcDownTime(Float sfdcDownTime) { + this.sfdcDownTime = sfdcDownTime; + } + + public String getEventTime() { + return eventTime; + } + + public void setEventTime(String eventTime) { + this.eventTime = eventTime; + } + + public String getTillTime() { + return tillTime; + } + + public void setTillTime(String tillTime) { + this.tillTime = tillTime; + } + + public String getScheduledDate() { + return scheduledDate; + } + + public void setScheduledDate(String scheduledDate) { + this.scheduledDate = scheduledDate; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Float getSfdcSetupDownTime() { + return sfdcSetupDownTime; + } + + public void setSfdcSetupDownTime(Float sfdcSetupDownTime) { + this.sfdcSetupDownTime = sfdcSetupDownTime; + } + + public Float getSfdcProdSetupTime() { + return sfdcProdSetupTime; + } + + public void setSfdcProdSetupTime(Float sfdcProdSetupTime) { + this.sfdcProdSetupTime = sfdcProdSetupTime; + } + + public Float getSfdcManufactureTime() { + return sfdcManufactureTime; + } + + public void setSfdcManufactureTime(Float sfdcManufactureTime) { + this.sfdcManufactureTime = sfdcManufactureTime; + } + + public String getExceptionFlag() { + return exceptionFlag; + } + + public void setExceptionFlag(String exceptionFlag) { + this.exceptionFlag = exceptionFlag; + } + + public String getExceptionReason() { + return exceptionReason; + } + + public void setExceptionReason(String exceptionReason) { + this.exceptionReason = exceptionReason; + } + + public String getShowNoFinishedTimeFlag() { + return showNoFinishedTimeFlag; + } + + public void setShowNoFinishedTimeFlag(String showNoFinishedTimeFlag) { + this.showNoFinishedTimeFlag = showNoFinishedTimeFlag; + } + + public String getShowNoFinishedToolFlag() { + return showNoFinishedToolFlag; + } + + public void setShowNoFinishedToolFlag(String showNoFinishedToolFlag) { + this.showNoFinishedToolFlag = showNoFinishedToolFlag; + } + + public String getShowNoFinishedMaterialFlag() { + return showNoFinishedMaterialFlag; + } + + public void setShowNoFinishedMaterialFlag(String showNoFinishedMaterialFlag) { + this.showNoFinishedMaterialFlag = showNoFinishedMaterialFlag; + } + + public String getAutoTool() { + return autoTool; + } + + public void setAutoTool(String autoTool) { + this.autoTool = autoTool; + } + + public Float getTransQty() { + return transQty; + } + + public void setTransQty(Float transQty) { + this.transQty = transQty; + } + + public String getOriRollNo() { + return oriRollNo; + } + + public void setOriRollNo(String oriRollNo) { + this.oriRollNo = oriRollNo; + } + + public String getNewRollNo() { + return newRollNo; + } + + public void setNewRollNo(String newRollNo) { + this.newRollNo = newRollNo; + } + + public Float getRollQty() { + return rollQty; + } + + public void setRollQty(Float rollQty) { + this.rollQty = rollQty; + } + + public Integer getRollNums() { + return rollNums; + } + + public void setRollNums(Integer rollNums) { + this.rollNums = rollNums; + } + + public Float getNewRollQty() { + return newRollQty; + } + + public void setNewRollQty(Float newRollQty) { + this.newRollQty = newRollQty; + } + + public boolean isNewRollFlag() { + return newRollFlag; + } + + public void setNewRollFlag(boolean newRollFlag) { + this.newRollFlag = newRollFlag; + } + + public String getOperatorName() { + return operatorName; + } + + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; + } + + public Date getScheduleTime() { + return scheduleTime; + } + + public void setScheduleTime(Date scheduleTime) { + this.scheduleTime = scheduleTime; + } + + public String getSpecifiedTime() { + return specifiedTime; + } + + public void setSpecifiedTime(String specifiedTime) { + this.specifiedTime = specifiedTime; + } + + public Float getScheduledQty() { + return scheduledQty; + } + + public void setScheduledQty(Float scheduledQty) { + this.scheduledQty = scheduledQty; + } + + public Integer getWaitTimes() { + return waitTimes; + } + + public void setWaitTimes(Integer waitTimes) { + this.waitTimes = waitTimes; + } + + public boolean isCurrentRollFlag() { + return currentRollFlag; + } + + public void setCurrentRollFlag(boolean currentRollFlag) { + this.currentRollFlag = currentRollFlag; + } + + public String getCreateNewRollFlag() { + return createNewRollFlag; + } + + public void setCreateNewRollFlag(String createNewRollFlag) { + this.createNewRollFlag = createNewRollFlag; + } + + public Integer getScheduleSeqNo() { + return scheduleSeqNo; + } + + public void setScheduleSeqNo(Integer scheduleSeqNo) { + this.scheduleSeqNo = scheduleSeqNo; + } + + public Date getPlanStartTime() { + return planStartTime; + } + + public void setPlanStartTime(Date planStartTime) { + this.planStartTime = planStartTime; + } + + public String getFulledItemFlag() { + return fulledItemFlag; + } + + public void setFulledItemFlag(String fulledItemFlag) { + this.fulledItemFlag = fulledItemFlag; + } + + public String getPreScheduledFlag() { + return preScheduledFlag; + } + + public void setPreScheduledFlag(String preScheduledFlag) { + this.preScheduledFlag = preScheduledFlag; + } + + public String getVirtualFlag() { + return virtualFlag; + } + + public void setVirtualFlag(String virtualFlag) { + this.virtualFlag = virtualFlag; + } + + public boolean isCheckFlag() { + return checkFlag; + } + + public void setCheckFlag(boolean checkFlag) { + this.checkFlag = checkFlag; + } + + public String getSortField() { + return sortField; + } + + public void setSortField(String sortField) { + this.sortField = sortField; + } + + public String getPartDesc() { + return partDesc; + } + + public void setPartDesc(String partDesc) { + this.partDesc = partDesc; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getFgPartNo() { + return fgPartNo; + } + + public void setFgPartNo(String fgPartNo) { + this.fgPartNo = fgPartNo; + } + + public String getSupplierId() { + return supplierId; + } + + public void setSupplierId(String supplierId) { + this.supplierId = supplierId; + } + + public String getSplitType() { + return splitType; + } + + public void setSplitType(String splitType) { + this.splitType = splitType; + } + + public String getTransType() { + return transType; + } + + public void setTransType(String transType) { + this.transType = transType; + } + + public String getOriPartNo() { + return oriPartNo; + } + + public void setOriPartNo(String oriPartNo) { + this.oriPartNo = oriPartNo; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUserDisplay() { + return userDisplay; + } + + public void setUserDisplay(String userDisplay) { + this.userDisplay = userDisplay; + } + + public String getMatIssueFlag() { + return matIssueFlag; + } + + public void setMatIssueFlag(String matIssueFlag) { + this.matIssueFlag = matIssueFlag; + } + + public String getPlateIssueFlag() { + return plateIssueFlag; + } + + public void setPlateIssueFlag(String plateIssueFlag) { + this.plateIssueFlag = plateIssueFlag; + } + + public String getToolIssueFlag() { + return toolIssueFlag; + } + + public void setToolIssueFlag(String toolIssueFlag) { + this.toolIssueFlag = toolIssueFlag; + } + + public Float getLotSize() { + return lotSize; + } + + public void setLotSize(Float lotSize) { + this.lotSize = lotSize; + } + + public String getExportFlag() { + return exportFlag; + } + + public void setExportFlag(String exportFlag) { + this.exportFlag = exportFlag; + } +} \ No newline at end of file diff --git a/src/main/java/com/spring/modules/schedule/data/SfdcRollOpsData.java b/src/main/java/com/spring/modules/schedule/data/SfdcRollOpsData.java new file mode 100644 index 0000000..467c3f9 --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/data/SfdcRollOpsData.java @@ -0,0 +1,257 @@ +package com.spring.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: SfdcRollOpsData + * 上机卷信息 + * @Date 2021/11/9 15:50 + */ +@Alias("SfdcRollOpsData") +public class SfdcRollOpsData extends BaseRollData { + private String scanedBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date scanedDate; + private String startProdFlag; + private String firstSetupBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date firstSetupDate; + private String latestSetupBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date latestSetupDate; + private String firstEndSetupBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date firstEndSetupDate; + private String latestEndSetupBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date latestEndSetupDate; + private String firstProdBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date firstProdDate; + private String latestProdBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date latestProdDate; + private String firstEndProdBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date firstEndProdDate; + private String latestEndProdBy; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date latestEndProdDate; + private String pauseFlag; + private Float qtyReported; + private Float qtyDefected; + private String reportedFlag; + + public SfdcRollOpsData() { + } + + //单纯插入数据 + public SfdcRollOpsData(String scanedBy, Date scanedDate, String startProdFlag, String pauseFlag, Float qtyReported, Float qtyDefected, String reportedFlag) { + this.scanedBy = scanedBy; + this.scanedDate = scanedDate; + this.startProdFlag = startProdFlag; + this.pauseFlag = pauseFlag; + this.qtyReported = qtyReported; + this.qtyDefected = qtyDefected; + this.reportedFlag = reportedFlag; + } + + public String getScanedBy() { + return scanedBy; + } + + public void setScanedBy(String scanedBy) { + this.scanedBy = scanedBy; + } + + public Date getScanedDate() { + return scanedDate; + } + + public void setScanedDate(Date scanedDate) { + this.scanedDate = scanedDate; + } + + public String getStartProdFlag() { + return startProdFlag; + } + + public void setStartProdFlag(String startProdFlag) { + this.startProdFlag = startProdFlag; + } + + public String getFirstSetupBy() { + return firstSetupBy; + } + + public void setFirstSetupBy(String firstSetupBy) { + this.firstSetupBy = firstSetupBy; + } + + public Date getFirstSetupDate() { + return firstSetupDate; + } + + public void setFirstSetupDate(Date firstSetupDate) { + this.firstSetupDate = firstSetupDate; + } + + public String getLatestSetupBy() { + return latestSetupBy; + } + + public void setLatestSetupBy(String latestSetupBy) { + this.latestSetupBy = latestSetupBy; + } + + public Date getLatestSetupDate() { + return latestSetupDate; + } + + public void setLatestSetupDate(Date latestSetupDate) { + this.latestSetupDate = latestSetupDate; + } + + public String getFirstEndSetupBy() { + return firstEndSetupBy; + } + + public void setFirstEndSetupBy(String firstEndSetupBy) { + this.firstEndSetupBy = firstEndSetupBy; + } + + public Date getFirstEndSetupDate() { + return firstEndSetupDate; + } + + public void setFirstEndSetupDate(Date firstEndSetupDate) { + this.firstEndSetupDate = firstEndSetupDate; + } + + public String getLatestEndSetupBy() { + return latestEndSetupBy; + } + + public void setLatestEndSetupBy(String latestEndSetupBy) { + this.latestEndSetupBy = latestEndSetupBy; + } + + public Date getLatestEndSetupDate() { + return latestEndSetupDate; + } + + public void setLatestEndSetupDate(Date latestEndSetupDate) { + this.latestEndSetupDate = latestEndSetupDate; + } + + public String getFirstProdBy() { + return firstProdBy; + } + + public void setFirstProdBy(String firstProdBy) { + this.firstProdBy = firstProdBy; + } + + public Date getFirstProdDate() { + return firstProdDate; + } + + public void setFirstProdDate(Date firstProdDate) { + this.firstProdDate = firstProdDate; + } + + public String getLatestProdBy() { + return latestProdBy; + } + + public void setLatestProdBy(String latestProdBy) { + this.latestProdBy = latestProdBy; + } + + public Date getLatestProdDate() { + return latestProdDate; + } + + public void setLatestProdDate(Date latestProdDate) { + this.latestProdDate = latestProdDate; + } + + public String getFirstEndProdBy() { + return firstEndProdBy; + } + + public void setFirstEndProdBy(String firstEndProdBy) { + this.firstEndProdBy = firstEndProdBy; + } + + public Date getFirstEndProdDate() { + return firstEndProdDate; + } + + public void setFirstEndProdDate(Date firstEndProdDate) { + this.firstEndProdDate = firstEndProdDate; + } + + public String getLatestEndProdBy() { + return latestEndProdBy; + } + + public void setLatestEndProdBy(String latestEndProdBy) { + this.latestEndProdBy = latestEndProdBy; + } + + public Date getLatestEndProdDate() { + return latestEndProdDate; + } + + public void setLatestEndProdDate(Date latestEndProdDate) { + this.latestEndProdDate = latestEndProdDate; + } + + public String getPauseFlag() { + return pauseFlag; + } + + public void setPauseFlag(String pauseFlag) { + this.pauseFlag = pauseFlag; + } + + public Float getQtyReported() { + return qtyReported; + } + + public void setQtyReported(Float qtyReported) { + this.qtyReported = qtyReported; + } + + public Float getQtyDefected() { + return qtyDefected; + } + + public void setQtyDefected(Float qtyDefected) { + this.qtyDefected = qtyDefected; + } + + public String getReportedFlag() { + return reportedFlag; + } + + public void setReportedFlag(String reportedFlag) { + this.reportedFlag = reportedFlag; + } + +} diff --git a/src/main/java/com/spring/modules/schedule/mapper/ProcedureMapper.java b/src/main/java/com/spring/modules/schedule/mapper/ProcedureMapper.java new file mode 100644 index 0000000..b1a3606 --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/mapper/ProcedureMapper.java @@ -0,0 +1,48 @@ +package com.spring.modules.schedule.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** +* +* @ClassName: ProcedureDao +* @Description: 存储过程专用dao +* @author lirui +* @date 2019年5月11日 +* +*/ +@Mapper +@Repository +public interface ProcedureMapper { + + /** + * + * @Title: getProcedureData + * @Description: 存储过程的通用方法 + * @param procedureName + * @param params + * @return 参数 + * @return List> 返回类型 + * @author LR + * @throws + */ + List> getProcedureData(@Param("procedureName")String procedureName, @Param("params")List params); + + /** + * + * @Title: execProduceData + * @Description: 执行没有返回数据的存储过程 + * @author LR + * @date 2020年3月9日 + * @param @param procedureName + * @param @param params 参数 + * @return void 返回类型 + * @throws + */ + void execProduceData(@Param("procedureName")String procedureName, @Param("params")List params); + +} \ No newline at end of file diff --git a/src/main/java/com/spring/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/spring/modules/schedule/mapper/ScheduleMapper.java new file mode 100644 index 0000000..1c199f0 --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/mapper/ScheduleMapper.java @@ -0,0 +1,57 @@ +package com.spring.modules.schedule.mapper; + +import com.spring.modules.schedule.data.BaseRollData; +import com.spring.modules.schedule.data.ScheduleData; +import com.spring.modules.schedule.data.SearchScheduleData; +import com.spring.modules.schedule.data.SfdcRollOpsData; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * @author LR + * @Title: ScheduleMapper + * 生产订单排产dao + * @Date 2021/10/20 11:20 + */ +@Mapper +@Repository +public interface ScheduleMapper { + + /** + * TODO 查询派工单的数据 + * @author LR + * @date 2021/10/25 16:09 + * @param inData + **/ + List getProduceScheduleData(SearchScheduleData inData); + + /** + * TODO 按照派工单号查询派工单的数据 + * @author LR + * @date 2021/11/8 14:25 + * @param seqNo + * @return com.gaotao.modules.schedule.data.ScheduleData + **/ + ScheduleData getScheduleDataBySeqNo(String seqNo); + + /** + * TODO 获取当前的上机卷信息 + * @author LR + * @date 2021/11/9 16:04 + * @param inData + **/ + SfdcRollOpsData getCurrentRollOpsBySeqNo(BaseRollData inData); + + /** + * TODO 获取上机卷记录按照条件查询 + * @author LR + * @date 2021/11/9 16:28 + * @param inData + **/ + List getSfdcRollOpsByCon(SearchScheduleData inData); + +} diff --git a/src/main/java/com/spring/modules/schedule/service/ScheduleService.java b/src/main/java/com/spring/modules/schedule/service/ScheduleService.java new file mode 100644 index 0000000..c224dd3 --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/service/ScheduleService.java @@ -0,0 +1,56 @@ +package com.spring.modules.schedule.service; + +import com.spring.modules.schedule.data.BaseRollData; +import com.spring.modules.schedule.data.ScheduleData; +import com.spring.modules.schedule.data.SearchScheduleData; +import com.spring.modules.schedule.data.SfdcRollOpsData; + +import java.text.ParseException; +import java.util.List; +import java.util.Map; + +/** + * @author LR + * @Title: ScheduleService + * 生产订单排产 + * @Date 2021/10/21 11:26 + */ +public interface ScheduleService { + + /** + * @description: 查询派工单 + * @author LR + * @date 2024/6/6 9:18 + * @version 1.0 + */ + List getProduceScheduleData(SearchScheduleData inData); + + /** + * TODO 按照派工单号查询派工单的数据 + * + * @param seqNo + * @return com.gaotao.modules.schedule.data.ScheduleData + * @author LR + * @date 2021/11/8 14:24 + **/ + ScheduleData getScheduleDataBySeqNo(String seqNo); + + /** + * TODO 获取当前的上机卷信息 + * @author LR + * @date 2021/11/9 16:04 + * @param inData + * @return com.gaotao.modules.schedule.data.SfdcRollOpsData + **/ + SfdcRollOpsData getCurrentRollOpsBySeqNo(BaseRollData inData); + + /** + * TODO 查询上机卷的记录数据 + * + * @param inData + * @return java.util.List + * @author LR + * @date 2021/11/9 16:25 + **/ + List getSfdcRollOpsByCon(SearchScheduleData inData); +} \ No newline at end of file diff --git a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java new file mode 100644 index 0000000..9205a67 --- /dev/null +++ b/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -0,0 +1,54 @@ +package com.spring.modules.schedule.service.impl; + +import com.spring.modules.schedule.data.BaseRollData; +import com.spring.modules.schedule.data.ScheduleData; +import com.spring.modules.schedule.data.SearchScheduleData; +import com.spring.modules.schedule.data.SfdcRollOpsData; +import com.spring.modules.schedule.mapper.ScheduleMapper; +import com.spring.modules.schedule.service.ScheduleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ScheduleServiceImpl implements ScheduleService { + + @Autowired + private ScheduleMapper scheduleMapper; + + @Override + public List getProduceScheduleData(SearchScheduleData inData) { + //查询参数 默认是否查询 + boolean searchFlag = inData.isSearchFlag(); + if(searchFlag){ + return scheduleMapper.getProduceScheduleData(inData); + } + return null; + } + @Override + public ScheduleData getScheduleDataBySeqNo(String seqNo) { + return scheduleMapper.getScheduleDataBySeqNo(seqNo); + } + + @Override + public SfdcRollOpsData getCurrentRollOpsBySeqNo(BaseRollData inData) { + SfdcRollOpsData resultRow = scheduleMapper.getCurrentRollOpsBySeqNo(inData); + //判断是否查询到结果 + if (null == resultRow) { + resultRow = new SfdcRollOpsData(); + resultRow.setRollNo("暂无卷号"); + } + return resultRow; + } + + @Override + public List getSfdcRollOpsByCon(SearchScheduleData inData) { + //判断是否查询当前卷的 + boolean currentRollFlag = inData.isCurrentRollFlag(); + if (!currentRollFlag) { + inData.setRollNo(null); + } + return scheduleMapper.getSfdcRollOpsByCon(inData); + } +} diff --git a/src/main/resources/mapper/schedule/ProcedureMapper.xml b/src/main/resources/mapper/schedule/ProcedureMapper.xml new file mode 100644 index 0000000..b71c8f6 --- /dev/null +++ b/src/main/resources/mapper/schedule/ProcedureMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml new file mode 100644 index 0000000..415e4cb --- /dev/null +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + \ No newline at end of file