0412更新

src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java

@@ -17,7 +17,7 @@ public class SOOpsTransferData {
      *
      */
     private String site;
-
+    private String umid;
     /**
      *
      */
@@ -412,5 +412,13 @@ public class SOOpsTransferData {
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
+
+    public String getUmid() {
+        return umid;
+    }
+
+    public void setUmid(String umid) {
+        this.umid = umid;
+    }
 }
 

src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java

@@ -30,6 +30,7 @@ public class SOScheduledRoutingOutData {
     private String orderRef1;
     private String workCenterDesc;
     private String partSpec;
+    private String umid;
     /**
      *
      */
@@ -679,5 +680,13 @@ public class SOScheduledRoutingOutData {
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public String getUmid() {
+        return umid;
+    }
+
+    public void setUmid(String umid) {
+        this.umid = umid;
+    }
 }
 

src/main/java/com/heai/modules/production/entity/StockPrintData.java

@@ -48,12 +48,12 @@ public class StockPrintData {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date transDate;
-
+    private String umid;
     /**
      *
      */
     private BigDecimal qty;
-
+    private String wareHouseDesc;
     /**
      *
      */
@@ -164,5 +164,21 @@ public class StockPrintData {
     public void setPrintQty(Integer printQty) {
         this.printQty = printQty;
     }
+
+    public String getWareHouseDesc() {
+        return wareHouseDesc;
+    }
+
+    public void setWareHouseDesc(String wareHouseDesc) {
+        this.wareHouseDesc = wareHouseDesc;
+    }
+
+    public String getUmid() {
+        return umid;
+    }
+
+    public void setUmid(String umid) {
+        this.umid = umid;
+    }
 }
 

src/main/resources/mapper/board/BoardMapper.xml

@@ -148,11 +148,13 @@
 
     </select>
     <select id="getStockPrintList" resultType="com.heai.modules.production.entity.StockPrintData">
-        select a.PrintQty,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
+        select a.PrintQty,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,dbo.Get_WareHouseDesc(b.Site,b.WareHouseId) as wareHouseDesc,dbo.Get_Part_UMID(b.Site,b.PartNo) umid
         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 a.PrintQty,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
+        select a.PrintQty,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,dbo.Get_WareHouseDesc(b.Site,b.WareHouseId) as wareHouseDesc,dbo.Get_Part_UMID(b.Site,b.PartNo) umid
         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">

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -376,7 +376,7 @@
         S_WorkCenterNo, EnteredDate,scheduleType,operatorId,partNo,dbo.Get_PartDesc(a.Site,partNo) as partDesc,
         dbo.Get_OperatorDesc(a.Site,operatorId) as operatorName,dbo.Get_ItemDesc(a.Site,OrderNo,ItemNo) as itemDesc,orderRef1 ,
         dbo.Get_WorkCenterDesc(a.Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_DescSpec(a.Site,partNo) as partSpec,circulation_seqNo,circulation_qty
-        ,dbo.Get_PartWeightFactorForReport(a.site,PartNo,OrderNo) as weightFactor,
+        ,dbo.Get_PartWeightFactorForReport(a.site,PartNo,OrderNo) as weightFactor,dbo.Get_Part_UMID(a.Site,PartNo) umid,
         Round(dbo.Get_PartWeightFactorForReport(a.site,PartNo,OrderNo)*QtyRequired,2) as weight from SOScheduledRouting a
           left join user_work_center uwc on a.site=uwc.site and a.S_WorkCenterNo =uwc.WorkCenterNo and uwc.userId=#{userId}
          <where>
@@ -436,6 +436,7 @@
     </select>
     <select id="getStockPrint" resultType="com.heai.modules.production.entity.StockPrintData">
         select TransNo,Site,WareHouseId,BatchNo,LocationId,PartNo,OrderNo,TransDate,Qty,PrintFlag,dbo.Get_PartDesc(Site,PartNo) as partDesc
+        ,dbo.Get_WareHouseDesc(Site,WareHouseId) as wareHouseDesc,dbo.Get_Part_UMID(Site,PartNo) umid
         from StockPrint
           <where>
             <if test="startDate != null ">
@@ -554,6 +555,7 @@
 
     <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,dbo.Get_Part_DescSpec(a.Site,b.PartNo) partDesc
+        ,dbo.Get_Part_UMID(a.Site,b.PartNo) umid
         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>