From 04298fbd8b89c59e11b3621b45dabe9db60bd167 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 23 Feb 2024 15:06:04 +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      | 10 ++++++++++
 .../modules/board/service/impl/BoardServiceImpl.java   |  7 +++++++
 src/main/resources/mapper/board/BoardMapper.xml        |  7 ++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

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 124c592..3eae1d1 100644
--- a/src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java
+++ b/src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java
@@ -3,6 +3,7 @@ package com.jianteng.modules.board.entity;
 import com.jianteng.modules.Schedule.entity.SOScheduledRoutingOutData;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class SOSRoutingBoardData extends SOScheduledRoutingOutData {
     private String lastLineName;
@@ -11,6 +12,7 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData {
     private String lastSeqNoDoing;
     private String operationDesc;
     private String lastOperationDesc;
+    private Date needDate;
     public String getLastLineName() {
         return lastLineName;
     }
@@ -58,4 +60,12 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData {
     public void setLastOperationDesc(String lastOperationDesc) {
         this.lastOperationDesc = lastOperationDesc;
     }
+
+    public Date getNeedDate() {
+        return needDate;
+    }
+
+    public void setNeedDate(Date needDate) {
+        this.needDate = needDate;
+    }
 }
diff --git a/src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java
index fedb586..e4c7ece 100644
--- a/src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java
+++ b/src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java
@@ -50,6 +50,13 @@ public class BoardServiceImpl implements BoardService {
 
     @Override
     public Map<String, Object> SORoutingBoard(BoardInData inData){
+        if(inData.getText1()!=null&&!"".equals(inData.getText1())){
+            if("L1".equals(inData.getText1())){
+                inData.setText2("'cx01','cx02'");
+            }else {
+                inData.setText2("'cx03','cx04'");
+            }
+        }
         List<SOSRoutingBoardData> list =boardMapper.SORoutingBoard(inData);
         double number=list.size();
         int pageIndex=inData.getNumber();
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index 39a20ce..85c1d9f 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -4,17 +4,18 @@
 <mapper namespace="com.jianteng.modules.board.dao.BoardMapper">
  <select id="SORoutingBoard" resultType="com.jianteng.modules.board.entity.SOSRoutingBoardData" >
         select a.Site,a.OrderNo,a.ItemNo,a.SeqNo,a.QtyRequired,a.QtyReported,a.QtyApprove,a.ClosedFlag,
-        a.OutWorkFlag,a.S_ScheduledDate,a.S_ResourceID,a.S_ShiftNo,
+        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
         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
+        left join ShopOrder e on a.site=e.site and a.orderNo=e.OrderNo
         <where>
         and a.ClosedFlag='N'
-          <if test="text1 != null and text1 != ''">
-                AND dbo.Get_WorkCenter_ProLineNo(a.Site,a.S_WorkCenterNo) = #{text1}
+          <if test="text2 != null and text2 != ''">
+                AND dbo.Get_WorkCenter_ProLineNo(a.Site,a.S_WorkCenterNo) in ${text2}
             </if>
         </where>
         order by a.S_ScheduledDate