2025.04.30 qc优化

src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java

@@ -292,6 +292,16 @@ public class QcReportData extends QueryPage {
      */
     @ExcelIgnore
     private String resourceDesc;
+    /**
+     * 机台编码
+     */
+    @ExcelIgnore
+    private String actualResourceId;
+    /**
+     * 机台名称
+     */
+    @ExcelIgnore
+    private String actualResourceDesc;
     /**
      * 供应商编码
      */

src/main/java/com/xujie/sys/modules/pms/data/QcReportIPQCData.java

@@ -73,119 +73,129 @@ public class QcReportIPQCData extends QueryPage {
     /**
      * 工序
      */
-    @ExcelProperty(index = 11, value = "工序")
+    @ExcelProperty(index = 11, value = "加工中心编码")
+    private String workCenterNo;
+    /**
+     * 工序
+     */
+    @ExcelProperty(index = 12, value = "加工中心名称")
+    private String workCenterDesc;
+    /**
+     * 工序
+     */
+    @ExcelProperty(index = 13, value = "工序")
     private String operationDesc;
     /**
      * 机台名称
      */
-    @ExcelProperty(index = 12, value = "机台")
+    @ExcelProperty(index = 14, value = "机台")
     private String resourceDesc;
     /**
      * 物料编码
      */
-    @ExcelProperty(index = 13, value = "物料编码")
+    @ExcelProperty(index = 15, value = "物料编码")
     private String partNo;
     /**
      * 物料名称
      */
-    @ExcelProperty(index = 14, value = "物料名称")
+    @ExcelProperty(index = 16, value = "物料名称")
     private String partDesc;
     /**
      * 单位
      */
-    @ExcelProperty(index = 15, value = "单位")
+    @ExcelProperty(index = 17, value = "单位")
     private String umName;
     /**
      * 送检数量
      */
-    @ExcelProperty(index = 16, value = "送检数量")
+    @ExcelProperty(index = 18, value = "送检数量")
     private BigDecimal rollCount;
     /**
      * 抽样数量
      */
-    @ExcelProperty(index = 17, value = "抽样数量")
+    @ExcelProperty(index = 19, value = "抽样数量")
     private BigDecimal samplingQty;
     /**
      * 合格数量
      */
-    @ExcelProperty(index = 18, value = "合格数量")
+    @ExcelProperty(index = 20, value = "合格数量")
     private BigDecimal passQty;
     /**
      * 不合格数量
      */
-    @ExcelProperty(index = 19, value = "不合格数量")
+    @ExcelProperty(index = 21, value = "不合格数量")
     private BigDecimal notPassQty;
     /**
      * 质检备注
      */
-    @ExcelProperty(index = 20, value = "质检备注")
+    @ExcelProperty(index = 22, value = "质检备注")
     private String inspectionRemark;
     /**
      * 处置说明
      */
-    @ExcelProperty(index = 21, value = "处置说明")
+    @ExcelProperty(index = 23, value = "处置说明")
     private String disposalRemark;
     /**
      * 开始检验时间
      */
-    @ExcelProperty(index = 22, value = "开始检验时间")
+    @ExcelProperty(index = 24, value = "开始检验时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date actionDate;
     /**
      * 检验时间
      */
-    @ExcelProperty(index = 23, value = "检验时间")
+    @ExcelProperty(index = 25, value = "检验时间")
     private String inspectorDate;
     /**
      * 特殊要求
      */
-    @ExcelProperty(index = 24, value = "特殊要求")
+    @ExcelProperty(index = 26, value = "特殊要求")
     private String specialRequirements;
     /**
      * 检验项目编码
      */
-    @ExcelProperty(index = 25, value = "检验项目编码")
+    @ExcelProperty(index = 27, value = "检验项目编码")
     private String itemNo;
     /**
      * 检验项目名称
      */
-    @ExcelProperty(index = 26, value = "检验项目名称")
+    @ExcelProperty(index = 28, value = "检验项目名称")
     private String itemDesc;
     /**
      * 标准值
      */
-    @ExcelProperty(index = 27, value = "标准值")
+    @ExcelProperty(index = 29, value = "标准值")
     private String defaultValue;
     /**
      * 上限值
      */
-    @ExcelProperty(index = 28, value = "上限值")
+    @ExcelProperty(index = 30, value = "上限值")
     private BigDecimal maxValue;
     /**
      * 下限值
      */
-    @ExcelProperty(index = 29, value = "下限值")
+    @ExcelProperty(index = 31, value = "下限值")
     private BigDecimal minValue;
     /**
      * 抽样数量(项目)
      */
-    @ExcelProperty(index = 30, value = "抽样数量(项目)")
+    @ExcelProperty(index = 32, value = "抽样数量(项目)")
     private BigDecimal itemSamplingQty;
     /**
      * 不合格数量(项目)
      */
-    @ExcelProperty(index = 31, value = "不合格数量(项目)")
+    @ExcelProperty(index = 33, value = "不合格数量(项目)")
     private BigDecimal unqualifiedQuantity;
     /**
      * 实测值
      */
-    @ExcelProperty(index = 32, value = "实测值")
+    @ExcelProperty(index = 34, value = "实测值")
     private String textValue;
     /**
      * 项目检验结论
      */
-    @ExcelProperty(index = 33, value = "项目检验结论")
+    @ExcelProperty(index = 35, value = "项目检验结论")
     private String itemResultDesc;
 
     /**
@@ -361,11 +371,6 @@ public class QcReportIPQCData extends QueryPage {
      */
     @ExcelIgnore
     private String createBy;
-    /**
-     * 加工中心
-     */
-    @ExcelIgnore
-    private String workCenterNo;
     /**
      * 项目检验结论
      */

src/main/resources/mapper/pms/QcReportMapper.xml

@@ -162,6 +162,8 @@
             a.operation_desc,
             a.resource_id,
             r.resourceDesc,
+            a.actual_resource_id,
+            r1.resourceDesc as actualResourceDesc,
             a.part_no,
             d.PartDescription as part_desc,
             d.spec,
@@ -203,6 +205,7 @@
         left join part as d on a.site = d.site and a.part_no = d.PartNo
         left join UM as um on a.site = um.site and a.um_id = um.UMID
         LEFT JOIN WorkCenter as wc on a.site = wc.site and a.work_center_no = wc.WorkCenterNo
+        left join WorkCenterResource as r1 on a.site = r.site and a.actual_resource_id = r.resourceID
         <where>
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
@@ -843,6 +846,7 @@
         a.batch_roll_no,
         a.special_requirements,
         a.work_center_no,
+        wc.WorkCenterDesc as workCenterDesc,
         a.roll_no,
         a.um_id,
         um.UMName as umName,
@@ -869,6 +873,7 @@
         left join WorkCenterResource as r on a.site = r.site and a.resource_id = r.resourceID
         left join part as d on a.site = d.site and a.part_no = d.PartNo
         left join UM as um on a.site = um.site and a.um_id = um.UMID
+        left join WorkCenter as wc on a.site = wc.site and a.work_center_no = wc.WorkCenterNo
         <where>
             a.site in (select site from eam_access_site where username = #{userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{userName}))