2025-12-11

过站采集-》车间工作平台的订单信息中显示工艺的信息

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.ibatis.type.Alias;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -89,6 +90,51 @@ public class ScheduleData extends BaseShopOrderData {
     private Integer rowCount;
     private Integer rollCount;
     private String carrierNo;
+    private BigDecimal productionQty;
+    private BigDecimal totalRollQty;
+    private BigDecimal totalPerVolume;
+    private String soRemark;
+    private BigDecimal productionRollQty;
+
+    public BigDecimal getProductionRollQty() {
+        return productionRollQty;
+    }
+
+    public void setProductionRollQty(BigDecimal productionRollQty) {
+        this.productionRollQty = productionRollQty;
+    }
+
+    public BigDecimal getProductionQty() {
+        return productionQty;
+    }
+
+    public void setProductionQty(BigDecimal productionQty) {
+        this.productionQty = productionQty;
+    }
+
+    public BigDecimal getTotalRollQty() {
+        return totalRollQty;
+    }
+
+    public void setTotalRollQty(BigDecimal totalRollQty) {
+        this.totalRollQty = totalRollQty;
+    }
+
+    public BigDecimal getTotalPerVolume() {
+        return totalPerVolume;
+    }
+
+    public void setTotalPerVolume(BigDecimal totalPerVolume) {
+        this.totalPerVolume = totalPerVolume;
+    }
+
+    public String getSoRemark() {
+        return soRemark;
+    }
+
+    public void setSoRemark(String soRemark) {
+        this.soRemark = soRemark;
+    }
 
     public Float getQtyToReport() {
         return qtyToReport;

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

@@ -622,7 +622,12 @@
         SO.ManualFlag manualFlag,
         T.row_count,
         T.roll_count,
-        T.carrier_no
+        T.carrier_no,
+        d.production_qty,
+        d.total_roll_qty,
+        d.total_per_volume,
+        d.Remark as soRemark,
+        (SELECT  count(1)  FROM  SFDC_Rolls S WHERE  Site = T.SITE AND CreatedOpsSeqNo = T.SeqNo AND VirtualNewRollFlag ='N'  and RollType ='下道流转') as productionRollQty
         from SOScheduledRouting as T
         Left Join SOScheduledList as E on E.Site = T.Site and E.LinkedSeqNo = T.SeqNo,
         SORouting as D, Part as P, ShopOrder as SO