1 设备数据 增加 标检结果 字段

zhmes-agecal-system/src/main/java/com/zehong/system/domain/PalletDeviceBinding.java

@@ -190,6 +190,11 @@ public class PalletDeviceBinding extends BaseEntity
      */
     private String productStandardInspectionNumber;
 
+    /** 标检结果
+     * 1 合格
+     * 0 不合格
+     * */
+    private String standardInspectResult;
     /**
      * 第一个解绑的设备编号
      * 这个字段就是为了区分第一个解绑的设备编号标志，如果是的话，则 需要存 历史，上传MES，生成 标检 质检 等。
@@ -501,6 +506,14 @@ public class PalletDeviceBinding extends BaseEntity
         this.productStandardInspectionNumber = productStandardInspectionNumber;
     }
 
+    public String getStandardInspectResult() {
+        return standardInspectResult;
+    }
+
+    public void setStandardInspectResult(String standardInspectResult) {
+        this.standardInspectResult = standardInspectResult;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -544,6 +557,7 @@ public class PalletDeviceBinding extends BaseEntity
                 .append("updateBy", getUpdateBy())
                 .append("calibrationUnbindStatus", getCalibrationUnbindStatus())
                 .append("productStandardInspectionNumber", getProductStandardInspectionNumber())
+                .append("standardInspectResult", getStandardInspectResult())
                 .toString();
     }
 }

zhmes-agecal-system/src/main/java/com/zehong/system/domain/PalletDeviceUploadFailure.java

@@ -156,6 +156,9 @@ public class PalletDeviceUploadFailure extends BaseEntity
     @Excel(name = "标检单号")
     private String productStandardInspectionNumber;
 
+    /** 标检结果 */
+    private String standardInspectResult;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -470,6 +473,14 @@ public class PalletDeviceUploadFailure extends BaseEntity
         this.productStandardInspectionNumber = productStandardInspectionNumber;
     }
 
+    public String getStandardInspectResult() {
+        return standardInspectResult;
+    }
+
+    public void setStandardInspectResult(String standardInspectResult) {
+        this.standardInspectResult = standardInspectResult;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -509,6 +520,7 @@ public class PalletDeviceUploadFailure extends BaseEntity
             .append("networkStatus", getNetworkStatus())
             .append("trayCode", getTrayCode())
             .append("productStandardInspectionNumber", getProductStandardInspectionNumber())
+            .append("standardInspectResult", getStandardInspectResult())
             .toString();
     }
 }

zhmes-agecal-system/src/main/java/com/zehong/system/domain/PalletDeviceUploadHistory.java

@@ -171,6 +171,9 @@ public class PalletDeviceUploadHistory extends BaseEntity
     /** 产品标准检验编号 */
     @Excel(name = "标检单号")
     private String productStandardInspectionNumber;
+
+    /** 标检结果 */
+    private String standardInspectResult;
     public void setId(Long id)
     {
         this.id = id;
@@ -474,6 +477,14 @@ public class PalletDeviceUploadHistory extends BaseEntity
         this.productStandardInspectionNumber = productStandardInspectionNumber;
     }
 
+    public String getStandardInspectResult() {
+        return standardInspectResult;
+    }
+
+    public void setStandardInspectResult(String standardInspectResult) {
+        this.standardInspectResult = standardInspectResult;
+    }
+
     @Override
     public String toString() {
         return "PalletDeviceUploadHistory{" +
@@ -512,6 +523,7 @@ public class PalletDeviceUploadHistory extends BaseEntity
                 ", simCardStatus=" + simCardStatus +
                 ", networkStatus=" + networkStatus +
                 ", productStandardInspectionNumber='" + productStandardInspectionNumber +
+                ", standardInspectResult='" + standardInspectResult +
                 '}';
     }
 }

zhmes-agecal-system/src/main/java/com/zehong/system/netty/event/CalibrationResultEventHandler.java

@@ -109,6 +109,9 @@ public class CalibrationResultEventHandler {
         // 阶段四：根据顺序号更新设备
         updateDevicesBySequence(palletDeviceBindings, deviceDataList);
 
+        // 阶段五：处理设备的 最终标定状态 根据所有结果 获取最终标定状态
+        updateFinalStatus(palletDeviceBindings);
+
         // 批量更新
         palletDeviceBindingService.batchUpdateAdAndStatus(palletDeviceBindings);
 
@@ -121,6 +124,38 @@ public class CalibrationResultEventHandler {
         return palletDeviceBindings;
     }
 
+    private void updateFinalStatus(List<PalletDeviceBinding> palletDeviceBindings) {
+
+        // deviceStatus = 1,3,4; 设备状态
+        // writeTimeStatus 写时间状态
+        // runTimeStatus 时间运行状态
+        // realTimeStatus 实时AD状态
+        // calibrationConcentrationStatus 标定浓度状态
+        // writeSelfCheckStatus 写自检状态
+        // relayStatus 继电器状态
+        // pulseStatus 脉冲状态
+        // moduleStatus 模块状态
+        // simCardStatus 串口状态
+        for (PalletDeviceBinding palletDeviceBinding : palletDeviceBindings) {
+            if(("1".equals(palletDeviceBinding.getDeviceStatus())
+            || "3".equals(palletDeviceBinding.getDeviceStatus())
+            || "4".equals(palletDeviceBinding.getDeviceStatus()))
+            && "1".equals(palletDeviceBinding.getWriteTimeStatus())
+            && "1".equals(palletDeviceBinding.getRunTimeStatus())
+            && "1".equals(palletDeviceBinding.getRealTimeStatus())
+            && "4".equals(palletDeviceBinding.getCalibrationConcentrationStatus())
+            && palletDeviceBinding.getWriteSelfCheckStatus() == 1
+            && palletDeviceBinding.getRelayStatus() == 1
+            && palletDeviceBinding.getPulseStatus() == 1
+            && palletDeviceBinding.getModuleStatus() == 1
+            && palletDeviceBinding.getSimCardStatus() == 1
+            && palletDeviceBinding.getNetworkStatus() == 1) {
+                palletDeviceBinding.setStandardInspectResult("1");
+            } else {
+                palletDeviceBinding.setStandardInspectResult("0");
+            }
+        }
+    }
 
     /**
      * 阶段一：解析托盘号

zhmes-agecal-system/src/main/resources/mapper/system/PalletDeviceBindingMapper.xml

@@ -46,6 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="calibrationUnbindStatus"    column="f_calibration_unbind_status"    />
         <result property="productStandardInspectionNumber"    column="f_product_standard_inspection_number"    />
+        <result property="standardInspectResult"    column="f_standard_inspect_result"    />
+
 
     </resultMap>
 
@@ -86,7 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_sim_card_status,
                palDeviceBinding.f_network_status,
                palDeviceBinding.f_calibration_unbind_status,
-               palDeviceBinding.f_product_standard_inspection_number
+               palDeviceBinding.f_product_standard_inspection_number,
+               palDeviceBinding.f_standard_inspect_result
         from t_pallet_device_binding palDeviceBinding
         left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
     </sql>
@@ -126,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null "> and palDeviceBinding.f_create_time = #{createTime}</if>
             <if test="deviceStatus != null and deviceStatus != '' "> and palDeviceBinding.f_device_status = #{deviceStatus}</if>
             <if test="productStandardInspectionNumber != null and productStandardInspectionNumber != '' "> and palDeviceBinding.f_product_standard_inspection_number = #{productStandardInspectionNumber}</if>
+             <if test="standardInspectResult != null and standardInspectResult != '' "> and palDeviceBinding.f_standard_inspect_result = #{standardInspectResult}</if>
         </where>
         order by trayInfo.f_tray_code ,palDeviceBinding.f_number asc
     </select>
@@ -179,7 +183,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                f_sim_card_status,
                f_network_status,
                f_calibration_unbind_status,
-               f_product_standard_inspection_number
+               f_product_standard_inspection_number,
+               f_standard_inspect_result
         from t_pallet_device_binding palDeviceBinding where palDeviceBinding.f_tray_id = (
                     SELECT
                         trayInfo.f_tray_id
@@ -252,7 +257,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_module_status = null,
             f_sim_card_status = null,
             f_network_status = null,
-            f_product_standard_inspection_number = null
+            f_product_standard_inspection_number = null,
+            f_standard_inspect_result = null
         where f_tray_id = #{trayId}
     </update>
     <insert id="insertPalletDeviceBinding" parameterType="PalletDeviceBinding" useGeneratedKeys="true" keyProperty="palletDeviceBindingId">
@@ -316,7 +322,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_module_status = null,
             f_sim_card_status = null,
             f_network_status = null,
-            f_product_standard_inspection_number = null
+            f_product_standard_inspection_number = null,
+            f_standard_inspect_result = null
         where f_pallet_device_binding_id = #{palletDeviceBindingId}
     </update>
     <update id="updatePalletDeviceBinding" parameterType="PalletDeviceBinding">
@@ -359,6 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="simCardStatus != null">f_sim_card_status = #{simCardStatus},</if>
             <if test="networkStatus != null">f_network_status = #{networkStatus},</if>
             <if test="productStandardInspectionNumber != null">f_product_standard_inspection_number = #{productStandardInspectionNumber},</if>
+            <if test="standardInspectResult != null">f_standard_inspect_result = #{standardInspectResult},</if>
         </trim>
         where f_pallet_device_binding_id = #{palletDeviceBindingId} and f_motherboard_code is not null
     </update>
@@ -382,6 +390,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="item.calibrationAdStatus != null">f_calibration_status = #{item.calibrationAdStatus},</if>
                 <if test="item.calibrationConcentration != null">f_calibration_concentration = #{item.calibrationConcentration},</if>
                 <if test="item.calibrationConcentrationStatus != null">f_calibration_concentration_status = #{item.calibrationConcentrationStatus},</if>
+                <if test="item.standardInspectResult != null">f_standard_inspect_result = #{item.standardInspectResult},</if>
             </trim>
             where f_pallet_device_binding_id = #{item.palletDeviceBindingId} and f_motherboard_code is not null
         </foreach>
@@ -417,7 +426,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 f_sim_card_status = null,
                 f_network_status = null,
                 f_calibration_unbind_status = '0',
-                f_product_standard_inspection_number = null
+                f_product_standard_inspection_number = null,
+                f_standard_inspect_result = null
                 <choose>
                     <when test="item.motherboardCode != null">
                         , f_motherboard_code = #{item.motherboardCode}
@@ -457,7 +467,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_sim_card_status = null,
             f_network_status = null,
             f_calibration_unbind_status = null,
-            f_product_standard_inspection_number = null
+            f_product_standard_inspection_number = null,
+            f_standard_inspect_result = null
         where f_tray_id = #{trayId}
     </update>
 

zhmes-agecal-system/src/main/resources/mapper/system/PalletDeviceUploadFailureMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="simCardStatus"    column="f_sim_card_status"    />
         <result property="networkStatus"    column="f_network_status"    />
         <result property="productStandardInspectionNumber"    column="f_product_standard_inspection_number"    />
+        <result property="standardInspectResult"    column="f_standard_inspect_result"    />
     </resultMap>
 
     <sql id="selectPalletDeviceUploadFailureVo">
@@ -78,7 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_module_status,
                palDeviceBinding.f_sim_card_status,
                palDeviceBinding.f_network_status,
-               palDeviceBinding.f_product_standard_inspection_number
+               palDeviceBinding.f_product_standard_inspection_number,
+               palDeviceBinding.f_standard_inspect_result
         from t_pallet_device_upload_failure palDeviceBinding
         left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
     </sql>
@@ -119,7 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moduleStatus != null "> and f_module_status = #{moduleStatus}</if>
             <if test="simCardStatus != null "> and f_sim_card_status = #{simCardStatus}</if>
             <if test="networkStatus != null "> and f_network_status = #{networkStatus}</if>
-             <if test="productStandardInspectionNumber != null  and productStandardInspectionNumber != ''"> and f_product_standard_inspection_number = #{productStandardInspectionNumber}</if>
+            <if test="productStandardInspectionNumber != null  and productStandardInspectionNumber != ''"> and f_product_standard_inspection_number like concat('%',#{productStandardInspectionNumber},'%') </if>
+            <if test="standardInspectResult != null  and standardInspectResult != ''"> and f_standard_inspect_result = #{standardInspectResult}</if>
         </where>
     </select>
 
@@ -163,7 +166,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_module_status,
             f_sim_card_status,
             f_network_status,
-            f_product_standard_inspection_number
+            f_product_standard_inspection_number,
+            f_standard_inspect_result
         </trim>
         values
         <foreach collection="list" item="item" separator=",">
@@ -201,7 +205,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.moduleStatus},
                 #{item.simCardStatus},
                 #{item.networkStatus},
-                #{item.productStandardInspectionNumber}
+                #{item.productStandardInspectionNumber},
+                #{item.standardInspectResult}
             </trim>
         </foreach>
     </insert>
@@ -241,7 +246,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_module_status,
             f_sim_card_status,
             f_network_status,
-            f_product_standard_inspection_number
+            f_product_standard_inspection_number,
+            f_standard_inspect_result
         </trim>
         values
         <foreach collection="list" item="item" separator=",">
@@ -279,7 +285,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.moduleStatus},
                 #{item.simCardStatus},
                 #{item.networkStatus},
-                #{item.productStandardInspectionNumber}
+                #{item.productStandardInspectionNumber},
+                #{item.standardInspectResult}
             </trim>
         </foreach>
     </insert>
@@ -320,6 +327,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="simCardStatus != null">f_sim_card_status,</if>
             <if test="networkStatus != null">f_network_status,</if>
             <if test="productStandardInspectionNumber != null">f_product_standard_inspection_number,</if>
+            <if test="standardInspectResult != null">f_standard_inspect_result,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="trayId != null">#{trayId},</if>
@@ -356,6 +364,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="simCardStatus != null">#{simCardStatus},</if>
             <if test="networkStatus != null">#{networkStatus},</if>
             <if test="productStandardInspectionNumber != null">#{productStandardInspectionNumber},</if>
+            <if test="standardInspectResult != null">#{standardInspectResult},</if>
          </trim>
     </insert>
 
@@ -396,6 +405,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="simCardStatus != null">f_sim_card_status = #{simCardStatus},</if>
             <if test="networkStatus != null">f_network_status = #{networkStatus},</if>
             <if test="productStandardInspectionNumber != null">f_product_standard_inspection_number = #{productStandardInspectionNumber},</if>
+            <if test="standardInspectResult != null">f_standard_inspect_result = #{standardInspectResult},</if>
         </trim>
         where f_id = #{id}
     </update>

zhmes-agecal-system/src/main/resources/mapper/system/PalletDeviceUploadHistoryMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="simCardStatus"    column="f_sim_card_status"    />
         <result property="networkStatus"    column="f_network_status"    />
         <result property="productStandardInspectionNumber"    column="f_product_standard_inspection_number"    />
+        <result property="standardInspectResult"    column="f_standard_inspect_result"    />
     </resultMap>
 
     <sql id="selectPalletDeviceUploadHistoryVo">
@@ -80,7 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_module_status,
                palDeviceBinding.f_sim_card_status,
                palDeviceBinding.f_network_status,
-               palDeviceBinding.f_product_standard_inspection_number
+               palDeviceBinding.f_product_standard_inspection_number,
+               palDeviceBinding.f_standard_inspect_result
         from t_pallet_device_upload_history palDeviceBinding
                  left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
     </sql>
@@ -90,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="motherboardCode != null  and motherboardCode != ''"> and palDeviceBinding.f_motherboard_code like concat('%',#{motherboardCode},'%') </if>
             <if test="trayCode != null  and trayCode != ''"> and trayInfo.f_tray_code like concat('%',#{trayCode},'%') </if>
+            <if test="productStandardInspectionNumber != null  and productStandardInspectionNumber != ''"> and palDeviceBinding.f_product_standard_inspection_number like concat('%',#{productStandardInspectionNumber},'%') </if>
+            <if test="standardInspectResult != null  and standardInspectResult != ''"> and palDeviceBinding.f_standard_inspect_result = #{standardInspectResult}</if>
+
         </where>
     </select>
 
@@ -134,7 +139,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_module_status,
             f_sim_card_status,
             f_network_status,
-            f_product_standard_inspection_number
+            f_product_standard_inspection_number,
+            f_standard_inspect_result
         </trim>
         values
         <foreach collection="list" item="item" separator=",">
@@ -172,7 +178,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.moduleStatus},
                 #{item.simCardStatus},
                 #{item.networkStatus},
-                #{item.productStandardInspectionNumber}
+                #{item.productStandardInspectionNumber},
+                #{item.standardInspectResult}
             </trim>
         </foreach>
     </insert>
@@ -213,7 +220,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_module_status,
             f_sim_card_status,
             f_network_status,
-            f_product_standard_inspection_number
+            f_product_standard_inspection_number,
+            f_standard_inspect_result
         </trim>
         values
         <foreach collection="list" item="item" separator=",">
@@ -251,7 +259,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.moduleStatus},
                 #{item.simCardStatus},
                 #{item.networkStatus},
-                #{item.productStandardInspectionNumber}
+                #{item.productStandardInspectionNumber},
+                #{item.standardInspectResult}
             </trim>
         </foreach>
     </insert>
@@ -283,16 +292,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="runTimeStatus != null">f_run_time_status,</if>
             <if test="realTimeAd != null">f_real_time_ad,</if>
             <if test="realTimeStatus != null">f_real_time_ad_status,</if>
-            <if test="calibrationConcentration != null">#{calibrationConcentration},</if>
-            <if test="calibrationConcentrationStatus != null">#{calibrationConcentrationStatus},</if>
-
-            <if test="writeSelfCheckStatus != null">#{writeSelfCheckStatus},</if>
-            <if test="relayStatus != null">#{relayStatus},</if>
-            <if test="pulseStatus != null">#{pulseStatus},</if>
-            <if test="moduleStatus != null">#{moduleStatus},</if>
-            <if test="simCardStatus != null">#{simCardStatus},</if>
-            <if test="networkStatus != null">#{networkStatus},</if>
-            <if test="productStandardInspectionNumber != null">#{productStandardInspectionNumber}</if>
+            <if test="calibrationConcentration != null">f_calibration_concentration,</if>
+            <if test="calibrationConcentrationStatus != null">f_calibration_concentration_status,</if>
+            <if test="writeSelfCheckStatus != null">f_write_self_check_status,</if>
+            <if test="relayStatus != null">f_relay_status,</if>
+            <if test="pulseStatus != null">f_pulse_status,</if>
+            <if test="moduleStatus != null">f_module_status,</if>
+            <if test="simCardStatus != null">f_sim_card_status,</if>
+            <if test="networkStatus != null">f_network_status,</if>
+            <if test="productStandardInspectionNumber != null">f_product_standard_inspection_number,</if>
+            <if test="standardInspectResult != null">f_standard_inspect_result,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="trayId != null">#{trayId},</if>
@@ -330,6 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="simCardStatus != null">#{simCardStatus},</if>
             <if test="networkStatus != null">#{networkStatus},</if>
             <if test="productStandardInspectionNumber != null">#{productStandardInspectionNumber}</if>
+            <if test="standardInspectResult != null">#{standardInspectResult}</if>
          </trim>
     </insert>
 
@@ -371,7 +381,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="simCardStatus != null">f_sim_card_status = #{simCardStatus},</if>
             <if test="networkStatus != null">f_network_status = #{networkStatus},</if>
             <if test="productStandardInspectionNumber != null">f_product_standard_inspection_number = #{productStandardInspectionNumber}</if>
-
+            <if test="standardInspectResult != null">f_standard_inspect_result = #{standardInspectResult}</if>
         </trim>
         where f_id = #{id}
     </update>

zhmes-agecal-web/src/views/palletDeviceUploadFailure/index.vue

@@ -22,12 +22,22 @@
       <el-form-item label="标检单号" prop="productStandardInspectionNumber">
         <el-input
           v-model="queryParams.productStandardInspectionNumber"
-          placeholder="请输入托盘编号"
+          placeholder="请输入标检单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="标检结果" prop="standardInspectResult">
+        <el-select v-model="queryParams.standardInspectResult" placeholder="请选择">
+          <el-option
+            v-for="item in standardInspectResultOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -72,6 +82,12 @@
           <span>{{ parseTime(scope.row.bindingTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="标检结果" align="center" width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.standardInspectResult === '1'" class="write-success">合格</span>
+          <span v-else class="write-failed">不合格</span>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="deviceStatus" >
         <template slot-scope="scope">
           <el-tag type="info" v-if="scope.row.deviceStatus === '0'">预热</el-tag>
@@ -229,7 +245,15 @@ export default {
         trayId: [
           { required: true, message: "托盘id不能为空", trigger: "blur" }
         ],
-      }
+      },
+
+      standardInspectResultOptions: [{
+        value: '1',
+        label: '合格'
+      }, {
+        value: '0',
+        label: '不合格'
+      }],
     };
   },
   created() {
@@ -379,3 +403,16 @@ export default {
   }
 };
 </script>
+
+<style>
+
+.write-success {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+.write-failed {
+  color: #f56c6c;
+  font-weight: bold;
+}
+</style>

zhmes-agecal-web/src/views/palletDeviceUploadHistory/index.vue

@@ -22,12 +22,22 @@
       <el-form-item label="标检单号" prop="productStandardInspectionNumber">
         <el-input
           v-model="queryParams.productStandardInspectionNumber"
-          placeholder="请输入托盘编号"
+          placeholder="请输入标检单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="标检结果" prop="standardInspectResult">
+        <el-select v-model="queryParams.standardInspectResult" placeholder="请选择">
+          <el-option
+            v-for="item in standardInspectResultOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -62,6 +72,12 @@
           <span>{{ parseTime(scope.row.bindingTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="标检结果" align="center" width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.standardInspectResult === '1'" class="write-success">合格</span>
+          <span v-else class="write-failed">不合格</span>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="deviceStatus" >
         <template slot-scope="scope">
           <el-tag type="info" v-if="scope.row.deviceStatus === '0'">预热</el-tag>
@@ -335,8 +351,17 @@ export default {
         concentration: null,
         runTimeStatus: null,
         realTimeAd: null,
-        realTimeStatus: null
+        realTimeStatus: null,
+        standardInspectResult: null
       },
+
+      standardInspectResultOptions: [{
+        value: '1',
+        label: '合格'
+      }, {
+        value: '0',
+        label: '不合格'
+      }],
       // 表单参数
       form: {},
       // 表单校验
@@ -533,3 +558,15 @@ export default {
   }
 };
 </script>
+<style>
+
+.write-success {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+.write-failed {
+  color: #f56c6c;
+  font-weight: bold;
+}
+</style>

zhmes-agecal-web/src/views/screen/components/RealTimeData.vue

@@ -85,6 +85,12 @@
               <div class="device-code">{{ scope.row.bindingTime ? formatDate(scope.row.bindingTime) : '-' }}</div>
             </template>
           </el-table-column>
+          <el-table-column label="标检结果" align="center" width="120">
+            <template slot-scope="scope">
+              <span v-if="scope.row.standardInspectResult === '1'" class="write-success">合格</span>
+              <span v-else class="write-failed">不合格</span>
+            </template>
+          </el-table-column>
           <el-table-column label="状态" align="center" width="120">
             <template slot-scope="scope">
               <el-tag