change - add箱体流转追溯报表

aucma-base/src/main/resources/mapper/base/RecordDnbInstantMapper.xml

@@ -81,6 +81,7 @@
                         <if test="updatedTime != null "> and rdi.updated_time = #{updatedTime}</if>
                         <if test="factoryCode != null  and factoryCode != ''"> and rdi.factory_code = #{factoryCode}</if>
         </where>
+        order by rdi.collect_time desc
     </select>
 
     <select id="selectRecordDnbInstantByObjId" parameterType="Long" resultMap="RecordDnbInstantResult">

aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java

@@ -153,4 +153,54 @@ public class ProductionReportController extends BaseController {
         util.exportExcel(response, list, "发泡箱体追溯差异明细报表" );
     }
 
+    /**
+     * 箱体流转追溯报表
+     * @param hashMap
+     * @return
+     */
+    @GetMapping("/boxTurnoverTraceabilityReportList")
+    public TableDataInfo boxTurnoverTraceabilityReportList(@RequestParam(required = false) Map hashMap) {
+        startPage();
+        List<BoxTurnoverTraceabilityReport> list = productionReportService.boxTurnoverTraceabilityReportList(hashMap);
+        return getDataTable(list);
+    }
+
+    /**
+     * 箱体流转追溯报表导出
+     * @param hashMap
+     * @return
+     */
+    @PostMapping("/boxTurnoverTraceabilityReportList/export")
+    public void boxTurnoverTraceabilityReportList(HttpServletResponse response, @RequestParam(required = false) Map hashMap) {
+        hashMap.put("pageNum",null);
+        hashMap.put("pageSize",null);
+        List<BoxTurnoverTraceabilityReport> list = productionReportService.boxTurnoverTraceabilityReportList(hashMap);
+        ExcelUtil<BoxTurnoverTraceabilityReport> util = new ExcelUtil<>(BoxTurnoverTraceabilityReport. class);
+        util.exportExcel(response, list, "箱体流转追溯报表" );
+    }
+
+    /**
+     * 箱体流转追溯详情报表
+     * @param hashMap
+     * @return
+     */
+    @GetMapping("/boxTurnoverTraceabilityDetailReportList")
+    public AjaxResult boxTurnoverTraceabilityDetailReportList(@RequestParam(required = false) Map hashMap) {
+        List<BoxTurnoverTraceabilityDetailReport> list = productionReportService.boxTurnoverTraceabilityDetailReportList(hashMap);
+        return success(list);
+    }
+
+    /**
+     * 箱体流转追溯详情报表导出
+     * @param hashMap
+     * @return
+     */
+    @PostMapping("/boxTurnoverTraceabilityDetailReportList/export")
+    public void boxTurnoverTraceabilityDetailReportList(HttpServletResponse response, @RequestParam(required = false) Map hashMap) {
+        hashMap.put("pageNum",null);
+        hashMap.put("pageSize",null);
+        List<BoxTurnoverTraceabilityDetailReport> list = productionReportService.boxTurnoverTraceabilityDetailReportList(hashMap);
+        ExcelUtil<BoxTurnoverTraceabilityDetailReport> util = new ExcelUtil<>(BoxTurnoverTraceabilityDetailReport. class);
+        util.exportExcel(response, list, "箱体流转追溯详情报表" );
+    }
 }

aucma-report/src/main/java/com/aucma/report/domain/BoxTurnoverTraceabilityDetailReport.java

@@ -0,0 +1,265 @@
+package com.aucma.report.domain;
+
+import com.aucma.common.annotation.Excel;
+import com.aucma.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Date;
+
+/**
+ * 箱体流转追溯报表
+ *
+ * @author Yinq
+ * @date 2024-03-15
+ */
+public class BoxTurnoverTraceabilityDetailReport extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 产线编号
+     */
+    @Excel(name = "产线编号")
+    @JsonProperty("PRODUCT_LINE_CODE")
+    private String PRODUCT_LINE_CODE;
+
+    /**
+     * 产线名称
+     */
+    @Excel(name = "产线名称")
+    @JsonProperty("PRODUCT_LINE_NAME")
+    private String PRODUCT_LINE_NAME;
+
+    /**
+     * SAP订单编号
+     */
+    @Excel(name = "SAP订单编号")
+    @JsonProperty("ORDER_CODE")
+    private String ORDER_CODE;
+
+    /**
+     * 销售订单编号
+     */
+    @Excel(name = "销售订单编号")
+    @JsonProperty("SALEORDER_CODE")
+    private String SALEORDER_CODE;
+
+    /**
+     * 销售订单行号
+     */
+    @Excel(name = "销售订单行号")
+    @JsonProperty("SALEORDER_LINENUMBER")
+    private String SALEORDER_LINENUMBER;
+
+    /**
+     * 产品编号
+     */
+    @Excel(name = "产品编号")
+    @JsonProperty("PRODUCT_CODE")
+    private String PRODUCT_CODE;
+
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称")
+    @JsonProperty("PRODUCT_NAME")
+    private String PRODUCT_NAME;
+
+    /**
+     * 成品条码
+     */
+    @Excel(name = "成品条码")
+    @JsonProperty("PRODUCT_SNCODE")
+    private String PRODUCT_SNCODE;
+
+    /**
+     * MES条码
+     */
+    @Excel(name = "MES条码")
+    @JsonProperty("BOX_CODE")
+    private String BOX_CODE;
+
+    /**
+     * MES码打印时间
+     */
+    @Excel(name = "MES码打印时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("PRINT_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String PRINT_TIME;
+
+    /**
+     * 物料编号
+     */
+    @Excel(name = "物料编号")
+    @JsonProperty("MATERIAL_CODE")
+    private String MATERIAL_CODE;
+
+    /**
+     * 物料名称
+     */
+    @Excel(name = "物料名称")
+    @JsonProperty("MATERIAL_NAME")
+    private String MATERIAL_NAME;
+
+    /**
+     * 过点工位编号
+     */
+    @Excel(name = "过点工位编号")
+    @JsonProperty("STATION_CODE")
+    private String STATION_CODE;
+
+    /**
+     * 过点工位名称
+     */
+    @Excel(name = "过点工位名称")
+    @JsonProperty("STATION_NAME")
+    private String STATION_NAME;
+
+    /**
+     * 过点时间
+     */
+    @Excel(name = "过点时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("COMPLETE_DATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date COMPLETE_DATE;
+
+    public String getPRODUCT_LINE_CODE() {
+        return PRODUCT_LINE_CODE;
+    }
+
+    public void setPRODUCT_LINE_CODE(String PRODUCT_LINE_CODE) {
+        this.PRODUCT_LINE_CODE = PRODUCT_LINE_CODE;
+    }
+
+    public String getPRODUCT_LINE_NAME() {
+        return PRODUCT_LINE_NAME;
+    }
+
+    public void setPRODUCT_LINE_NAME(String PRODUCT_LINE_NAME) {
+        this.PRODUCT_LINE_NAME = PRODUCT_LINE_NAME;
+    }
+
+    public String getORDER_CODE() {
+        return ORDER_CODE;
+    }
+
+    public void setORDER_CODE(String ORDER_CODE) {
+        this.ORDER_CODE = ORDER_CODE;
+    }
+
+    public String getSALEORDER_CODE() {
+        return SALEORDER_CODE;
+    }
+
+    public void setSALEORDER_CODE(String SALEORDER_CODE) {
+        this.SALEORDER_CODE = SALEORDER_CODE;
+    }
+
+    public String getSALEORDER_LINENUMBER() {
+        return SALEORDER_LINENUMBER;
+    }
+
+    public void setSALEORDER_LINENUMBER(String SALEORDER_LINENUMBER) {
+        this.SALEORDER_LINENUMBER = SALEORDER_LINENUMBER;
+    }
+
+    public String getPRODUCT_CODE() {
+        return PRODUCT_CODE;
+    }
+
+    public void setPRODUCT_CODE(String PRODUCT_CODE) {
+        this.PRODUCT_CODE = PRODUCT_CODE;
+    }
+
+    public String getPRODUCT_NAME() {
+        return PRODUCT_NAME;
+    }
+
+    public void setPRODUCT_NAME(String PRODUCT_NAME) {
+        this.PRODUCT_NAME = PRODUCT_NAME;
+    }
+
+    public String getPRODUCT_SNCODE() {
+        return PRODUCT_SNCODE;
+    }
+
+    public void setPRODUCT_SNCODE(String PRODUCT_SNCODE) {
+        this.PRODUCT_SNCODE = PRODUCT_SNCODE;
+    }
+
+    public String getBOX_CODE() {
+        return BOX_CODE;
+    }
+
+    public void setBOX_CODE(String BOX_CODE) {
+        this.BOX_CODE = BOX_CODE;
+    }
+
+    public String getPRINT_TIME() {
+        return PRINT_TIME;
+    }
+
+    public void setPRINT_TIME(String PRINT_TIME) {
+        this.PRINT_TIME = PRINT_TIME;
+    }
+
+    public String getMATERIAL_CODE() {
+        return MATERIAL_CODE;
+    }
+
+    public void setMATERIAL_CODE(String MATERIAL_CODE) {
+        this.MATERIAL_CODE = MATERIAL_CODE;
+    }
+
+    public String getMATERIAL_NAME() {
+        return MATERIAL_NAME;
+    }
+
+    public void setMATERIAL_NAME(String MATERIAL_NAME) {
+        this.MATERIAL_NAME = MATERIAL_NAME;
+    }
+
+    public String getSTATION_CODE() {
+        return STATION_CODE;
+    }
+
+    public void setSTATION_CODE(String STATION_CODE) {
+        this.STATION_CODE = STATION_CODE;
+    }
+
+    public String getSTATION_NAME() {
+        return STATION_NAME;
+    }
+
+    public void setSTATION_NAME(String STATION_NAME) {
+        this.STATION_NAME = STATION_NAME;
+    }
+
+    public Date getCOMPLETE_DATE() {
+        return COMPLETE_DATE;
+    }
+
+    public void setCOMPLETE_DATE(Date COMPLETE_DATE) {
+        this.COMPLETE_DATE = COMPLETE_DATE;
+    }
+
+    @Override
+    public String toString() {
+        return "BoxTurnoverTraceabilityDetailReport{" +
+                "PRODUCT_LINE_CODE='" + PRODUCT_LINE_CODE + '\'' +
+                ", PRODUCT_LINE_NAME='" + PRODUCT_LINE_NAME + '\'' +
+                ", ORDER_CODE='" + ORDER_CODE + '\'' +
+                ", SALEORDER_CODE='" + SALEORDER_CODE + '\'' +
+                ", SALEORDER_LINENUMBER='" + SALEORDER_LINENUMBER + '\'' +
+                ", PRODUCT_CODE='" + PRODUCT_CODE + '\'' +
+                ", PRODUCT_NAME='" + PRODUCT_NAME + '\'' +
+                ", PRODUCT_SNCODE='" + PRODUCT_SNCODE + '\'' +
+                ", BOX_CODE='" + BOX_CODE + '\'' +
+                ", MATERIAL_CODE='" + MATERIAL_CODE + '\'' +
+                ", MATERIAL_NAME='" + MATERIAL_NAME + '\'' +
+                ", STATION_CODE='" + STATION_CODE + '\'' +
+                ", STATION_NAME='" + STATION_NAME + '\'' +
+                ", COMPLETE_DATE='" + COMPLETE_DATE + '\'' +
+                '}';
+    }
+}

aucma-report/src/main/java/com/aucma/report/domain/BoxTurnoverTraceabilityReport.java

@@ -0,0 +1,183 @@
+package com.aucma.report.domain;
+
+import com.aucma.common.annotation.Excel;
+import com.aucma.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 箱体流转追溯报表
+ *
+ * @author Yinq
+ * @date 2024-03-15
+ */
+public class BoxTurnoverTraceabilityReport extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 产线编号
+     */
+    @Excel(name = "产线编号")
+    @JsonProperty("PRODUCT_LINE_CODE")
+    private String PRODUCT_LINE_CODE;
+
+    /**
+     * 产线名称
+     */
+    @Excel(name = "产线名称")
+    @JsonProperty("PRODUCT_LINE_NAME")
+    private String PRODUCT_LINE_NAME;
+
+    /**
+     * SAP订单编号
+     */
+    @Excel(name = "SAP订单编号")
+    @JsonProperty("ORDER_CODE")
+    private String ORDER_CODE;
+
+    /**
+     * 销售订单编号
+     */
+    @Excel(name = "销售订单编号")
+    @JsonProperty("SALEORDER_CODE")
+    private String SALEORDER_CODE;
+
+    /**
+     * 销售订单行号
+     */
+    @Excel(name = "销售订单行号")
+    @JsonProperty("SALEORDER_LINENUMBER")
+    private String SALEORDER_LINENUMBER;
+
+    /**
+     * 物料编号
+     */
+    @Excel(name = "物料编号")
+    @JsonProperty("MATERIAL_CODE")
+    private String MATERIAL_CODE;
+
+    /**
+     * 物料名称
+     */
+    @Excel(name = "物料名称")
+    @JsonProperty("MATERIAL_NAME")
+    private String MATERIAL_NAME;
+
+    /**
+     * 成品条码
+     */
+    @Excel(name = "成品条码")
+    @JsonProperty("PRODUCT_SNCODE")
+    private String PRODUCT_SNCODE;
+
+    /**
+     * MES条码
+     */
+    @Excel(name = "MES条码")
+    @JsonProperty("BOX_CODE")
+    private String BOX_CODE;
+
+    /**
+     * MES码打印时间
+     */
+    @Excel(name = "MES码打印时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("PRINT_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String PRINT_TIME;
+
+    public String getPRODUCT_LINE_CODE() {
+        return PRODUCT_LINE_CODE;
+    }
+
+    public void setPRODUCT_LINE_CODE(String PRODUCT_LINE_CODE) {
+        this.PRODUCT_LINE_CODE = PRODUCT_LINE_CODE;
+    }
+
+    public String getPRODUCT_LINE_NAME() {
+        return PRODUCT_LINE_NAME;
+    }
+
+    public void setPRODUCT_LINE_NAME(String PRODUCT_LINE_NAME) {
+        this.PRODUCT_LINE_NAME = PRODUCT_LINE_NAME;
+    }
+
+    public String getORDER_CODE() {
+        return ORDER_CODE;
+    }
+
+    public void setORDER_CODE(String ORDER_CODE) {
+        this.ORDER_CODE = ORDER_CODE;
+    }
+
+    public String getSALEORDER_CODE() {
+        return SALEORDER_CODE;
+    }
+
+    public void setSALEORDER_CODE(String SALEORDER_CODE) {
+        this.SALEORDER_CODE = SALEORDER_CODE;
+    }
+
+    public String getSALEORDER_LINENUMBER() {
+        return SALEORDER_LINENUMBER;
+    }
+
+    public void setSALEORDER_LINENUMBER(String SALEORDER_LINENUMBER) {
+        this.SALEORDER_LINENUMBER = SALEORDER_LINENUMBER;
+    }
+
+    public String getMATERIAL_CODE() {
+        return MATERIAL_CODE;
+    }
+
+    public void setMATERIAL_CODE(String MATERIAL_CODE) {
+        this.MATERIAL_CODE = MATERIAL_CODE;
+    }
+
+    public String getMATERIAL_NAME() {
+        return MATERIAL_NAME;
+    }
+
+    public void setMATERIAL_NAME(String MATERIAL_NAME) {
+        this.MATERIAL_NAME = MATERIAL_NAME;
+    }
+
+    public String getPRODUCT_SNCODE() {
+        return PRODUCT_SNCODE;
+    }
+
+    public void setPRODUCT_SNCODE(String PRODUCT_SNCODE) {
+        this.PRODUCT_SNCODE = PRODUCT_SNCODE;
+    }
+
+    public String getBOX_CODE() {
+        return BOX_CODE;
+    }
+
+    public void setBOX_CODE(String BOX_CODE) {
+        this.BOX_CODE = BOX_CODE;
+    }
+
+
+    public String getPRINT_TIME() {
+        return PRINT_TIME;
+    }
+
+    public void setPRINT_TIME(String PRINT_TIME) {
+        this.PRINT_TIME = PRINT_TIME;
+    }
+
+    @Override
+    public String toString() {
+        return "ProductTraceabilityReport{" +
+                "PRODUCT_LINE_CODE='" + PRODUCT_LINE_CODE + '\'' +
+                ", PRODUCT_LINE_NAME='" + PRODUCT_LINE_NAME + '\'' +
+                ", ORDER_CODE='" + ORDER_CODE + '\'' +
+                ", SALEORDER_CODE='" + SALEORDER_CODE + '\'' +
+                ", SALEORDER_LINENUMBER='" + SALEORDER_LINENUMBER + '\'' +
+                ", MATERIAL_CODE='" + MATERIAL_CODE + '\'' +
+                ", MATERIAL_NAME='" + MATERIAL_NAME + '\'' +
+                ", PRODUCT_SNCODE='" + PRODUCT_SNCODE + '\'' +
+                ", BOX_CODE='" + BOX_CODE + '\'' +
+                '}';
+    }
+}

aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java

@@ -30,6 +30,12 @@ public class ReportPointDnb extends BaseEntity {
     @Excel(name = "计量设备编号")
     private String monitorCode;
 
+    /**
+     * 计量设备名称
+     */
+    @Excel(name = "计量设备名称")
+    private String monitorName;
+
     /**
      * 仪表值
      */
@@ -92,6 +98,14 @@ public class ReportPointDnb extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    public String getMonitorName() {
+        return monitorName;
+    }
+
+    public void setMonitorName(String monitorName) {
+        this.monitorName = monitorName;
+    }
+
     public void setObjId(Long objId) {
         this.objId = objId;
     }

aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java

@@ -122,4 +122,18 @@ public interface GeneralReportMapper {
      * @return
      */
     List<RepairRateReport> repairRateReportList(Map hashMap);
+
+    /**
+     * 箱体流转追溯报表
+     * @param hashMap
+     * @return
+     */
+    List<BoxTurnoverTraceabilityReport> boxTurnoverTraceabilityReportList(Map hashMap);
+
+    /**
+     * 箱体流转追溯详情报表
+     * @param hashMap
+     * @return
+     */
+    List<BoxTurnoverTraceabilityDetailReport> boxTurnoverTraceabilityDetailReportList(Map hashMap);
 }

aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java

@@ -56,4 +56,18 @@ public interface IProductionReportService
      * @return
      */
     List<BoxTraceabilityDetailReport> boxTraceabilityDetailReport(Map hashMap);
+
+    /**
+     * 箱体流转追溯报表
+     * @param hashMap
+     * @return
+     */
+    List<BoxTurnoverTraceabilityReport> boxTurnoverTraceabilityReportList(Map hashMap);
+
+    /**
+     * 箱体流转追溯详情报表
+     * @param hashMap
+     * @return
+     */
+    List<BoxTurnoverTraceabilityDetailReport> boxTurnoverTraceabilityDetailReportList(Map hashMap);
 }

aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java

@@ -79,5 +79,24 @@ public class ProductionReportServiceImpl implements IProductionReportService {
         return reportMapper.boxTraceabilityDetailReport(hashMap);
     }
 
+    /**
+     * 箱体流转追溯报表
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<BoxTurnoverTraceabilityReport> boxTurnoverTraceabilityReportList(Map hashMap) {
+        return reportMapper.boxTurnoverTraceabilityReportList(hashMap);
+    }
+
+    /**
+     * 箱体流转追溯详情报表
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<BoxTurnoverTraceabilityDetailReport> boxTurnoverTraceabilityDetailReportList(Map hashMap) {
+        return reportMapper.boxTurnoverTraceabilityDetailReportList(hashMap);
+    }
 
 }

aucma-report/src/main/java/com/aucma/report/service/impl/RecordElectricalInspectionServiceImpl.java

@@ -221,7 +221,7 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI
         }
         //质检不合格存入质检数据
         for (DetailElectricalinspection detail : detailList) {
-            if (StringUtils.isNotEmpty(detail.getTestresult()) || detail.getTestresult().equals("OK")) {
+            if (StringUtils.isEmpty(detail.getTestresult()) || detail.getTestresult().equals("OK")) {
                 continue;
             }
             String projectName = detail.getProjectname();

aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml

@@ -543,4 +543,69 @@
         ORDER BY RQI.INSPECTOR_TIME
     </select>
 
+    <select id="boxTurnoverTraceabilityReportList" resultType="com.aucma.report.domain.BoxTurnoverTraceabilityReport"
+            parameterType="java.util.HashMap">
+        SELECT PL.PRODUCT_LINE_CODE,
+        PL.PRODUCT_LINE_NAME,
+        BO.ORDER_CODE,
+        BO.SALEORDER_CODE,
+        BO.SALEORDER_LINENUMBER,
+        BO.MATERIAL_CODE,
+        BO.MATERIAL_NAME,
+        PO.PRODUCT_SNCODE,
+        PB.MATERIAL_BARCODE BOX_CODE,
+        PO.PRODUCT_SCANTIME,
+        PB.PRINT_TIME
+        FROM C##AUCMA_SCADA.PRINT_BARCODE PB
+        LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = PB.ORDER_CODE
+        LEFT JOIN BASE_PRODUCTLINE PL ON PL.WORK_CENTER_CODE = BO.WORK_CENTER_CODE
+        LEFT JOIN C##AUCMA_SCADA.PRODUCT_OFFLINE PO ON PB.MATERIAL_BARCODE = PO.BOX_CODE
+        <where>
+            PB.PRINT_BARTYPE = 1
+            <if test="PRODUCT_LINE_CODE != null and PRODUCT_LINE_CODE != ''">and PL.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
+            </if>
+            <if test="ORDER_CODE != null and ORDER_CODE != ''">and BO.ORDER_CODE = #{ORDER_CODE}</if>
+            <if test="MATERIAL_CODE != null and MATERIAL_CODE != ''">and BO.MATERIAL_CODE = #{MATERIAL_CODE}</if>
+            <if test="MATERIAL_NAME != null and MATERIAL_NAME != ''">and BO.MATERIAL_NAME LIKE '%' || #{MATERIAL_NAME}
+                || '%'
+            </if>
+            <if test="PRODUCT_SNCODE != null and PRODUCT_SNCODE != ''">and PO.PRODUCT_SNCODE LIKE '%' ||
+                #{PRODUCT_SNCODE} || '%'
+            </if>
+            <if test="BOX_CODE != null and BOX_CODE != ''">and PB.MATERIAL_BARCODE = #{BOX_CODE}</if>
+            <if test="beginBeginTime != null  and beginBeginTime != '' and endBeginTime != null  and endBeginTime != ''">
+                AND TO_CHAR(PB.PRINT_TIME, 'YYYY-MM-DD HH24:MI:SS') BETWEEN #{beginBeginTime} AND #{endBeginTime}
+            </if>
+        </where>
+       ORDER BY PB.PRINT_TIME DESC
+    </select>
+    <select id="boxTurnoverTraceabilityDetailReportList"
+            resultType="com.aucma.report.domain.BoxTurnoverTraceabilityDetailReport"
+            parameterType="java.util.HashMap">
+        SELECT PL.PRODUCT_LINE_CODE,
+               PL.PRODUCT_LINE_NAME,
+               BO.ORDER_CODE,
+               BO.SALEORDER_CODE,
+               BO.SALEORDER_LINENUMBER,
+               BO.MATERIAL_CODE     PRODUCT_CODE,
+               BO.MATERIAL_NAME     PRODUCT_NAME,
+               PO.PRODUCT_SNCODE,
+               MC.MATERIAL_BARCODE  BOX_CODE,
+               PB.PRINT_TIME,
+               BM.MATERIAL_CODE,
+               BM.MATERIAL_NAME,
+               ST.PRODUCT_LINE_CODE STATION_CODE,
+               ST.PRODUCT_LINE_NAME STATION_NAME,
+               MC.COMPLETE_DATE
+        FROM C##AUCMA_SCADA.MATERIAL_COMPLETION MC
+                 LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = MC.MATERIAL_BARCODE
+                 LEFT JOIN BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = PB.MATERIAL_CODE
+                 LEFT JOIN BASE_PRODUCTLINE ST on MC.STATION_NAME = ST.PRODUCT_LINE_CODE
+                 LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = PB.ORDER_CODE
+                 LEFT JOIN BASE_PRODUCTLINE PL on BO.WORK_CENTER_CODE = PL.WORK_CENTER_CODE
+                 LEFT JOIN C##AUCMA_SCADA.PRODUCT_OFFLINE PO ON PO.BOX_CODE = PB.MATERIAL_BARCODE
+        WHERE MC.MATERIAL_BARCODE = #{BOX_CODE}
+        ORDER BY MC.COMPLETE_DATE
+    </select>
+
 </mapper>

aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml

@@ -5,46 +5,61 @@
 <mapper namespace="com.aucma.report.mapper.ReportPointDnbMapper">
 
     <resultMap type="ReportPointDnb" id="ReportPointDnbResult">
-            <result property="objId"    column="obj_id"    />
-            <result property="monitorCode"    column="monitor_code"    />
-            <result property="instrumentValue"    column="instrument_value"    />
-            <result property="expend"    column="expend"    />
-            <result property="recordTime"    column="record_time"    />
-            <result property="beginTime"    column="begin_time"    />
-            <result property="endTime"    column="end_time"    />
-            <result property="isFlag"    column="is_flag"    />
-            <result property="createdBy"    column="created_by"    />
-            <result property="createdTime"    column="created_time"    />
-            <result property="updatedBy"    column="updated_by"    />
-            <result property="updatedTime"    column="updated_time"    />
+        <result property="objId" column="obj_id"/>
+        <result property="monitorCode" column="monitor_code"/>
+        <result property="monitorName" column="monitor_name"/>
+        <result property="instrumentValue" column="instrument_value"/>
+        <result property="expend" column="expend"/>
+        <result property="recordTime" column="record_time"/>
+        <result property="beginTime" column="begin_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="isFlag" column="is_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
     </resultMap>
 
     <sql id="selectReportPointDnbVo">
-        select obj_id, monitor_code, instrument_value, expend, record_time, begin_time, end_time, is_flag, created_by, created_time, updated_by, updated_time from report_point_dnb
+        select rpd.obj_id,
+               rpd.monitor_code,
+               bm.MONITOR_NAME,
+               rpd.instrument_value,
+               rpd.expend,
+               rpd.record_time,
+               rpd.begin_time,
+               rpd.end_time,
+               rpd.is_flag,
+               rpd.created_by,
+               rpd.created_time,
+               rpd.updated_by,
+               rpd.updated_time
+        from report_point_dnb rpd
+                 left join BASE_MONITORINFO bm on bm.MONITOR_CODE = rpd.MONITOR_CODE
     </sql>
 
     <select id="selectReportPointDnbList" parameterType="ReportPointDnb" resultMap="ReportPointDnbResult">
         <include refid="selectReportPointDnbVo"/>
         <where>
-                        <if test="objId != null "> and obj_id = #{objId}</if>
-                        <if test="monitorCode != null  and monitorCode != ''"> and monitor_code = #{monitorCode}</if>
-                        <if test="instrumentValue != null "> and instrument_value = #{instrumentValue}</if>
-                        <if test="expend != null "> and expend = #{expend}</if>
-                        <if test="recordTime != null  and recordTime != ''"> and record_time = #{recordTime}</if>
-                        <if test="beginTime != null  and beginTime != ''"> and begin_time = #{beginTime}</if>
-                        <if test="endTime != null  and endTime != ''"> and end_time = #{endTime}</if>
-                        <if test="isFlag != null "> and is_flag = #{isFlag}</if>
-                        <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
-                        <if test="createdTime != null "> and created_time = #{createdTime}</if>
-                        <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
-                        <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
+            <if test="objId != null ">and rpd.obj_id = #{objId}</if>
+            <if test="monitorCode != null  and monitorCode != ''">and rpd.monitor_code = #{monitorCode}</if>
+            <if test="instrumentValue != null ">and rpd.instrument_value = #{instrumentValue}</if>
+            <if test="expend != null ">and rpd.expend = #{expend}</if>
+            <if test="recordTime != null  and recordTime != ''">and rpd.record_time = #{recordTime}</if>
+            <if test="beginTime != null  and beginTime != ''">and rpd.begin_time = #{beginTime}</if>
+            <if test="endTime != null  and endTime != ''">and rpd.end_time = #{endTime}</if>
+            <if test="isFlag != null ">and rpd.is_flag = #{isFlag}</if>
+            <if test="createdBy != null  and createdBy != ''">and rpd.created_by = #{createdBy}</if>
+            <if test="createdTime != null ">and rpd.created_time = #{createdTime}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and rpd.updated_by = #{updatedBy}</if>
+            <if test="updatedTime != null ">and rpd.updated_time = #{updatedTime}</if>
         </where>
-        order by OBJ_ID
+        order by rpd.OBJ_ID
     </select>
 
     <select id="selectReportPointDnbByObjId" parameterType="Long" resultMap="ReportPointDnbResult">
-            <include refid="selectReportPointDnbVo"/>
-            where obj_id = #{objId}
+        <include refid="selectReportPointDnbVo"/>
+        where rpd.obj_id = #{objId}
     </select>
 
     <insert id="insertReportPointDnb" parameterType="ReportPointDnb">
@@ -53,55 +68,57 @@
         </selectKey>
         insert into report_point_dnb
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="objId != null">obj_id,</if>
-                <if test="monitorCode != null">monitor_code,</if>
-                <if test="instrumentValue != null">instrument_value,</if>
-                <if test="expend != null">expend,</if>
-                <if test="recordTime != null">record_time,</if>
-                <if test="beginTime != null">begin_time,</if>
-                <if test="endTime != null">end_time,</if>
-                <if test="isFlag != null">is_flag,</if>
-                <if test="createdBy != null">created_by,</if>
-                <if test="createdTime != null">created_time,</if>
-                <if test="updatedBy != null">updated_by,</if>
-                <if test="updatedTime != null">updated_time,</if>
+            <if test="objId != null">obj_id,</if>
+            <if test="monitorCode != null">monitor_code,</if>
+            <if test="instrumentValue != null">instrument_value,</if>
+            <if test="expend != null">expend,</if>
+            <if test="recordTime != null">record_time,</if>
+            <if test="beginTime != null">begin_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="isFlag != null">is_flag,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updatedBy != null">updated_by,</if>
+            <if test="updatedTime != null">updated_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="objId != null">#{objId},</if>
-                <if test="monitorCode != null">#{monitorCode},</if>
-                <if test="instrumentValue != null">#{instrumentValue},</if>
-                <if test="expend != null">#{expend},</if>
-                <if test="recordTime != null">#{recordTime},</if>
-                <if test="beginTime != null">#{beginTime},</if>
-                <if test="endTime != null">#{endTime},</if>
-                <if test="isFlag != null">#{isFlag},</if>
-                <if test="createdBy != null">#{createdBy},</if>
-                <if test="createdTime != null">#{createdTime},</if>
-                <if test="updatedBy != null">#{updatedBy},</if>
-                <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="objId != null">#{objId},</if>
+            <if test="monitorCode != null">#{monitorCode},</if>
+            <if test="instrumentValue != null">#{instrumentValue},</if>
+            <if test="expend != null">#{expend},</if>
+            <if test="recordTime != null">#{recordTime},</if>
+            <if test="beginTime != null">#{beginTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="isFlag != null">#{isFlag},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updatedBy != null">#{updatedBy},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
         </trim>
     </insert>
 
     <update id="updateReportPointDnb" parameterType="ReportPointDnb">
         update report_point_dnb
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="monitorCode != null">monitor_code = #{monitorCode},</if>
-                    <if test="instrumentValue != null">instrument_value = #{instrumentValue},</if>
-                    <if test="expend != null">expend = #{expend},</if>
-                    <if test="recordTime != null">record_time = #{recordTime},</if>
-                    <if test="beginTime != null">begin_time = #{beginTime},</if>
-                    <if test="endTime != null">end_time = #{endTime},</if>
-                    <if test="isFlag != null">is_flag = #{isFlag},</if>
-                    <if test="createdBy != null">created_by = #{createdBy},</if>
-                    <if test="createdTime != null">created_time = #{createdTime},</if>
-                    <if test="updatedBy != null">updated_by = #{updatedBy},</if>
-                    <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="monitorCode != null">monitor_code = #{monitorCode},</if>
+            <if test="instrumentValue != null">instrument_value = #{instrumentValue},</if>
+            <if test="expend != null">expend = #{expend},</if>
+            <if test="recordTime != null">record_time = #{recordTime},</if>
+            <if test="beginTime != null">begin_time = #{beginTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="isFlag != null">is_flag = #{isFlag},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updatedBy != null">updated_by = #{updatedBy},</if>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
         </trim>
         where obj_id = #{objId}
     </update>
 
     <delete id="deleteReportPointDnbByObjId" parameterType="Long">
-        delete from report_point_dnb where obj_id = #{objId}
+        delete
+        from report_point_dnb
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteReportPointDnbByObjIds" parameterType="String">

aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml

@@ -143,7 +143,6 @@
             <if test="isFlag != null">is_flag,</if>
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
-            <if test="updatedTime != null">updated_time,</if>
             <if test="stationCode != null">STATION_CODE,</if>
             <if test="submitQualtyId != null">SUBMINT_QUALTY_ID,</if>
         </trim>