1 标检单 里面的 板件类型 换成 是否待上传 调整

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

@@ -203,8 +203,8 @@ public class PalletDeviceBinding extends BaseEntity
      * */
     private String readingMode;
 
-    /** 板件类型：1.主体 2.主板*/
-    private String plateType;
+    /** 是否带上传 0-否 1-是*/
+    private String hasUpload;
     /**
      * 第一个解绑的设备编号
      * 这个字段就是为了区分第一个解绑的设备编号标志，如果是的话，则 需要存 历史，上传MES，生成 标检 质检 等。
@@ -532,12 +532,12 @@ public class PalletDeviceBinding extends BaseEntity
         this.readingMode = readingMode;
     }
 
-    public String getPlateType() {
-        return plateType;
+    public String getHasUpload() {
+        return hasUpload;
     }
 
-    public void setPlateType(String plateType) {
-        this.plateType = plateType;
+    public void setHasUpload(String hasUpload) {
+        this.hasUpload = hasUpload;
     }
 
     @Override

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

@@ -159,8 +159,8 @@ public class PalletDeviceUploadFailure extends BaseEntity
     /** 标检结果 */
     private String standardInspectResult;
 
-    /** 板件类型：1.主体 2.主板*/
-    private String plateType;
+    /** 是否带上传 0-否 1-是*/
+    private String hasUpload;
     public void setId(Long id)
     {
         this.id = id;
@@ -483,12 +483,12 @@ public class PalletDeviceUploadFailure extends BaseEntity
         this.standardInspectResult = standardInspectResult;
     }
 
-    public String getPlateType() {
-        return plateType;
+    public String getHasUpload() {
+        return hasUpload;
     }
 
-    public void setPlateType(String plateType) {
-        this.plateType = plateType;
+    public void setHasUpload(String hasUpload) {
+        this.hasUpload = hasUpload;
     }
 
     @Override
@@ -531,7 +531,7 @@ public class PalletDeviceUploadFailure extends BaseEntity
             .append("trayCode", getTrayCode())
             .append("productStandardInspectionNumber", getProductStandardInspectionNumber())
             .append("standardInspectResult", getStandardInspectResult())
-            .append("plateType", getPlateType())
+            .append("hasUpload", getHasUpload())
             .toString();
     }
 }

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

@@ -93,14 +93,11 @@ public class ProductStandardInspection extends BaseEntity
     /** 读数方式 */
     @Excel(name = "读数方式", dictType = "reading_mode")
     private String readingMode;
+    /** 是否带上传 0-否 1-是 */
+    private String hasUpload;
 
-    /** 板件类型：1.主体 2.主板*/
-    @Excel(name = "板件类型")
-    private String plateType;
-
-    /** 板件类型：1.主体 2.主板*/
-    private String plateTypeStr;
-
+    @Excel(name = "是否带上传")
+    private String hasUploadDesc;
 
     /** 确认标检人 */
     @Excel(name = "确认标检人")
@@ -289,20 +286,23 @@ public class ProductStandardInspection extends BaseEntity
         this.readingMode = readingMode;
     }
 
-    public String getPlateType() {
-        return plateType;
+
+
+    public String getHasUpload() {
+        return hasUpload;
     }
 
-    public void setPlateType(String plateType) {
-        this.plateType = plateType;
+    public void setHasUpload(String hasUpload) {
+        this.hasUpload = hasUpload;
+        this.hasUploadDesc = "1".equals(String.valueOf(hasUpload)) ? "是" : "否";
     }
 
-    public String getPlateTypeStr() {
-        return plateTypeMap.get(this.plateType);
+    public String getHasUploadDesc() {
+        return hasUploadDesc;
     }
 
-    public void setPlateTypeStr(String plateTypeStr) {
-        this.plateTypeStr = plateTypeStr;
+    public void setHasUploadDesc(String hasUploadDesc) {
+        this.hasUploadDesc = hasUploadDesc;
     }
     @Override
     public String toString() {
@@ -329,7 +329,7 @@ public class ProductStandardInspection extends BaseEntity
             .append("alarmValue", getAlarmValue())
             .append("range", getRange())
             .append("readingMode", getReadingMode())
-            .append("plateType", getPlateType())
+            .append("hasUpload", getHasUpload())
             .toString();
     }
 }

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

@@ -8,10 +8,8 @@ import com.zehong.common.core.domain.AjaxResult;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.StringUtils;
 import com.zehong.common.utils.http.HttpUtils;
-import com.zehong.system.domain.MesDeviceDomain;
 import com.zehong.system.domain.PalletDeviceBinding;
 import com.zehong.system.domain.PalletDeviceUploadFailure;
-import com.zehong.system.domain.PalletDeviceUploadHistory;
 import com.zehong.system.mapper.PalletDeviceUploadFailureMapper;
 import com.zehong.system.service.IPalletDeviceUploadFailureService;
 import com.zehong.system.service.ISysConfigService;
@@ -142,7 +140,7 @@ public class PalletDeviceUploadFailureServiceImpl implements IPalletDeviceUpload
         boolean hasInvalid = palletDeviceUploadFailures.stream()
                 .anyMatch(palletDeviceBinding ->
                                 StringUtils.isBlank(palletDeviceBinding.getMotherboardCode())||
-                                StringUtils.isBlank(palletDeviceBinding.getPlateType()) ||
+                                StringUtils.isBlank(palletDeviceBinding.getHasUpload()) ||
                                 palletDeviceBinding.getCalibrationConcentration() == null ||
                                 StringUtils.isBlank(palletDeviceBinding.getCalibrationConcentrationStatus()) ||
                                 StringUtils.isBlank(palletDeviceBinding.getConcentration()) ||

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

@@ -11,7 +11,6 @@ import com.zehong.system.domain.ProductStandardInspection;
 import com.zehong.system.mapper.ProductStandardInspectionMapper;
 import com.zehong.system.service.IProductStandardInspectionService;
 import com.zehong.system.service.ISysConfigService;
-import io.netty.handler.codec.http.HttpUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -234,7 +233,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"));
+                    productStandardInspection.setHasUpload(item.getString("hasUpload") == null ? "" : item.getString("hasUpload"));
                     productStandardInspections.add(productStandardInspection);
                 }
                 if(productStandardInspections.size() > 0) {

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

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

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

@@ -195,7 +195,7 @@ public class AgingStageTwoProcessJob  implements Job {
 
                 String readingMode = binding.getReadingMode();
 
-                String plateType = binding.getPlateType();
+                String hasUpload = binding.getHasUpload();
                 if(StringUtils.isBlank(readingMode)) {
                     readingMode = "3";
                 }
@@ -228,7 +228,7 @@ public class AgingStageTwoProcessJob  implements Job {
                     binding.setSimCardStatus(0);
                 }
 
-                if("1".equals(plateType)) {
+                if("1".equals(hasUpload)) {
                     if(result[14] == 1) {
                         binding.setNetworkStatus(1);
                     } else {

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

@@ -49,7 +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"/>
+        <result property="hasUpload" column="f_has_upload"/>
 
     </resultMap>
 
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_product_standard_inspection_number,
                palDeviceBinding.f_standard_inspect_result,
                inspection.f_reading_mode,
-               inspection.f_plate_type
+               inspection.f_has_upload
         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
@@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_product_standard_inspection_number,
                palDeviceBinding.f_standard_inspect_result,
                inspection.f_reading_mode,
-               inspection.f_plate_type
+               inspection.f_has_upload
         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/PalletDeviceUploadFailureMapper.xml

@@ -41,7 +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"/>
+        <result property="hasUpload" column="f_has_upload"/>
     </resultMap>
 
     <sql id="selectPalletDeviceUploadFailureVo">
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_network_status,
                palDeviceBinding.f_product_standard_inspection_number,
                palDeviceBinding.f_standard_inspect_result,
-               inspection.f_plate_type
+               inspection.f_has_upload
         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

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

@@ -27,7 +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"/>
+        <result property="hasUpload" column="f_has_upload"/>
     </resultMap>
 
     <sql id="selectProductStandardInspectionVo">
@@ -35,7 +35,7 @@ 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_plate_type
+               f_reading_mode,f_has_upload
         from t_product_standard_inspection
     </sql>
 
@@ -44,8 +44,7 @@ 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,
-            case when  f_plate_type = '1' then '主体' else '主板' end as f_plate_type
+               f_reading_mode,f_has_upload
         from t_product_standard_inspection
     </sql>
     <select id="selectDuringStandardInspection" resultMap="ProductStandardInspectionResult">
@@ -101,14 +100,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_plate_type)
+        f_calibration_gas,f_alarm_value,f_range,f_reading_mode,f_has_upload)
         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.plateType}
+              #{item.calibrationGas}, #{item.alarmValue}, #{item.range}, #{item.readingMode}, #{item.hasUpload}
             )
         </foreach>
     </insert>
@@ -136,7 +135,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>
+            <if test="hasUpload != null">f_has_upload,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="outStoreOrderNumber != null">#{outStoreOrderNumber},</if>
@@ -160,7 +159,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>
+            <if test="hasUpload != null">#{hasUpload},</if>
          </trim>
     </insert>
 
@@ -188,7 +187,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>
+            <if test="hasUpload != null">f_has_upload = #{hasUpload},</if>
         </trim>
         where f_product_standard_inspection_id = #{productStandardInspectionId}
     </update>

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

@@ -125,7 +125,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="板件类型" align="center" prop="plateTypeStr" />
+      <el-table-column label="是否带上传" align="center" prop="hasUploadDesc" />
     </el-table>
 
     <pagination