From 607614fd6563dc38c271fa70e208c8297f312a76 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 10 Sep 2024 17:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SOScheduledRoutingData.java | 10 ++++++++ .../vo/SOIssueNotifyOrderList.java | 25 ++++++++++++++++++- .../mapper/orderIssure/IssureNotifyMapper.xml | 17 +++++++++---- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOScheduledRoutingData.java b/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOScheduledRoutingData.java index b5a6c367..e10a3550 100644 --- a/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOScheduledRoutingData.java +++ b/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOScheduledRoutingData.java @@ -1,8 +1,12 @@ package com.xujie.sys.modules.orderIssure.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.xujie.sys.modules.orderIssure.vo.Soscheduledrouting; import lombok.Data; import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; @Data @Alias("SOScheduledRoutingData") @@ -15,4 +19,10 @@ public class SOScheduledRoutingData extends Soscheduledrouting { private String operatorDesc; private String userName; private String notifyNo; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endDate; } diff --git a/src/main/java/com/xujie/sys/modules/orderIssure/vo/SOIssueNotifyOrderList.java b/src/main/java/com/xujie/sys/modules/orderIssure/vo/SOIssueNotifyOrderList.java index 79060e73..659696f1 100644 --- a/src/main/java/com/xujie/sys/modules/orderIssure/vo/SOIssueNotifyOrderList.java +++ b/src/main/java/com/xujie/sys/modules/orderIssure/vo/SOIssueNotifyOrderList.java @@ -1,6 +1,10 @@ package com.xujie.sys.modules.orderIssure.vo; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; +import java.util.Date; public class SOIssueNotifyOrderList { /** @@ -47,7 +51,10 @@ public class SOIssueNotifyOrderList { * */ private String outWorkOrderFlag; - + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date needDate; + private String locationNo; public String getNotifyNo() { return notifyNo; } @@ -119,5 +126,21 @@ public class SOIssueNotifyOrderList { public void setOutWorkOrderFlag(String outWorkOrderFlag) { this.outWorkOrderFlag = outWorkOrderFlag; } + + public Date getNeedDate() { + return needDate; + } + + public void setNeedDate(Date needDate) { + this.needDate = needDate; + } + + public String getLocationNo() { + return locationNo; + } + + public void setLocationNo(String locationNo) { + this.locationNo = locationNo; + } } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 386f44db..914f3ae6 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -22,7 +22,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID) select a.site,b.ItemNo,a.item_no_mat as BOMItemNo,a.component_partno as ComponentPartNo, round(a.qty_assembly*b.IssureQty,2) qty_required , round(a.qty_issue,2) qty_issue,c.QtyToIssue,#{notifyNo} as notifyNo - ,dbo.Get_PartDesc(a.site,a.component_partno) partDesc,dbo.get_MaterialOnUse(a.site,a.order_no,a.item_no,a.component_partno) qtyOnHand + ,dbo.Get_PartDesc(a.site,a.component_partno) partDesc,Round( dbo.get_MaterialOnUse(a.site,a.order_no,a.item_no,a.component_partno),3) qtyOnHand from so_bom a left join SOIssueNotifyOrderList b on a.site=b.site and b.NotifyNo=#{notifyNo} and b.seqNo=#{seqno} left join SOIssueNotifyOrderMaterialList c on a.site=c.site and a.item_no_mat=c.BOMItemNo and c.NotifyNo=#{notifyNo} and c.itemNo=b.itemNo @@ -85,8 +91,9 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID) - insert into SOIssueNotifyOrderList(NotifyNo,Site,ItemNo,FGPartNo,SOOrderNo,OpsItemNo,SeqNo,IssureQty,OutWorkOrderFlag) - values(#{notifyNo},#{site},#{itemNo},#{fGPartNo},#{sOOrderNo},#{opsItemNo},#{seqNo},#{issureQty,jdbcType=DECIMAL},#{outWorkOrderFlag}) + insert into SOIssueNotifyOrderList(NotifyNo,Site,ItemNo,FGPartNo,SOOrderNo,OpsItemNo,SeqNo,IssureQty,OutWorkOrderFlag,LocationNo,needDate) + values(#{notifyNo},#{site},#{itemNo},#{fGPartNo},#{sOOrderNo},#{opsItemNo},#{seqNo},#{issureQty,jdbcType=DECIMAL},#{outWorkOrderFlag} + ,#{locationNo},#{needDate}) delete from SOIssueNotifyOrderMaterialList where site=#{site} and NotifyNo=#{notifyNo} and ItemNo=#{itemNo} @@ -138,7 +145,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID)