From 423115831237f0f4e9b6d937dc3173f5d3af46e8 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 21 Nov 2022 18:17:06 +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/DailyPlanInData.java | 18 +++++++++++++++ .../entity/SOScheduledRoutingOutData.java | 19 ++++++++++++++- .../entity/SOTaskOrderHeaderData.java | 19 +++++++++++++++ .../production/entity/ShopOrderData.java | 11 +++++++++ .../entity/ShopOrderRoutingData.java | 23 ++++++++++++++++++- .../mapper/production/DailyPlanMapper.xml | 16 +++++++++---- .../production/SOTaskOrderHeaderMapper.xml | 3 ++- 7 files changed, 101 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/heai/modules/production/entity/DailyPlanInData.java b/src/main/java/com/heai/modules/production/entity/DailyPlanInData.java index 1fcac2c..9746bf5 100644 --- a/src/main/java/com/heai/modules/production/entity/DailyPlanInData.java +++ b/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; + } } diff --git a/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java b/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java index 278c830..3cf392d 100644 --- a/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java +++ b/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; + } } 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 ea22334..f78ebb8 100644 --- a/src/main/java/com/heai/modules/production/entity/SOTaskOrderHeaderData.java +++ b/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; + } } diff --git a/src/main/java/com/heai/modules/production/entity/ShopOrderData.java b/src/main/java/com/heai/modules/production/entity/ShopOrderData.java index 92e846e..f67a9f3 100644 --- a/src/main/java/com/heai/modules/production/entity/ShopOrderData.java +++ b/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; + } } diff --git a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java b/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java index 63e088b..dbc2f06 100644 --- a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java +++ b/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; + } + } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index d7e3e2d..50d36c0 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -8,7 +8,8 @@ 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 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