From 25c0a9e9a4a9c5d00abe7a82671ce285bb3a9f2f Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 15 Oct 2025 11:22:02 +0800 Subject: [PATCH] =?UTF-8?q?2025-10-15=20=E8=BF=87=E7=AB=99=E9=87=87?= =?UTF-8?q?=E9=9B=86=E5=88=97=E8=A1=A8=E8=A1=8C=E9=A1=BA=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/schedule/data/ScheduleData.java | 9 ++ .../mapper/schedule/ScheduleMapper.xml | 117 +++++++++++++----- .../mapper/shopOrder/ShopOrderMapper.xml | 4 +- 3 files changed, 97 insertions(+), 33 deletions(-) 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,