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 1b922b9..11a5131 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java @@ -18,6 +18,7 @@ public class ScheduleData extends BaseShopOrderData { private Float lotSize;// private Float qtyRequired; private Float qtyReported; + private Float qtyToReport; private Float qtyApprove; private Float qtyScrapt;// @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -88,6 +89,14 @@ public class ScheduleData extends BaseShopOrderData { private Integer rollCount; private String carrierNo; + public Float getQtyToReport() { + return qtyToReport; + } + + public void setQtyToReport(Float qtyToReport) { + this.qtyToReport = qtyToReport; + } + public String getCarrierNo() { return carrierNo; } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index c02f1e9..06e3367 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -162,32 +162,63 @@ - SELECT T.Site, T.OrderNo, @@ -107,6 +106,7 @@ P.Spec, T.QtyRequired AS LotSize, T.QtyReported, + (T.QtyRequired - T.QtyReported) as qtyToReport, D.NeedDate, S.PreItemNo, S1.OperationDesc AS PreOperationDesc,