From b524e3c20d2b313c61317c1bcd8e68873b05bb79 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 23 Nov 2022 12:02:49 +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

---
 .../heai/modules/production/dao/DailyPlanMapper.java   |  4 ++--
 .../modules/production/entity/PartCardPrintData.java   |  9 +++++++++
 .../modules/production/entity/SOOpsTransferData.java   |  4 ++--
 src/main/resources/mapper/board/BoardMapper.xml        | 10 +++++-----
 .../resources/mapper/production/DailyPlanMapper.xml    |  5 +++--
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
index b2bc60f..70002f0 100644
--- a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
@@ -457,8 +457,8 @@ public interface DailyPlanMapper {
      */
     void closeSchedule(SOScheduledRoutingOutData inData);
     /**
-     * @Description 保存流转
-     * @Title closeSchedule
+     * @Description
+     * @Title
      * @param
      * @author rq
      * @date 2022/9/20 18:08
diff --git a/src/main/java/com/heai/modules/production/entity/PartCardPrintData.java b/src/main/java/com/heai/modules/production/entity/PartCardPrintData.java
index 4f021c3..ed5b96a 100644
--- a/src/main/java/com/heai/modules/production/entity/PartCardPrintData.java
+++ b/src/main/java/com/heai/modules/production/entity/PartCardPrintData.java
@@ -22,6 +22,7 @@ public class PartCardPrintData {
     private Float toExpireDays;
     private String userId;
     private String printerName;
+    private String weight;
     public String getSite() {
         return site;
     }
@@ -125,4 +126,12 @@ public class PartCardPrintData {
     public void setPrinterName(String printerName) {
         this.printerName = printerName;
     }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
 }
diff --git a/src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java b/src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java
index 8e8d2b0..34dd7cb 100644
--- a/src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java
+++ b/src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java
@@ -27,7 +27,7 @@ public class SOOpsTransferData {
      *
      */
     private String toProLineNo;
-
+    private String partDesc;
     /**
      *
      */
@@ -142,7 +142,7 @@ public class SOOpsTransferData {
     private String partNo;
     private Integer seqNo;
     private Float transQty;
-    private String partDesc;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index c1e5c93..2a3c2dc 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -84,11 +84,11 @@
     </select>
        <select id="transFerBoardForHunlian" resultType="TransFerBoardData" >
         SELECT a.transNo ,a.site,b.seqNo,a.TransDate,b.TransQty-b.ConfirmQty as qty ,b.OrderNo ,b.PartNo,c.PartDescription as partDesc,
-			case when s.E_Levels=0 then '产成品'  when s.E_Levels=1 then '半成品' else '混炼胶' end as type
+			 '混炼胶'  as type
         FROM SOOpsTransferHeader a LEFT JOIN SOOpsTransferDetail b on a.TransNo=b.TransNo and a.site=b.Site
                                    LEFT JOIN Part c on b.PartNo=c.PartNo and b.site=c.site
-																	 LEFT JOIN ShopOrder s on a.site=s.site and b.orderNo=s.OrderNo
-        where a.Status='已录入' and s.E_Levels=2 ORDER BY a.TransDate
+
+        where a.Status='已录入'  and ToTypeFlag='混炼胶入库' ORDER BY a.TransDate
 
     </select>
     <select id="SORoutingBoard" resultType="SORoutingData" >
@@ -148,11 +148,11 @@
 
     </select>
     <select id="getStockPrintList" resultType="com.heai.modules.production.entity.StockPrintData">
-        select b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+b.LocationId as seqNo
+        select b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+'|'+b.LocationId as seqNo,dbo.Get_Part_DescSpec(a.Site,b.PartNo) partDesc
         from print_info a left join StockPrint b on a.site=b.site and a.orderref1=b.TransNo where a.status='N' and a.orderref2='库存标签'
     </select>
   <select id="getStockPrintListHunlian" resultType="com.heai.modules.production.entity.StockPrintData">
-        select b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+b.LocationId as seqNo
+        select b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+'|'+b.LocationId as seqNo,dbo.Get_Part_DescSpec(a.Site,b.PartNo) partDesc
         from print_info a left join StockPrint b on a.site=b.site and a.orderref1=b.TransNo where a.status='N' and a.orderref2='混炼库存标签'
     </select>
      <select id="PODetailForW" resultType="POBoardData">
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 3c6d07f..9aeef3a 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -553,7 +553,7 @@
     </update>
 
     <select id="getTransData" resultType="com.heai.modules.production.entity.SOOpsTransferData">
-        select top 1 a.TransNo,a.Site,b.FromWorkCenterNo WorkCenterNo ,b.OrderNo,b.TransQty,a.TransDate,b.PartNo,b.seqNo
+        select top 1 a.TransNo,a.Site,b.FromWorkCenterNo WorkCenterNo ,b.OrderNo,b.TransQty,a.TransDate,b.PartNo,b.seqNo,dbo.Get_Part_DescSpec(a.Site,b.PartNo) partDesc
         FROM SOOpsTransferHeader a left join SOOpsTransferDetail b on a.site=b.site and a.TransNo=b.TransNo
         where a.TransNo=#{transNo} and a.Site=#{site}
     </select>
@@ -596,7 +596,8 @@
 
     <select id="getPartCardPrintData" resultType="com.heai.modules.production.entity.PartCardPrintData">
         select top 1  a.orderNo,a.partNo,c.partDescription+'/'+C.Spec as partDesc,a.QtyRequired,a.S_ScheduledDate,
-               dbo.Get_OperatorDesc(a.site,a.operatorId) OperatorName ,c.ToExpireDays,b.TechInfo,c.remark
+               dbo.Get_OperatorDesc(a.site,a.operatorId) OperatorName ,c.ToExpireDays,b.TechInfo,c.remark,Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.QtyRequired,2) as weight,
+
         from SOScheduledRouting a left join ShopOrder b on a.site=b.site and a.OrderNo=b.OrderNo
                                   left join part c on a.partNo=c.PartNo and a.site=c.site
         where a.site=#{site} and a.seqNo=#{seqNo}