From 3658355def23388a05b0a38b9232dc6486cc0413 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 20 Mar 2024 11:41:14 +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 --- .../modules/board/entity/SOSRoutingBoardData.java | 12 ++++++++++++ src/main/resources/mapper/board/BoardMapper.xml | 2 +- 2 files changed, 13 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 3eae1d1..96bb29f 100644 --- a/src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java +++ b/src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java @@ -13,6 +13,8 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData { private String operationDesc; private String lastOperationDesc; private Date needDate; + private String productionLineDesc; + public String getLastLineName() { return lastLineName; } @@ -68,4 +70,14 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData { public void setNeedDate(Date needDate) { this.needDate = needDate; } + + @Override + public String getProductionLineDesc() { + return productionLineDesc; + } + + @Override + public void setProductionLineDesc(String productionLineDesc) { + this.productionLineDesc = productionLineDesc; + } } diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 85c1d9f..90a42c5 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -7,7 +7,7 @@ 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 + a.previousSeqNo lastSeqNoDoing,c.operationDesc,d.operationDesc as lastOperationDesc,dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,sos.S_WorkCenterNo)) ProductionLineDesc 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