1 老化 设备 增加 板件类型调整(1主体 需要判断网络信息，2主板 不需要判断网络信号调整)

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

@@ -159,6 +159,8 @@ public class PalletDeviceUploadFailure extends BaseEntity
     /** 标检结果 */
     private String standardInspectResult;
 
+    /** 板件类型：1.主体 2.主板*/
+    private String plateType;
     public void setId(Long id)
     {
         this.id = id;
@@ -481,6 +483,14 @@ public class PalletDeviceUploadFailure extends BaseEntity
         this.standardInspectResult = standardInspectResult;
     }
 
+    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)
@@ -521,6 +531,7 @@ public class PalletDeviceUploadFailure extends BaseEntity
             .append("trayCode", getTrayCode())
             .append("productStandardInspectionNumber", getProductStandardInspectionNumber())
             .append("standardInspectResult", getStandardInspectResult())
+            .append("plateType", getPlateType())
             .toString();
     }
 }

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

@@ -139,16 +139,28 @@ public class PalletDeviceUploadFailureServiceImpl implements IPalletDeviceUpload
             return ajax;
         }
 
-        List<PalletDeviceUploadFailure> palletDeviceUploadHistories = palletDeviceUploadFailures.stream().filter(item -> StringUtils.isNotBlank(item.getMotherboardCode())).collect(Collectors.toList());
+        boolean hasInvalid = palletDeviceUploadFailures.stream()
+                .anyMatch(palletDeviceBinding ->
+                                StringUtils.isNotBlank(palletDeviceBinding.getMotherboardCode())||
+                                StringUtils.isNotBlank(palletDeviceBinding.getPlateType()) ||
+                                palletDeviceBinding.getCalibrationConcentration() == null ||
+                                StringUtils.isBlank(palletDeviceBinding.getCalibrationConcentrationStatus()) ||
+                                StringUtils.isBlank(palletDeviceBinding.getConcentration()) ||
+                                palletDeviceBinding.getRealTimeAd() == null ||
+                                StringUtils.isBlank(palletDeviceBinding.getRealTimeStatus())
+                );
 
+        if (hasInvalid) {
+            throw new RuntimeException("数据不完整");
+        }
         try {
             // 1. 初始化MES数据并上传
-            List<PalletDeviceUploadFailure> failedUploads = initMesDataAndUpload(palletDeviceUploadHistories);
+            List<PalletDeviceUploadFailure> failedUploads = initMesDataAndUpload(palletDeviceUploadFailures);
 
             // 2. 处理上传结果
             if (failedUploads.isEmpty()) {
                 // 全部成功，删除所有历史数据
-                List<Long> successIds = palletDeviceUploadHistories.stream()
+                List<Long> successIds = palletDeviceUploadFailures.stream()
                         .map(PalletDeviceUploadFailure::getId)
                         .collect(Collectors.toList());
                 if (!successIds.isEmpty()) {
@@ -157,7 +169,7 @@ public class PalletDeviceUploadFailureServiceImpl implements IPalletDeviceUpload
                 }
             } else {
                 // 部分成功，只删除成功的数据
-                List<Long> successIds = palletDeviceUploadHistories.stream()
+                List<Long> successIds = palletDeviceUploadFailures.stream()
                         .filter(item -> !failedUploads.contains(item))
                         .map(PalletDeviceUploadFailure::getId)
                         .collect(Collectors.toList());
@@ -197,20 +209,6 @@ public class PalletDeviceUploadFailureServiceImpl implements IPalletDeviceUpload
      */
     private List<PalletDeviceUploadFailure> initMesDataAndUpload(List<PalletDeviceUploadFailure> palletDeviceUploadFailureList) {
 
-        boolean hasInvalid = palletDeviceUploadFailureList.stream()
-                .anyMatch(palletDeviceBinding ->
-                        StringUtils.isBlank(palletDeviceBinding.getMotherboardCode()) ||
-                                palletDeviceBinding.getCalibrationConcentration() == null ||
-                                StringUtils.isBlank(palletDeviceBinding.getCalibrationConcentrationStatus()) ||
-                                StringUtils.isBlank(palletDeviceBinding.getConcentration()) ||
-                                palletDeviceBinding.getRealTimeAd() == null ||
-                                StringUtils.isBlank(palletDeviceBinding.getRealTimeStatus())
-                );
-
-        if (hasInvalid) {
-            throw new RuntimeException("数据不完整");
-        }
-
         String mesUploadAddress = sysConfigService.directSelectConfigByKey(RoboticArmConstans.UPLOAD_MES_ADDRESS);
         if (StringUtils.isBlank(mesUploadAddress)) {
             throw new RuntimeException("MES上传地址未配置");

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

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

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

@@ -506,7 +506,8 @@ public class RobotArmCommandServiceImpl implements IRobotArmCommandService
         storeyInfoMapper.updateStatusByCode(tStoreyInfo);
 
         // 20260108 新加的把绑定层编号设置到实时数据上
-        palletDeviceBindingMapper.updateStoreCodeByTrayId(tTrayInfo.getfTrayId(), tStoreyInfo.getfStoreyCode(),robotArmCommand.getProductStandardInspectionNumber());
+        palletDeviceBindingMapper.updateStoreCodeByTrayId(tTrayInfo.getfTrayId(), tStoreyInfo.getfStoreyCode(),
+                robotArmCommand.getProductStandardInspectionNumber());
 
         int i = robotArmCommandMapper.insertRobotArmCommand(robotArmCommand);
         notifyCommandsUpdate();
@@ -565,7 +566,8 @@ public class RobotArmCommandServiceImpl implements IRobotArmCommandService
             storeyInfoMapper.updateStatusByCode(tStoreyInfo);
 
             // 20260108 新加的把绑定层编号设置到实时数据上
-            palletDeviceBindingMapper.updateStoreCodeByTrayId(tTrayInfo.getfTrayId(), tStoreyInfo.getfStoreyCode(),robotArmCommand.getProductStandardInspectionNumber());
+            palletDeviceBindingMapper.updateStoreCodeByTrayId(tTrayInfo.getfTrayId(), tStoreyInfo.getfStoreyCode(),
+                    robotArmCommand.getProductStandardInspectionNumber());
 
         } else {
             robotArmCommand.setStoreyCode("待分配位置");

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

@@ -92,6 +92,7 @@ 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_plate_type
         from t_pallet_device_binding palDeviceBinding
         left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
@@ -268,7 +269,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_sim_card_status = null,
             f_network_status = null,
             f_product_standard_inspection_number = null,
-            f_standard_inspect_result = null
+            f_standard_inspect_result = null,
+            f_reading_mode = null
         where f_tray_id = #{trayId}
     </update>
     <insert id="insertPalletDeviceBinding" parameterType="PalletDeviceBinding" useGeneratedKeys="true" keyProperty="palletDeviceBindingId">
@@ -333,7 +335,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_sim_card_status = null,
             f_network_status = null,
             f_product_standard_inspection_number = null,
-            f_standard_inspect_result = null
+            f_standard_inspect_result = null,
+            f_reading_mode = null
         where f_pallet_device_binding_id = #{palletDeviceBindingId}
     </update>
     <update id="updatePalletDeviceBinding" parameterType="PalletDeviceBinding">
@@ -377,6 +380,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="plateType != null">f_plate_type = #{plateType},</if>
         </trim>
         where f_pallet_device_binding_id = #{palletDeviceBindingId} and f_motherboard_code is not null
     </update>

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

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="networkStatus"    column="f_network_status"    />
         <result property="productStandardInspectionNumber"    column="f_product_standard_inspection_number"    />
         <result property="standardInspectResult"    column="f_standard_inspect_result"    />
+        <result property="plateType" column="f_plate_type"/>
     </resultMap>
 
     <sql id="selectPalletDeviceUploadFailureVo">
@@ -80,9 +81,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_sim_card_status,
                palDeviceBinding.f_network_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_upload_failure 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="selectPalletDeviceUploadFailureList" parameterType="PalletDeviceUploadFailure" resultMap="PalletDeviceUploadFailureResult">

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

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                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,
-               case when  f_plate_type = '1' then '主板' else '主体' end as f_plate_type
+               case when  f_plate_type = '1' then '主体' else '主板' end as f_plate_type
         from t_product_standard_inspection
     </sql>
 

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

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