1 设备增加 板件类型 去判断 需不需要处理 网络信息调整。

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

@@ -202,6 +202,9 @@ public class PalletDeviceBinding extends BaseEntity
      * 3 两个都读
      * */
     private String readingMode;
+
+    /** 板件类型：1.主体 2.主板*/
+    private String plateType;
     /**
      * 第一个解绑的设备编号
      * 这个字段就是为了区分第一个解绑的设备编号标志，如果是的话，则 需要存 历史，上传MES，生成 标检 质检 等。
@@ -529,6 +532,14 @@ public class PalletDeviceBinding extends BaseEntity
         this.readingMode = readingMode;
     }
 
+    public String getPlateType() {
+        return plateType;
+    }
+
+    public void setPlateType(String plateType) {
+        this.plateType = plateType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -573,6 +584,7 @@ public class PalletDeviceBinding extends BaseEntity
                 .append("calibrationUnbindStatus", getCalibrationUnbindStatus())
                 .append("productStandardInspectionNumber", getProductStandardInspectionNumber())
                 .append("standardInspectResult", getStandardInspectResult())
+                .append("readingMode", getReadingMode())
                 .toString();
     }
 }

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

@@ -85,6 +85,10 @@ public class ProductStandardInspection extends BaseEntity
     @Excel(name = "读数方式", dictType = "reading_mode")
     private String readingMode;
 
+    /** 板件类型：1.主体 2.主板*/
+    @Excel(name = "板件类型")
+    private String plateType;
+
     /** 确认标检人 */
     @Excel(name = "确认标检人")
     private String confirmQualityInspector;
@@ -272,6 +276,14 @@ public class ProductStandardInspection extends BaseEntity
         this.readingMode = readingMode;
     }
 
+    public String getPlateType() {
+        return plateType;
+    }
+
+    public void setPlateType(String plateType) {
+        this.plateType = plateType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -297,6 +309,7 @@ public class ProductStandardInspection extends BaseEntity
             .append("alarmValue", getAlarmValue())
             .append("range", getRange())
             .append("readingMode", getReadingMode())
+            .append("plateType", getPlateType())
             .toString();
     }
 }

zhmes-agecal-system/src/main/java/com/zehong/system/task/AgingStageThreeProcessJob.java

@@ -191,6 +191,8 @@ public class AgingStageThreeProcessJob implements Job {
                 String readingMode = binding.getReadingMode();
                 // * 1  读继电器不读脉冲  * 2 读脉冲不读继电器 * 3 两个都读
 
+                String plateType = binding.getPlateType();
+
                 // 处理 继电器状态，脉冲状态，模组状态，SIM卡状态，网络状态
                 if(!"2".equals(readingMode)) {
                     if(result[10] == 1 && binding.getRelayStatus() == 0){
@@ -210,8 +212,11 @@ public class AgingStageThreeProcessJob implements Job {
                 if(result[13] == 1 && binding.getSimCardStatus() == 0){
                     binding.setSimCardStatus(1);
                 }
-                if(result[14] == 1 && binding.getNetworkStatus() == 0){
-                    binding.setNetworkStatus(1);
+
+                if("1".equals(plateType)) {
+                    if(result[14] == 1 && binding.getNetworkStatus() == 0){
+                        binding.setNetworkStatus(1);
+                    }
                 }
 
                 if("5".equals(binding.getDeviceStatus())) {

zhmes-agecal-system/src/main/java/com/zehong/system/task/AgingStageTwoProcessJob.java

@@ -194,6 +194,8 @@ public class AgingStageTwoProcessJob  implements Job {
                 int[] result = Modbus4jUtils.readDeviceWithRetry(ip, port, deviceId);
 
                 String readingMode = binding.getReadingMode();
+
+                String plateType = binding.getPlateType();
                 if(StringUtils.isBlank(readingMode)) {
                     readingMode = "3";
                 }
@@ -225,11 +227,15 @@ public class AgingStageTwoProcessJob  implements Job {
                 } else {
                     binding.setSimCardStatus(0);
                 }
-                if(result[14] == 1) {
-                    binding.setNetworkStatus(1);
-                } else {
-                    binding.setNetworkStatus(0);
+
+                if("1".equals(plateType)) {
+                    if(result[14] == 1) {
+                        binding.setNetworkStatus(1);
+                    } else {
+                        binding.setNetworkStatus(0);
+                    }
                 }
+
                //  重用之前的master连接进行写操作
                 master = Modbus4jUtils.createModbusMaster(ip, port);
                 // 2025 1231 根据状态去执行自检

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

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="standardInspectResult"    column="f_standard_inspect_result"    />
 
         <result property="readingMode" column="f_reading_mode"/>
+        <result property="plateType" column="f_plate_type"/>
 
     </resultMap>
 
@@ -90,9 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_network_status,
                palDeviceBinding.f_calibration_unbind_status,
                palDeviceBinding.f_product_standard_inspection_number,
-               palDeviceBinding.f_standard_inspect_result
+               palDeviceBinding.f_standard_inspect_result,
+               inspection.f_plate_type
         from t_pallet_device_binding palDeviceBinding
         left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
+        left join t_product_standard_inspection inspection
+                  on inspection.f_product_standard_inspection_number = palDeviceBinding.f_product_standard_inspection_number
     </sql>
 
     <select id="countErrorByTrayId" parameterType="Long" resultType="int">
@@ -186,7 +190,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_calibration_unbind_status,
                palDeviceBinding.f_product_standard_inspection_number,
                palDeviceBinding.f_standard_inspect_result,
-               inspection.f_reading_mode
+               inspection.f_reading_mode,
+               inspection.f_plate_type
         from t_pallet_device_binding palDeviceBinding
         left join t_product_standard_inspection inspection
         on inspection.f_product_standard_inspection_number = palDeviceBinding.f_product_standard_inspection_number

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

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="alarmValue"    column="f_alarm_value"    />
         <result property="range"    column="f_range"    />
         <result property="readingMode" column="f_reading_mode"/>
+        <result property="plateType" column="f_plate_type"/>
     </resultMap>
 
     <sql id="selectProductStandardInspectionVo">
@@ -34,7 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                f_confirm_quality_inspector, f_remarks, f_status, f_create_by, f_inspection_dep, f_create_time,
                f_delete_flag, f_material_name, f_material_code, f_specification, f_issued_num, f_quantity,
                f_qualified_num, f_un_qualified_num, f_aging_duration, f_calibration_gas, f_alarm_value, f_range ,
-               f_reading_mode
+               f_reading_mode,
+               case when  f_plate_type = '1' then '主板' else '主体' end as f_plate_type
         from t_product_standard_inspection
     </sql>
 
@@ -86,14 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_product_standard_inspection (f_product_standard_inspection_number, f_out_store_order_number,
         f_confirm_quality_inspector,f_remarks,f_status,f_create_by,f_inspection_dep,
         f_material_name,f_material_code,f_specification,f_issued_num,f_quantity,f_aging_duration,
-        f_calibration_gas,f_alarm_value,f_range,f_reading_mode)
+        f_calibration_gas,f_alarm_value,f_range,f_reading_mode,f_plate_type)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (
               #{item.productStandardInspectionNumber}, #{item.outStoreOrderNumber}, #{item.confirmQualityInspector},
               #{item.remarks}, #{item.status}, #{item.createBy}, #{item.inspectionDep}, #{item.materialName},
               #{item.materialCode}, #{item.specification}, #{item.issuedNum}, #{item.quantity}, #{item.agingDuration},
-              #{item.calibrationGas}, #{item.alarmValue}, #{item.range}, #{item.readingMode}
+              #{item.calibrationGas}, #{item.alarmValue}, #{item.range}, #{item.readingMode}, #{item.plateType}
             )
         </foreach>
     </insert>
@@ -121,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alarmValue != null">f_alarm_value,</if>
             <if test="range != null">f_range,</if>
             <if test="readingMode != null">f_reading_mode,</if>
+            <if test="plateType != null">f_plate_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="outStoreOrderNumber != null">#{outStoreOrderNumber},</if>
@@ -144,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alarmValue != null">#{alarmValue},</if>
             <if test="range != null">#{range},</if>
             <if test="readingMode != null">#{readingMode},</if>
+            <if test="plateType != null">#{plateType},</if>
          </trim>
     </insert>
 
@@ -171,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alarmValue != null">f_alarm_value = #{alarmValue},</if>
             <if test="range != null">f_range = #{range},</if>
             <if test="readingMode != null">f_reading_mode = #{readingMode},</if>
+            <if test="plateType != null">f_plate_type = #{plateType},</if>
         </trim>
         where f_product_standard_inspection_id = #{productStandardInspectionId}
     </update>

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

@@ -125,6 +125,7 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="板件类型" align="center" prop="" />
     </el-table>
 
     <pagination