2025-11-17

订单产出标签报表

src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java

@@ -59,7 +59,34 @@ public class SFDCRollsOutData {
 	// 分页参数
 	private Integer page;
 	private Integer limit;
-	
+	private String partNo;
+	private String partDesc;
+	private String spec;
+
+	public String getPartNo() {
+		return partNo;
+	}
+
+	public void setPartNo(String partNo) {
+		this.partNo = partNo;
+	}
+
+	public String getPartDesc() {
+		return partDesc;
+	}
+
+	public void setPartDesc(String partDesc) {
+		this.partDesc = partDesc;
+	}
+
+	public String getSpec() {
+		return spec;
+	}
+
+	public void setSpec(String spec) {
+		this.spec = spec;
+	}
+
 	public Integer getPage() {
 		return page;
 	}

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

@@ -263,9 +263,13 @@
         B.Reportedby,
         (CASE WHEN ISNULL(A.status , '*') = '*' THEN '在制品' else a.status end) as roll_type ,
         (CASE WHEN B.RollNo IS NOT NULL THEN '已消耗' WHEN ISNULL(A.status , '*') != '*' THEN '待入库' ELSE '未消耗'  END) AS final_status,
-        B.HistType
+        B.HistType,
+        a.partNo,
+        p.PartDescription AS partDesc,
+        p.Spec AS spec
         FROM SFDC_Rolls A
-        LEFT JOIN SFDC_MaterialHist B   ON A.Site = B.SITE AND A.OrderNo = B.OrderNo AND A.RollNo = B.StartFromRollNo
+        LEFT JOIN SFDC_MaterialHist B ON A.Site = B.SITE AND A.OrderNo = B.OrderNo AND A.RollNo = B.StartFromRollNo
+        left join part p on a.site = p.site and a.partNo = p.partNo
         <where>
              a.CreatedDate >= #{createdDate2}
             <if test=" createdDate3 != null">