From dbe1bfdf5b68d2ab97adbefee3429530cfa61893 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 21 Dec 2023 09:52:49 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/heai/modules/production/entity/OrderViewData.java | 3 +++ src/main/resources/mapper/production/SoScheduledListMapper.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/heai/modules/production/entity/OrderViewData.java b/src/main/java/com/heai/modules/production/entity/OrderViewData.java index 46f5004..ffcc7b4 100644 --- a/src/main/java/com/heai/modules/production/entity/OrderViewData.java +++ b/src/main/java/com/heai/modules/production/entity/OrderViewData.java @@ -21,6 +21,9 @@ public class OrderViewData { private String jianyanReport; private String baozhuangReport; private String finishedQty; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date needDate; private String lotSize; private String closedFlag; private String jiagongReport; diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml index eb47e9d..d62e494 100644 --- a/src/main/resources/mapper/production/SoScheduledListMapper.xml +++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml @@ -187,7 +187,7 @@ Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'加工'),0),3) as jiagongReport, Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'包装'),0),3) as baozhuangReport, Round(FinishedQty,3) FinishedQty , - LotSize + LotSize,NeedDate FROM ShopOrder a AND a.PartNo like 'FP%'