change - 测温记录报表、补打条码记录报表优化

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

@@ -93,7 +93,7 @@
         from base_deviceledger
     </select>
 
-    <insert id="insertBaseDeviceledger" parameterType="BaseDeviceledger">
+    <insert id="insertBaseDeviceLedger" parameterType="baseDeviceLedger">
         <selectKey keyProperty="objId" resultType="long" order="BEFORE">
             SELECT seq_base_deviceledger.NEXTVAL as objId FROM DUAL
         </selectKey>
@@ -144,7 +144,7 @@
         </trim>
     </insert>
 
-    <update id="updateBaseDeviceledger" parameterType="BaseDeviceledger">
+    <update id="updateBaseDeviceLedger" parameterType="baseDeviceLedger">
         update base_deviceledger
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>

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

@@ -67,16 +67,6 @@ public class PrintSupplementBarCodeController extends BaseController {
         return success(printSupplementBarCodeService.selectPrintSupplementBarCodeByObjId(objId));
     }
 
-    /**
-     * 新增补打条码记录
-     */
-    @PreAuthorize("@ss.hasPermi('report:supplementBarCode:add')")
-    @Log(title = "补打条码记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PrintSupplementBarCode printSupplementBarCode) {
-        return toAjax(printSupplementBarCodeService.insertPrintSupplementBarCode(printSupplementBarCode));
-    }
-
     /**
      * 修改补打条码记录
      */

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

@@ -181,6 +181,16 @@ public class BoxTemperatureHistory extends BaseEntity {
     @Excel(name = "供电频率")
     private Long frequency;
 
+    private String productLineCode;
+
+    public String getProductLineCode() {
+        return productLineCode;
+    }
+
+    public void setProductLineCode(String productLineCode) {
+        this.productLineCode = productLineCode;
+    }
+
     public void setObjId(Long objId) {
         this.objId = objId;
     }

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

@@ -3,6 +3,7 @@ package com.aucma.report.domain;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.aucma.common.annotation.Excel;
@@ -123,6 +124,20 @@ public class PerfusionRecord extends BaseEntity {
     @Excel(name = "灌注完成状态字")
     private String finishStatus;
 
+    /**
+     * 产线编号
+     */
+    @Excel(name = "产线编号")
+    private String PRODUCT_LINE_CODE;
+
+    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 void setObjId(Long objId) {
         this.objId = objId;
     }

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

@@ -84,6 +84,16 @@ public class PrintSupplementBarCode extends BaseEntity {
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date recordTime;
 
+    private String productLineCode;
+
+    public String getProductLineCode() {
+        return productLineCode;
+    }
+
+    public void setProductLineCode(String productLineCode) {
+        this.productLineCode = productLineCode;
+    }
+
     public Date getRecordTime() {
         return recordTime;
     }

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

@@ -27,14 +27,6 @@ public interface PrintSupplementBarCodeMapper {
      */
     public List<PrintSupplementBarCode> selectPrintSupplementBarCodeList(PrintSupplementBarCode printSupplementBarCode);
 
-    /**
-     * 新增补打条码记录
-     *
-     * @param printSupplementBarCode 补打条码记录
-     * @return 结果
-     */
-    public int insertPrintSupplementBarCode(PrintSupplementBarCode printSupplementBarCode);
-
     /**
      * 修改补打条码记录
      *

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

@@ -27,14 +27,6 @@ public interface IPrintSupplementBarCodeService {
      */
     public List<PrintSupplementBarCode> selectPrintSupplementBarCodeList(PrintSupplementBarCode printSupplementBarCode);
 
-    /**
-     * 新增补打条码记录
-     *
-     * @param printSupplementBarCode 补打条码记录
-     * @return 结果
-     */
-    public int insertPrintSupplementBarCode(PrintSupplementBarCode printSupplementBarCode);
-
     /**
      * 修改补打条码记录
      *

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

@@ -41,17 +41,6 @@ public class PrintSupplementBarCodeServiceImpl implements IPrintSupplementBarCod
         return printSupplementBarCodeMapper.selectPrintSupplementBarCodeList(printSupplementBarCode);
     }
 
-    /**
-     * 新增补打条码记录
-     *
-     * @param printSupplementBarCode 补打条码记录
-     * @return 结果
-     */
-    @Override
-    public int insertPrintSupplementBarCode(PrintSupplementBarCode printSupplementBarCode) {
-        return printSupplementBarCodeMapper.insertPrintSupplementBarCode(printSupplementBarCode);
-    }
-
     /**
      * 修改补打条码记录
      *

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

@@ -33,6 +33,7 @@
         <result property="lowvoltage" column="lowvoltage"/>
         <result property="syncDatetime" column="sync_datetime"/>
         <result property="frequency" column="frequency"/>
+        <result property="productLineCode" column="PRODUCT_LINE_CODE"/>
     </resultMap>
 
     <sql id="selectBoxTemperatureHistoryVo">
@@ -63,7 +64,8 @@
                lowv_powerfact,
                lowvoltage,
                sync_datetime,
-               frequency
+               frequency,
+               PRODUCT_LINE_CODE
         from C##AUCMA_SCADA.box_temperaturehistory
     </sql>
 
@@ -100,6 +102,7 @@
             <if test="lowvoltage != null ">and lowvoltage = #{lowvoltage}</if>
             <if test="syncDatetime != null ">and sync_datetime = #{syncDatetime}</if>
             <if test="frequency != null ">and frequency = #{frequency}</if>
+            <if test="productLineCode != null ">and PRODUCT_LINE_CODE = #{productLineCode}</if>
         </where>
         order by enddatetime DESC
     </select>

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

@@ -22,6 +22,7 @@
         <result property="perfusionResult" column="perfusion_result"/>
         <result property="yield" column="yield"/>
         <result property="finishStatus" column="finish_status"/>
+        <result property="PRODUCT_LINE_CODE" column="PRODUCT_LINE_CODE"/>
     </resultMap>
 
     <sql id="selectPerfusionRecordVo">
@@ -41,7 +42,8 @@
                updated_time,
                perfusion_result,
                yield,
-               finish_status
+               finish_status,
+               PRODUCT_LINE_CODE
         from perfusion_record
     </sql>
 
@@ -65,6 +67,7 @@
             </if>
             <if test="perfusionR != null  and perfusionR != ''">and perfusion_r = #{perfusionR}</if>
             <if test="perfusionL != null  and perfusionL != ''">and perfusion_l = #{perfusionL}</if>
+            <if test="PRODUCT_LINE_CODE != null  and PRODUCT_LINE_CODE != ''">and PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}</if>
             <if test="perfusionDuration != null  and perfusionDuration != ''">and perfusion_duration =
                 #{perfusionDuration}
             </if>

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

@@ -17,6 +17,7 @@
         <result property="printReason" column="print_reason"/>
         <result property="recordTime" column="record_time"/>
         <result property="createBy" column="create_by"/>
+        <result property="productLineCode" column="PRODUCT_LINE_CODE"/>
     </resultMap>
 
     <sql id="selectPrintSupplementBarCodeVo">
@@ -30,9 +31,11 @@
                PS.print_reason,
                PS.record_time,
                PS.create_by,
+               PB.PRODUCT_LINE_CODE,
                CASE WHEN PS.IS_PRINT = '1' THEN '已打印' ELSE '未打印' END    IS_PRINT
         FROM C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE PS
                  LEFT JOIN C##AUCMA_MES.BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = PS.MATERIAL_CODE
+                 LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = PS.MATERIAL_CODE
     </sql>
 
     <select id="selectPrintSupplementBarCodeList" parameterType="PrintSupplementBarCode"
@@ -56,6 +59,7 @@
                 '%')
             </if>
             <if test="isPrint != null  and isPrint != ''">and PS.is_print = #{isPrint}</if>
+            <if test="productLineCode != null  and productLineCode != ''">and PB.PRODUCT_LINE_CODE = #{productLineCode}</if>
         </where>
         ORDER BY PS.record_time DESC
     </select>
@@ -65,38 +69,6 @@
         where PS.obj_id = #{objId}
     </select>
 
-    <insert id="insertPrintSupplementBarCode" parameterType="PrintSupplementBarCode">
-        <selectKey keyProperty="objId" resultType="long" order="BEFORE">
-            SELECT seq_print_supplementbarcode.NEXTVAL as objId FROM DUAL
-        </selectKey>
-        insert into print_supplementbarcode
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="objId != null">obj_id,</if>
-            <if test="orderCode != null">order_code,</if>
-            <if test="materialCode != null">material_code,</if>
-            <if test="materialName != null">material_name,</if>
-            <if test="materialBarcode != null">material_barcode,</if>
-            <if test="printTime != null">print_time,</if>
-            <if test="printBartype != null">print_bartype,</if>
-            <if test="printName != null">print_name,</if>
-            <if test="isPrint != null">is_print,</if>
-            <if test="printReason != null">print_reason,</if>
-            <if test="createBy != null">create_by,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="objId != null">#{objId},</if>
-            <if test="orderCode != null">#{orderCode},</if>
-            <if test="materialCode != null">#{materialCode},</if>
-            <if test="materialName != null">#{materialName},</if>
-            <if test="materialBarcode != null">#{materialBarcode},</if>
-            <if test="printTime != null">#{printTime},</if>
-            <if test="printBartype != null">#{printBartype},</if>
-            <if test="printName != null">#{printName},</if>
-            <if test="isPrint != null">#{isPrint},</if>
-            <if test="printReason != null">#{printReason},</if>
-            <if test="createBy != null">#{createBy},</if>
-        </trim>
-    </insert>
 
     <update id="updatePrintSupplementBarCode" parameterType="PrintSupplementBarCode">
         update print_supplementbarcode

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

@@ -177,6 +177,7 @@
             <if test="MATERIAL_BARCODE != null">#{MATERIAL_BARCODE},</if>
             <if test="PRINT_BARTYPE != null">#{PRINT_BARTYPE},</if>
             <if test="PRINT_NAME != null">#{PRINT_NAME},</if>
+            <if test="print_reason != null">#{print_reason}</if>
             <if test="CREATE_BY != null">#{CREATE_BY},</if>
         </trim>
     </insert>