2025-10-15

过站采集列表行顺序调整

src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java

@@ -18,6 +18,7 @@ public class ScheduleData extends BaseShopOrderData {
     private Float lotSize;//
     private Float qtyRequired;
     private Float qtyReported;
+    private Float qtyToReport;
     private Float qtyApprove;
     private Float qtyScrapt;//
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -88,6 +89,14 @@ public class ScheduleData extends BaseShopOrderData {
     private Integer rollCount;
     private String carrierNo;
 
+    public Float getQtyToReport() {
+        return qtyToReport;
+    }
+
+    public void setQtyToReport(Float qtyToReport) {
+        this.qtyToReport = qtyToReport;
+    }
+
     public String getCarrierNo() {
         return carrierNo;
     }

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -162,32 +162,63 @@
 
     <!--按照条件查询工单的数据-->
     <select id="getOrderScheduleList" parameterType="SearchScheduleData" resultType="ScheduleData">
-        select T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, S.OperationDesc itemDesc, S.PartNo partNo,
+        select
+        T.Site site,
+        T.OrderNo orderNo,
+        T.ItemNo itemNo,
+        S.OperationDesc itemDesc,
+        S.PartNo partNo,
         P.PartDescription partDesc,
-        P.Spec spec, T.QtyRequired qtyRequired, T.QtyReported qtyReported, D.NeedDate needDate, S.PreItemNo preItemNo,
+        P.Spec spec,
+        T.QtyRequired qtyRequired,
+        T.QtyReported qtyReported,
+        (T.QtyRequired - T.QtyReported) as qtyToReport,
+        D.NeedDate needDate,
+        S.PreItemNo preItemNo,
         S1.OperationDesc preItemDesc,
-        S1.ScheduledFlag preScheduledFlag, S.NextItemNo nextItemNo, S2.OperationDesc nextItemDesc, S2.ScheduledFlag
-        nextScheduledFlag,
-        D.CustomerID customerId, dbo.Get_CustomerDesc(D.Site,D.CustomerID) customerName, D.EnterDate enterDate,
-        dbo.Get_SOOpsScheduleAvailResource(T.Site,S.OrderNo,T.S_WorkCenterNo,T.ItemNo) availResource, T.S_WorkCenterNo
-        workCenterNo,
-        S.MachRunFactor machRunFactor, S.MachSetupTime machSetupTime, S.FactorUnit factorUnit, T.ClosedFlag closedFlag,
-        E.S_ScheduledSeqNo scheduledSeqNo, T.PlanStartTime planStartTime, T.PlanFinishTime planFinishTime,
+        S1.ScheduledFlag preScheduledFlag,
+        S.NextItemNo nextItemNo,
+        S2.OperationDesc nextItemDesc,
+        S2.ScheduledFlag nextScheduledFlag,
+        D.CustomerID customerId,
+        dbo.Get_CustomerDesc (D.Site, D.CustomerID) customerName,
+        D.EnterDate enterDate,
+        dbo.Get_SOOpsScheduleAvailResource (
+        T.Site,
+        S.OrderNo,
+        T.S_WorkCenterNo,
+        T.ItemNo
+        ) availResource,
+        T.S_WorkCenterNo workCenterNo,
+        S.MachRunFactor machRunFactor,
+        S.MachSetupTime machSetupTime,
+        S.FactorUnit factorUnit,
+        T.ClosedFlag closedFlag,
+        E.S_ScheduledSeqNo scheduledSeqNo,
+        T.PlanStartTime planStartTime,
+        T.PlanFinishTime planFinishTime,
         T.S_ResourceID resourceId,
-        T.TimeRequired timeRequired, T.SeqNo seqNo, T.SelectedFlag selectedFlag, T.SourceFlag sourceFlag,
+        T.TimeRequired timeRequired,
+        T.SeqNo seqNo,
+        T.SelectedFlag selectedFlag,
+        T.SourceFlag sourceFlag,
         S1.QtyScheduled qtyScheduledPreOps,
-        T.ParkFlag parkFlag, T.TimeRequired_Original timeRequiredOriginal, T.QtyRequired_Original qtyRequiredOriginal,
+        T.ParkFlag parkFlag,
+        T.TimeRequired_Original timeRequiredOriginal,
+        T.QtyRequired_Original qtyRequiredOriginal,
         S1.PlanStartTime preOpsPlanStartTime,
-        S1.PlanFinishTime preOpsPlanFinishTime, T.Remark remark, D.OriSOOrderNo oriSOOrderNo, P.Remark custPartNo,
+        S1.PlanFinishTime preOpsPlanFinishTime,
+        T.Remark remark,
+        D.OriSOOrderNo oriSOOrderNo,
+        P.Remark custPartNo,
         T.Efficiency eficiency,
         (Case when dbo.Get_SOOpsJobEstFinishDate(T.Site,T.OrderNo,T.ItemNo,T.SeqNo)<![CDATA[ <= ]]>T.PlanFinishTime then
         0.0
         else round((convert(float,dbo.Get_SOOpsJobEstFinishDate(T.Site,T.OrderNo,T.ItemNo,T.SeqNo)) -
         convert(float,T.PlanFinishTime)) * 24,2) end) delayHours,
-        dbo.Get_SOSchedule_RecordIdentity(T.Site,T.PlanStartTime,T.PlanFinishTime,D.NeedDate,S1.PlanStartTime,S1.PlanFinishTime)
-        mergeStatusCon,
-        T.mat_issueflag costRollUpFlag, dbo.getCurrentScheduleColorStyle(T.QtyReported, T.QtyRequired,
-        T.PlanFinishTime, T.ClosedFlag) colorStyle
+        dbo.Get_SOSchedule_RecordIdentity(T.Site,T.PlanStartTime,T.PlanFinishTime,D.NeedDate,S1.PlanStartTime,S1.PlanFinishTime) mergeStatusCon,
+        T.mat_issueflag costRollUpFlag,
+        dbo.getCurrentScheduleColorStyle(T.QtyReported, T.QtyRequired, T.PlanFinishTime, T.ClosedFlag) colorStyle
         from SOScheduledList as E,SOScheduledRouting as T
         Left Join ShopOrder as D On T.Site=D.Site and T.OrderNo=D.OrderNo
         ,SORouting as S
@@ -213,26 +244,50 @@
         <if test='exportFlag != null and exportFlag == "Y"'>
             Select T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo,
         </if>
-        P.PartDescription partDesc, P.Spec spec,
-        T.SeqNo seqNo, T.QtyRequired qtyRequired, T.QtyReported qtyReported, T.QtyApprove qtyApprove,
+        P.PartDescription partDesc,
+        P.Spec spec,
+        T.SeqNo seqNo,
+        T.QtyRequired qtyRequired,
+        T.QtyReported qtyReported,
+        (T.QtyRequired - T.QtyReported) as qtyToReport,
+        T.QtyApprove qtyApprove,
         ROUND(T.TimeRequired, 3) timeRequired,
-        T.TimeReported timeReported, T.PlanStartTime planStartTime, T.PlanFinishTime planFinishTime, T.BarcodeID
-        barcodeId, T.Remark remark,
-        T.Crewsize crewSize, T.ClosedFlag closedFlag, T.QtyScrapt qtyScrapt, T.OutWorkFlag outWorkFlag,
+        T.TimeReported timeReported,
+        T.PlanStartTime planStartTime,
+        T.PlanFinishTime planFinishTime,
+        T.BarcodeID barcodeId,
+        T.Remark remark,
+        T.Crewsize crewSize,
+        T.ClosedFlag closedFlag,
+        T.QtyScrapt qtyScrapt,
+        T.OutWorkFlag outWorkFlag,
         T.S_ScheduledDate scheduledDate,
-        T.S_ResourceID resourceId, dbo.getWorkCenterResourceDesc(T.Site, t.S_WorkCenterNo, T.S_ResourceID) resourceDesc,
-        E.S_ScheduledSeqNo scheduledSeqNo, T.S_ShiftNo shiftNo, D.MachSetupTime machSetupTime, D.MachRunFactor
-        machRunFactor,
-        D.FactorUnit factorUnit, D.Efficiency efficiency,D.NextItemNo nextItemNo,
+        T.S_ResourceID resourceId,
+        dbo.getWorkCenterResourceDesc(T.Site, t.S_WorkCenterNo, T.S_ResourceID) resourceDesc,
+        E.S_ScheduledSeqNo scheduledSeqNo,
+        T.S_ShiftNo shiftNo,
+        D.MachSetupTime machSetupTime,
+        D.MachRunFactor machRunFactor,
+        D.FactorUnit factorUnit,
+        D.Efficiency efficiency,
+        D.NextItemNo nextItemNo,
         dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.NextItemNo) nextItemDesc,
-        D.PreItemNo preItemNo,dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.PreItemNo) preItemDesc, SO.NeedDate needDate,
+        D.PreItemNo preItemNo,
+        dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.PreItemNo) preItemDesc,
+        SO.NeedDate needDate,
         T.ParkFlag parkFlag,
-        dbo.Get_SOOpsPreResourceInfo(T.Site, T.OrderNo, T.ItemNo) preResourceInfo, dbo.Get_SOOpsPreQtyFinished(T.Site,
-        T.OrderNo, T.ItemNo) preQtyFinished,
-        P.ConfigurationTemplateID customerName, P.Remark custPartNo, t.S_WorkCenterNo workCenterNo,
+        dbo.Get_SOOpsPreResourceInfo(T.Site, T.OrderNo, T.ItemNo) preResourceInfo,
+        dbo.Get_SOOpsPreQtyFinished(T.Site, T.OrderNo, T.ItemNo) preQtyFinished,
+        P.ConfigurationTemplateID customerName,
+        P.Remark custPartNo,
+        t.S_WorkCenterNo workCenterNo,
         dbo.Get_WorkCenterDesc(T.Site, T.S_WorkCenterNo) workCenterDesc,
-        T.QtyRequired_Original qtyRequiredOriginal, SO.orderType,
-        T.ClosedBy closedBy, T.ClosedDate closedDate, T.mat_issueflag matIssueFlag, T.plate_issueflag plateIssueFlag,
+        T.QtyRequired_Original qtyRequiredOriginal,
+        SO.orderType,
+        T.ClosedBy closedBy,
+        T.ClosedDate closedDate,
+        T.mat_issueflag matIssueFlag,
+        T.plate_issueflag plateIssueFlag,
         T.tool_issueflag toolIssueFlag
         from SOScheduledRouting as T
         Left Join SOScheduledList as E on E.Site=T.Site and E.LinkedSeqNo=T.SeqNo,

src/main/resources/mapper/shopOrder/ShopOrderMapper.xml

@@ -95,8 +95,7 @@
         </where>
     </select>
 
-    <select id="searchProductionDispatchList"
-            resultType="com.gaotao.modules.shopOrder.entity.SearchProductionDispatchListData">
+    <select id="searchProductionDispatchList" resultType="com.gaotao.modules.shopOrder.entity.SearchProductionDispatchListData">
         SELECT
         T.Site,
         T.OrderNo,
@@ -107,6 +106,7 @@
         P.Spec,
         T.QtyRequired AS LotSize,
         T.QtyReported,
+        (T.QtyRequired - T.QtyReported) as qtyToReport,
         D.NeedDate,
         S.PreItemNo,
         S1.OperationDesc AS PreOperationDesc,