From c3d79f6ed4ef0940003f3d27aeda8136c859b648 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 24 Jan 2024 17:55:46 +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

---
 .../production/entity/SOTaskOrderHeaderData.java   |  9 +++++++++
 src/main/resources/mapper/board/BoardMapper.xml    | 14 +++++++-------
 .../mapper/production/DailyPlanMapper.xml          | 10 ++++++++--
 .../mapper/production/SOTaskOrderHeaderMapper.xml  |  1 +
 .../static/js/pda/transferWarehousing2.js          |  3 ++-
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java b/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java
index f78ebb8..f14510c 100644
--- a/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java
+++ b/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java
@@ -167,6 +167,7 @@ public class SOTaskOrderHeaderData {
     private Double weight;
 
     private Double weightFactor;
+    private Double partPlanQty;
     public String getOrderNo() {
         return orderNo;
     }
@@ -496,5 +497,13 @@ public class SOTaskOrderHeaderData {
     public void setWeightFactor(Double weightFactor) {
         this.weightFactor = weightFactor;
     }
+
+    public Double getPartPlanQty() {
+        return partPlanQty;
+    }
+
+    public void setPartPlanQty(Double partPlanQty) {
+        this.partPlanQty = partPlanQty;
+    }
 }
 
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index 1e56bec..80af6ea 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -162,24 +162,24 @@
     <select id="SeqNoForLiuHua" resultType="com.heai.modules.board.entity.SORoutingBoardData" >
            SELECT a.site,a.OrderNo,a.seqNo,a.PartNo,dbo.Get_PartDesc(a.Site,a.PartNo) as PartDesc,a.QtyRequired,
         a.QtyReported,a.QtyApprove,a.S_ScheduledDate as planStartTime,dbo.Get_OperatorDesc(a.Site,a.operatorId) OperatorDesc,
-        S_ResourceID ResourceId,S_ShiftNo ShiftNo
+        a.S_ResourceID ResourceId,a.S_ShiftNo ShiftNo,a.OutWorkFlag
 				,P1.TextValue text1,Round(p2.NumValue*a.QtyRequired/1000,2) num1,P3.TextValue text2,p4.TextValue text3
-        from SOScheduledRouting a
+        from SOScheduledRouting a left join ShopOrder b on a.site=b.site and a.OrderNo=b.OrderNo
 					LEFT JOIN PartSubPropertiesValue p1 on p1.site=a.site and p1.PartNo=a.PartNo and p1.PropertiesItemNo='MATERIAL TYPE'
 						LEFT JOIN PartSubPropertiesValue p2 on p2.site=a.site and p2.PartNo=a.PartNo and p2.PropertiesItemNo='GROSS WEIGHT'
 
 						LEFT JOIN PartSubPropertiesValue p3 on p3.site=a.site and p3.PartNo=a.PartNo and p3.PropertiesItemNo='DUROA'
 						LEFT JOIN PartSubPropertiesValue p4 on p4.site=a.site and p4.PartNo=a.PartNo and p4.PropertiesItemNo='COLOR'
-						where a.ClosedFlag='N' and a.scheduleType='日计划派工单' and dbo.Get_WorkCenter_ProLineNo(a.site,a.S_WorkCenterNo)!='EXTRUSIO'
+						where a.ClosedFlag='N' and a.scheduleType='日计划派工单' and dbo.Get_WorkCenter_ProLineNo(a.site,a.S_WorkCenterNo)!='EXTRUSIO' and b.status!='已关闭' and b.status!='已取消'
         order By a.S_ScheduledDate,a.seqNo
     </select>
         <select id="SeqNoForLiuHuaJiChu" resultType="com.heai.modules.board.entity.SORoutingBoardData" >
                 SELECT a.site,a.OrderNo,a.seqNo,a.PartNo,dbo.Get_PartDesc(a.Site,a.PartNo) as PartDesc,a.QtyRequired,
         a.QtyReported,a.QtyApprove,a.S_ScheduledDate as planStartTime,dbo.Get_OperatorDesc(a.Site,a.operatorId) OperatorDesc,
-        S_ResourceID ResourceId,S_ShiftNo ShiftNo
+        a.S_ResourceID ResourceId,a.S_ShiftNo ShiftNo
 				,P1.NumValue num1,P2.NumValue num2,P3.NumValue num3,P4.NumValue num4,P5.NumValue num5,P6.NumValue num6,
-				P7.NumValue num7,P8.NumValue num8,P9.NumValue num9
-        from SOScheduledRouting a
+				P7.NumValue num7,P8.NumValue num8,P9.NumValue num9,a.OutWorkFlag
+        from SOScheduledRouting a left join ShopOrder b on a.site=b.site and a.OrderNo=b.OrderNo
 				LEFT JOIN PartSubPropertiesValue p1 on p1.site=a.site and p1.PartNo=a.PartNo and p1.CodeNo='EXTRUSION' and p1.PropertiesItemNo='CHANNEL 1'
 				LEFT JOIN PartSubPropertiesValue p2 on p2.site=a.site and p2.PartNo=a.PartNo and p2.CodeNo='EXTRUSION' and p2.PropertiesItemNo='CHANNEL 2'
 				LEFT JOIN PartSubPropertiesValue p3 on p3.site=a.site and p3.PartNo=a.PartNo and p3.CodeNo='EXTRUSION' and p3.PropertiesItemNo='CHANNEL 3'
@@ -191,7 +191,7 @@
 				LEFT JOIN PartSubPropertiesValue p8 on p8.site=a.site and p8.PartNo=a.PartNo and p8.CodeNo='EXTRUSION' and p8.PropertiesItemNo='TUNNEL SPEED'
 				LEFT JOIN PartSubPropertiesValue p9 on p9.site=a.site and p9.PartNo=a.PartNo and p9.CodeNo='EXTRUSION' and p9.PropertiesItemNo='EXTRUSION POWER'
 
-						where a.ClosedFlag='N' and a.scheduleType='日计划派工单'  and dbo.Get_WorkCenter_ProLineNo(a.site,a.S_WorkCenterNo)='EXTRUSIO'
+						where a.ClosedFlag='N' and a.scheduleType='日计划派工单'  and dbo.Get_WorkCenter_ProLineNo(a.site,a.S_WorkCenterNo)='EXTRUSIO' and b.status!='已关闭' and b.status!='已取消'
         order By a.S_ScheduledDate,a.seqNo
     </select>
     <select id="getStockPrintList" resultType="com.heai.modules.production.entity.StockPrintData">
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 82bb021..9f87e8d 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -217,13 +217,13 @@
     <select id="getAllWorkCenterDataForUser" resultType="WorkCenterData">
         select a.Site,a.WorkCenterNo,a.WorkCenterDesc,a.Active FROM WorkCenter a left join
         user_work_center b on a.Site=b.Site and a.WorkCenterNo=b.WorkCenterNo and b.userId=#{user}
-        where  b.WorkCenterNo is null
+        where  b.WorkCenterNo is null and a.Active='Y'
          order by a.WorkCenterNo ,a.site
     </select>
     <select id="getWorkCenterUserData" resultType="WorkCenterData">
         select a.Site,a.WorkCenterNo,b.WorkCenterDesc,b.Active FROM user_work_center a left join
         WorkCenter b on a.Site=b.Site and a.WorkCenterNo=b.WorkCenterNo
-        where a.userId=#{user}
+        where a.userId=#{user} and b.Active='Y'
         order by a.WorkCenterNo,a.site
     </select>
     <select id="getShopOrderRoutingData" resultType="ShopOrderRoutingData">
@@ -512,6 +512,12 @@
         </if>
           <if test="sShiftNo != null and sShiftNo != ''">
             and S_ShiftNo = #{sShiftNo}
+        </if>
+           <if test="previousSeqNo != null ">
+            and a.previousSeqNo = #{previousSeqNo}
+        </if>
+             <if test="materSeqNo != null ">
+            and a.materSeqNo = #{materSeqNo}
         </if>
         </where>
         order by S_ScheduledDate
diff --git a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
index 94b590e..6bce743 100644
--- a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
+++ b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
@@ -85,6 +85,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde
     SELECT top 10000 SOT.OrderNo,SOT.Site,SOT.Status,SOT.OrderDate,SOT.OrderQty,SOT.OrderRefType,SOT.OrderRef1, CASE WHEN SOT.CloseFlag ='N' THEN '正常' ELSE '已流转' END as CloseFlag,
     SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT.ShiftId,dbo.Get_Part_SpecDesc(SOT.Site,SOT.PartNo) PartDescription,SOT.QtyCirculation,isnull(SOT.InputQty,0)as InputQty,SOT.ReportTime
     ,Round(dbo.Get_PartWeightFactorForReport(SOT.Site,SOT.OrderNo,SOT.OrderRef1)*SOT.OrderQty,2) as weight
+    ,isnull(dbo.Get_PartPlanQty(SOT.site,SOT.PartNo,SOT.OrderRef1),0) partPlanQty
     FROM  SOTaskOrderHeader SOT
 
     LEFT join  Part P on P.Site= SOT.Site and P.PartNo=SOT.PartNo
diff --git a/src/main/resources/static/js/pda/transferWarehousing2.js b/src/main/resources/static/js/pda/transferWarehousing2.js
index 06a22e3..e047870 100644
--- a/src/main/resources/static/js/pda/transferWarehousing2.js
+++ b/src/main/resources/static/js/pda/transferWarehousing2.js
@@ -267,6 +267,7 @@ function saveProduction(){
     var batchNo = $("#batchNo").val();
     var remark = $("#remark").val();
     var printNumber = $("#printNumber").val();
+    let strSeqNo='00000'+currentData.seqNo;
     let jsonData = {
         site : currentData.site,
         orderNo : currentData.orderNo,
@@ -274,7 +275,7 @@ function saveProduction(){
         warehouseId : warehouseId,
         partnerId : "",
         partNo : currentData.partNo,
-        batchNo : currentData.orderNo+'-'+currentData.seqNo,
+        batchNo : currentData.orderNo.substring(5)+'-'+strSeqNo.substring(strSeqNo.length-5),
         locationId : locationId,
         transQty : warehouseQty,
         userId : userId,