From 22d799d251dd1095193f06694bc484b63eb13ab7 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 20 Mar 2024 14:24:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jianteng/modules/board/entity/SOSRoutingBoardData.java | 4 ++++ src/main/resources/mapper/board/BoardMapper.xml | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java b/src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java index 96bb29f..ec035a1 100644 --- a/src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java +++ b/src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java @@ -1,6 +1,8 @@ package com.jianteng.modules.board.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.jianteng.modules.Schedule.entity.SOScheduledRoutingOutData; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -12,6 +14,8 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData { private String lastSeqNoDoing; private String operationDesc; private String lastOperationDesc; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date needDate; private String productionLineDesc; diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 90a42c5..111eaf9 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -7,7 +7,8 @@ a.OutWorkFlag,a.S_ScheduledDate,a.S_ResourceID,a.S_ShiftNo,e.NeedDate, a.S_WorkCenterNo,a.mat_issueflag,a.partNo,b.QtyRequired lastRequireQty,b.QtyReported lastReportQty, dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(b.site,b.S_WorkCenterNo)) lastLineName, - a.previousSeqNo lastSeqNoDoing,c.operationDesc,d.operationDesc as lastOperationDesc,dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,sos.S_WorkCenterNo)) ProductionLineDesc + a.previousSeqNo lastSeqNoDoing,c.operationDesc,d.operationDesc as lastOperationDesc,dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,a.S_WorkCenterNo)) ProductionLineDesc + ,dbo.Get_OperatorDesc(a.Site,a.operatorId) operatorName from SOScheduledRouting a left join SOScheduledRouting b on a.Site=b.Site and a.previousSeqNo=b.SeqNo left join v_sorouting c on a.Site=c.Site and a.OrderNo=c.OrderNo and a.ItemNo=c.ItemNo left join v_sorouting d on b.Site=d.Site and b.OrderNo=d.OrderNo and b.ItemNo=d.ItemNo @@ -17,6 +18,9 @@ AND dbo.Get_WorkCenter_ProLineNo(a.Site,a.S_WorkCenterNo) in ${text2} + + AND dbo.Get_WorkCenter_ProLineNo(a.Site,a.S_WorkCenterNo) in ('CX03','CX05','CX06') + order by a.S_ScheduledDate