1 老化过程中 根据 标检单的 读取模式 是否 设置 继电器 或 脉冲 数据调整。

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

@@ -195,6 +195,13 @@ public class PalletDeviceBinding extends BaseEntity
      * 0 不合格
      * */
     private String standardInspectResult;
+
+    /** 读数方式
+     * 1  读继电器不读脉冲
+     * 2 读脉冲不读继电器
+     * 3 两个都读
+     * */
+    private String readingMode;
     /**
      * 第一个解绑的设备编号
      * 这个字段就是为了区分第一个解绑的设备编号标志，如果是的话，则 需要存 历史，上传MES，生成 标检 质检 等。
@@ -514,6 +521,14 @@ public class PalletDeviceBinding extends BaseEntity
         this.standardInspectResult = standardInspectResult;
     }
 
+    public String getReadingMode() {
+        return readingMode;
+    }
+
+    public void setReadingMode(String readingMode) {
+        this.readingMode = readingMode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -81,6 +81,10 @@ public class ProductStandardInspection extends BaseEntity
     @Excel(name = "量程")
     private String range;
 
+    /** 读数方式 */
+    @Excel(name = "读数方式", dictType = "reading_mode")
+    private String readingMode;
+
     /** 确认标检人 */
     @Excel(name = "确认标检人")
     private String confirmQualityInspector;
@@ -260,6 +264,14 @@ public class ProductStandardInspection extends BaseEntity
         return range;
     }
 
+    public String getReadingMode() {
+        return readingMode;
+    }
+
+    public void setReadingMode(String readingMode) {
+        this.readingMode = readingMode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -284,6 +296,7 @@ public class ProductStandardInspection extends BaseEntity
             .append("calibrationGas", getCalibrationGas())
             .append("alarmValue", getAlarmValue())
             .append("range", getRange())
+            .append("readingMode", getReadingMode())
             .toString();
     }
 }

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/ProductStandardInspectionServiceImpl.java

@@ -228,6 +228,7 @@ public class ProductStandardInspectionServiceImpl implements IProductStandardIns
                     productStandardInspection.setCreateBy(item.getString("createBy") == null ? "" : item.getString("createBy"));
                     productStandardInspection.setStatus("DURING_STANDARD_INSPECTION");
                     productStandardInspection.setRemarks(item.getString("remarks") == null ? "" : item.getString("remarks"));
+                    productStandardInspection.setReadingMode(item.getString("readingMode") == null ? "" : item.getString("readingMode"));
                     productStandardInspections.add(productStandardInspection);
                 }
                 if(productStandardInspections.size() > 0) {

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

@@ -188,13 +188,22 @@ public class AgingStageThreeProcessJob implements Job {
                     checkAndUpdateTime(master, deviceId, binding);
                 }
 
+                String readingMode = binding.getReadingMode();
+                // * 1  读继电器不读脉冲  * 2 读脉冲不读继电器 * 3 两个都读
+
                 // 处理 继电器状态，脉冲状态，模组状态，SIM卡状态，网络状态
-                if(result[10] == 1 && binding.getRelayStatus() == 0){
-                    binding.setRelayStatus(1);
+                if(!"2".equals(readingMode)) {
+                    if(result[10] == 1 && binding.getRelayStatus() == 0){
+                        binding.setRelayStatus(1);
+                    }
                 }
-                if(result[11] == 1 && binding.getPulseStatus() == 0){
-                    binding.setPulseStatus(1);
+
+                if(!"1".equals(readingMode)) {
+                    if(result[11] == 1 && binding.getPulseStatus() == 0){
+                        binding.setPulseStatus(1);
+                    }
                 }
+
                 if(result[12] == 1 && binding.getModuleStatus() == 0){
                     binding.setModuleStatus(1);
                 }

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

@@ -179,6 +179,7 @@ public class AgingStageTwoProcessJob  implements Job {
         return CompletableFuture.supplyAsync(() -> {
 
             // 1. 查询设备绑定信息
+            // * 1  读继电器不读脉冲  * 2 读脉冲不读继电器 * 3 两个都读
             PalletDeviceBinding binding = palletDeviceBindingMapper.selectByTrayIdAndIndex(ip, deviceId);
             if (binding == null) {
                 log.warn("未找到设备绑定: ip={}, deviceId={}", ip, deviceId);
@@ -191,15 +192,27 @@ public class AgingStageTwoProcessJob  implements Job {
                 // 2. 读取设备数据
                 int[] result = Modbus4jUtils.readDeviceWithRetry(ip, port, deviceId);
 
-                if(result[10] == 1) {
-                    binding.setRelayStatus(1);
-                } else {
-                    binding.setRelayStatus(0);
+                String readingMode = binding.getReadingMode();
+                if(StringUtils.isBlank(readingMode)) {
+                    readingMode = "3";
                 }
-                if(result[11] == 1) {
-                    binding.setPulseStatus(1);
-                } else {
-                    binding.setPulseStatus(0);
+
+                // 不是2 的时候才读继电器
+                if(!"2".equals(readingMode)) {
+                    if(result[10] == 1) {
+                        binding.setRelayStatus(1);
+                    } else {
+                        binding.setRelayStatus(0);
+                    }
+                }
+
+                // 不是1 的时候 才 读 脉冲
+                if(!"1".equals(binding.getReadingMode())) {
+                    if(result[11] == 1) {
+                        binding.setPulseStatus(1);
+                    } else {
+                        binding.setPulseStatus(0);
+                    }
                 }
                 if(result[12] == 1) {
                     binding.setModuleStatus(1);

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

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="productStandardInspectionNumber"    column="f_product_standard_inspection_number"    />
         <result property="standardInspectResult"    column="f_standard_inspect_result"    />
 
+        <result property="readingMode" column="f_reading_mode"/>
 
     </resultMap>
 
@@ -148,44 +149,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where palDeviceBinding.f_pallet_device_binding_id = #{palletDeviceBindingId}
     </select>
     <select id="selectByTrayIdAndIndex" resultMap="PalletDeviceBindingResult">
-        select f_pallet_device_binding_id,
-               f_storey_code,
-               f_tray_id,
-               f_motherboard_code,
-               f_row,
-               f_col,
-               f_index,
-               f_number,
-               f_binding_time,
-               f_unbinding_time,
-               f_create_time,
-               f_device_status,
-               f_record_year,
-               f_record_month,
-               f_record_date,
-               f_record_hour,
-               f_record_minute ,
-               f_write_time_status,
-               f_adjustment_zero_ad,
-               f_zero_status,
-               f_calibration_ad,
-               f_calibration_status,
-               f_concentration,
-               f_run_time_status,
-               f_real_time_ad,
-               f_real_time_ad_status,
-               f_calibration_concentration,
-               f_calibration_concentration_status,
-               f_write_self_check_status,
-               f_relay_status,
-               f_pulse_status,
-               f_module_status,
-               f_sim_card_status,
-               f_network_status,
-               f_calibration_unbind_status,
-               f_product_standard_inspection_number,
-               f_standard_inspect_result
-        from t_pallet_device_binding palDeviceBinding where palDeviceBinding.f_tray_id = (
+        select palDeviceBinding.f_pallet_device_binding_id,
+               palDeviceBinding.f_storey_code,
+               palDeviceBinding.f_tray_id,
+               palDeviceBinding.f_motherboard_code,
+               palDeviceBinding.f_row,
+               palDeviceBinding.f_col,
+               palDeviceBinding.f_index,
+               palDeviceBinding.f_number,
+               palDeviceBinding.f_binding_time,
+               palDeviceBinding.f_unbinding_time,
+               palDeviceBinding.f_create_time,
+               palDeviceBinding.f_device_status,
+               palDeviceBinding.f_record_year,
+               palDeviceBinding.f_record_month,
+               palDeviceBinding.f_record_date,
+               palDeviceBinding.f_record_hour,
+               palDeviceBinding.f_record_minute ,
+               palDeviceBinding.f_write_time_status,
+               palDeviceBinding.f_adjustment_zero_ad,
+               palDeviceBinding.f_zero_status,
+               palDeviceBinding.f_calibration_ad,
+               palDeviceBinding.f_calibration_status,
+               palDeviceBinding.f_concentration,
+               palDeviceBinding.f_run_time_status,
+               palDeviceBinding.f_real_time_ad,
+               palDeviceBinding.f_real_time_ad_status,
+               palDeviceBinding.f_calibration_concentration,
+               palDeviceBinding.f_calibration_concentration_status,
+               palDeviceBinding.f_write_self_check_status,
+               palDeviceBinding.f_relay_status,
+               palDeviceBinding.f_pulse_status,
+               palDeviceBinding.f_module_status,
+               palDeviceBinding.f_sim_card_status,
+               palDeviceBinding.f_network_status,
+               palDeviceBinding.f_calibration_unbind_status,
+               palDeviceBinding.f_product_standard_inspection_number,
+               palDeviceBinding.f_standard_inspect_result,
+               inspection.f_reading_mode
+        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
+        where palDeviceBinding.f_tray_id = (
                     SELECT
                         trayInfo.f_tray_id
                     FROM

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

@@ -26,10 +26,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="calibrationGas"    column="f_calibration_gas"    />
         <result property="alarmValue"    column="f_alarm_value"    />
         <result property="range"    column="f_range"    />
+        <result property="readingMode" column="f_reading_mode"/>
     </resultMap>
 
     <sql id="selectProductStandardInspectionVo">
-        select f_product_standard_inspection_id, f_out_store_order_number, f_product_standard_inspection_number, 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 from t_product_standard_inspection
+        select f_product_standard_inspection_id, f_out_store_order_number, f_product_standard_inspection_number,
+               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
+        from t_product_standard_inspection
     </sql>
 
     <select id="selectDuringStandardInspection" resultMap="ProductStandardInspectionResult">
@@ -59,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calibrationGas != null  and calibrationGas != ''"> and f_calibration_gas = #{calibrationGas}</if>
             <if test="alarmValue != null  and alarmValue != ''"> and f_alarm_value = #{alarmValue}</if>
             <if test="range != null  and range != ''"> and f_range = #{range}</if>
+             <if test="readingMode != null  and readingMode != ''"> and f_reading_mode = #{readingMode}</if>
         </where>
     </select>
 
@@ -75,14 +82,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_calibration_gas,f_alarm_value,f_range,f_reading_mode)
         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.calibrationGas}, #{item.alarmValue}, #{item.range}, #{item.readingMode}
             )
         </foreach>
     </insert>
@@ -109,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calibrationGas != null">f_calibration_gas,</if>
             <if test="alarmValue != null">f_alarm_value,</if>
             <if test="range != null">f_range,</if>
+            <if test="readingMode != null">f_reading_mode,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="outStoreOrderNumber != null">#{outStoreOrderNumber},</if>
@@ -131,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calibrationGas != null">#{calibrationGas},</if>
             <if test="alarmValue != null">#{alarmValue},</if>
             <if test="range != null">#{range},</if>
+            <if test="readingMode != null">#{readingMode},</if>
          </trim>
     </insert>
 
@@ -157,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calibrationGas != null">f_calibration_gas = #{calibrationGas},</if>
             <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>
         </trim>
         where f_product_standard_inspection_id = #{productStandardInspectionId}
     </update>

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

@@ -367,7 +367,8 @@ export default {
         (device.calibrationConcentrationStatus != null && device.calibrationConcentrationStatus !== '4') ||
         (device.writeTimeStatus != null && device.writeTimeStatus === '0') ||
         (device.runTimeStatus != null && device.runTimeStatus === '0') ||
-        device.relayStatus === 0 || device.pulseStatus === 0 ||
+        (device.relayStatus != null && device.relayStatus === 0) ||
+        (device.pulseStatus != null && device.pulseStatus === 0) ||
         device.moduleStatus === 0 || device.simCardStatus === 0 || device.networkStatus === 0;
     },
 

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

@@ -106,6 +106,25 @@
       </el-table-column>
       <el-table-column label="报警值" align="center" prop="alarmValue" />
       <el-table-column label="量程" align="center" prop="range" />
+      <el-table-column label="读取模式" align="center" prop="readingMode">
+        <template slot-scope="scope">
+          <!-- 如果 calibrationGas 是单个值 -->
+          <span v-if="!Array.isArray(scope.row.readingMode)">
+              {{ getReadingModeLabel(scope.row.readingMode) }}
+          </span>
+
+          <!-- 如果 calibrationGas 是数组 -->
+          <div v-else>
+            <el-tag
+              v-for="(item, index) in scope.row.readingMode"
+              :key="index"
+              style="margin: 2px;"
+            >
+              {{ getReadingModeLabel(item) }}
+            </el-tag>
+          </div>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -257,7 +276,9 @@ export default {
       calibrationGasOptions:[],
 
       // status
-      statusOptions:[]
+      statusOptions:[],
+      // 读取方式
+      readingModeOptions:[],
     };
   },
   created() {
@@ -268,6 +289,9 @@ export default {
     this.getDicts("standard_inspection_status").then((response) => {
       this.statusOptions = response.data;
     });
+    this.getDicts("reading_mode").then((response) => {
+      this.readingModeOptions = response.data;
+    });
   },
   methods: {
     // 获取标定气体的显示标签
@@ -277,6 +301,12 @@ export default {
       const item = this.calibrationGasOptions.find(option => option.dictValue === dictValue);
       return item ? item.dictLabel : dictValue; // 如果找不到对应的选项，显示原始值
     },
+    getReadingModeLabel(dictValue) {
+      if (!dictValue) return '';
+
+      const item = this.readingModeOptions.find(option => option.dictValue === dictValue);
+      return item ? item.dictLabel : dictValue; // 如果找不到对应的选项，显示原始值
+    },
 
     getStatusLabel(dictValue) {
       if (!dictValue) return '';