0412更新

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

@@ -59,6 +59,8 @@ public class DailyPlanInData implements Serializable {
     private String transFerNo;
     private Integer seqNo;
     private String dispatchedHunlian;
+    private Double weightFactor;
+    private Double weight;
     public String getTransFerNo() {
         return transFerNo;
     }
@@ -314,4 +316,20 @@ public class DailyPlanInData implements Serializable {
     public void setDispatchedHunlian(String dispatchedHunlian) {
         this.dispatchedHunlian = dispatchedHunlian;
     }
+
+    public Double getWeightFactor() {
+        return weightFactor;
+    }
+
+    public void setWeightFactor(Double weightFactor) {
+        this.weightFactor = weightFactor;
+    }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
 }

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

@@ -230,7 +230,8 @@ public class SOScheduledRoutingOutData {
 
     private Integer circulationSeqNo;
     private BigDecimal circulationQty;
-
+    private Double weight;
+    private Float weightFactor;
     public String getSite() {
         return site;
     }
@@ -654,5 +655,21 @@ public class SOScheduledRoutingOutData {
     public void setCirculationDate(Date circulationDate) {
         this.circulationDate = circulationDate;
     }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    public Float getWeightFactor() {
+        return weightFactor;
+    }
+
+    public void setWeightFactor(Float weightFactor) {
+        this.weightFactor = weightFactor;
+    }
 }
 

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

@@ -164,6 +164,9 @@ public class SOTaskOrderHeaderData {
     private Date updateTime;
     private String dispatchedHunlian;
 
+    private Double weight;
+
+    private Double weightFactor;
     public String getOrderNo() {
         return orderNo;
     }
@@ -477,5 +480,21 @@ public class SOTaskOrderHeaderData {
     public void setDispatchedHunlian(String dispatchedHunlian) {
         this.dispatchedHunlian = dispatchedHunlian;
     }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    public Double getWeightFactor() {
+        return weightFactor;
+    }
+
+    public void setWeightFactor(Double weightFactor) {
+        this.weightFactor = weightFactor;
+    }
 }
 

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

@@ -266,6 +266,9 @@ public class ShopOrderData {
     private Double schedulingSize;
     private String transFerNo;
     private Integer seqNo;
+
+    private Double weight;
+
     public String getOrderNo() {
         return orderNo;
     }
@@ -681,5 +684,13 @@ public class ShopOrderData {
     public void setSeqNo(Integer seqNo) {
         this.seqNo = seqNo;
     }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
 }
 

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

@@ -1,7 +1,6 @@
 package com.heai.modules.production.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import javafx.scene.layout.BackgroundImage;
 import org.apache.ibatis.type.Alias;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -50,6 +49,8 @@ public class ShopOrderRoutingData extends ShopOrderData{
     private Date orderDate;
     private BigDecimal lastApproveQty;
     private String finishFlag;
+    private Double weight;
+    private Float weightFactor;
     public float getItemNo() {
         return itemNo;
     }
@@ -259,4 +260,24 @@ public class ShopOrderRoutingData extends ShopOrderData{
     public void setFinishFlag(String finishFlag) {
         this.finishFlag = finishFlag;
     }
+
+    @Override
+    public Double getWeight() {
+        return weight;
+    }
+
+    @Override
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    @Override
+    public Float getWeightFactor() {
+        return weightFactor;
+    }
+
+    public void setWeightFactor(Float weightFactor) {
+        this.weightFactor = weightFactor;
+    }
+
 }

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

@@ -8,7 +8,8 @@
 
     <select id="getShopOrderData" resultType="com.heai.modules.production.entity.ShopOrderData" parameterType="com.heai.modules.production.entity.DailyPlanInData">
         select  a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
-        P.PartDescription,P.Spec,ROUND(ISNULL(so.scheduling_size,0),3) as scheduling_size
+        P.PartDescription,P.Spec,ROUND(ISNULL(so.scheduling_size,0),3) as scheduling_size,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) as weightFactor,
+        Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) as weight
         FROM ShopOrder a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
         LEFT JOIN so_scheduled_list so ON a.site=so.Site AND a.OrderNo= so.order_no
@@ -84,7 +85,8 @@
                 ,A.E_Levels ,A.E_OriginalOrderType ,A.E_SeqNo ,A.E_LevelCode ,A.SFDCReportedFlag ,A.RepairSOFlag
                 ,A.ConfigurationFlag ,A.MaterialSplitFlag ,A.ObjectVersion ,A.ExpandFlag ,A.CodeNo ,A.LE_SeqNo
                 ,A.LE_ItemNo ,A.LE_Levels
-                ,B.PartDescription,dbo.Get_PartWeightFactorForReport(A.Site ,A.PartNo,A.OrderNo) as weightFactor
+                ,B.PartDescription,dbo.Get_PartWeightFactorForReport(A.Site ,A.PartNo,A.OrderNo) as weightFactor,
+                Round(dbo.Get_PartWeightFactorForReport(A.Site ,A.PartNo,A.OrderNo)*A.LotSize,2) weight
         from ShopOrder A
         left join Part B on A.site = B.site and A.PartNo = B.PartNo
         <where>
@@ -178,7 +180,8 @@
     <select id="getShopOrderRoutingData" resultType="ShopOrderRoutingData">
         select   a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
         P.PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
-        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty
+        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) weightFactor,
+        Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) weight
         FROM ShopOrder a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
         LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.orderNo
@@ -233,7 +236,8 @@
      <select id="getSOTastRoutingData" resultType="ShopOrderRoutingData">
         select   a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,
         P.PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.machSetupTime,
-        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag
+        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,ROUND(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1)*a.OrderQty,2) as weight,
+        dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1 as weightFactor
         FROM SOTaskOrderHeader a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
         LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1
@@ -344,7 +348,9 @@
         BarcodeID,Remark,Crewsize,ClosedFlag,S_ScheduledDate,S_ResourceID,S_ScheduledSeqNo,S_ShiftNo,
         S_WorkCenterNo, EnteredDate,scheduleType,operatorId,partNo,dbo.Get_PartDesc(Site,partNo) as partDesc,
         dbo.Get_OperatorDesc(Site,operatorId) as operatorName,dbo.Get_ItemDesc(site,OrderNo) as itemDesc,orderRef1 ,
-        dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_DescSpec(Site,partNo) as partSpec,circulation_seqNo,circulation_qty  from SOScheduledRouting
+        dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_DescSpec(Site,partNo) as partSpec,circulation_seqNo,circulation_qty
+        ,dbo.Get_PartWeightFactorForReport(site,PartNo,OrderNo) as weightFactor,
+        Round(dbo.Get_PartWeightFactorForReport(site,PartNo,OrderNo)*QtyRequired,2) as weight from SOScheduledRouting
         <where>
              <if test="site != null and site != ''">
                 AND site = #{site}

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

@@ -83,7 +83,8 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde
 
 <select id="getDailyPlanData" parameterType="com.heai.modules.production.entity.DailyPlanInData" resultType="com.heai.modules.production.entity.SOTaskOrderHeaderData">
     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,P.PartDescription,SOT.QtyCirculation,isnull(SOT.InputQty,0)as InputQty,SOT.ReportTime
+    SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT.ShiftId,P.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
     FROM  SOTaskOrderHeader SOT
 
     LEFT join  Part P on P.Site= SOT.Site and P.PartNo=SOT.PartNo