1 设备数据 增加 标检单号 字段

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

@@ -185,6 +185,11 @@ public class PalletDeviceBinding extends BaseEntity
      */
     private String calibrationUnbindStatus;
 
+    /**
+     * 产品标准检验编号
+     */
+    private String productStandardInspectionNumber;
+
     /**
      * 第一个解绑的设备编号
      * 这个字段就是为了区分第一个解绑的设备编号标志，如果是的话，则 需要存 历史，上传MES，生成 标检 质检 等。
@@ -488,6 +493,14 @@ public class PalletDeviceBinding extends BaseEntity
         this.calibrationUnbindStatus = calibrationUnbindStatus;
     }
 
+    public String getProductStandardInspectionNumber() {
+        return productStandardInspectionNumber;
+    }
+
+    public void setProductStandardInspectionNumber(String productStandardInspectionNumber) {
+        this.productStandardInspectionNumber = productStandardInspectionNumber;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -530,6 +543,7 @@ public class PalletDeviceBinding extends BaseEntity
                 .append("createBy", getCreateBy())
                 .append("updateBy", getUpdateBy())
                 .append("calibrationUnbindStatus", getCalibrationUnbindStatus())
+                .append("productStandardInspectionNumber", getProductStandardInspectionNumber())
                 .toString();
     }
 }

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

@@ -152,6 +152,10 @@ public class PalletDeviceUploadFailure extends BaseEntity
     @Excel(name = "网络状态(0-异常，1-正常)")
     private Integer networkStatus;
 
+    /** 产品标准检验编号 */
+    @Excel(name = "标检单号")
+    private String productStandardInspectionNumber;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -458,6 +462,14 @@ public class PalletDeviceUploadFailure extends BaseEntity
         this.trayCode = trayCode;
     }
 
+    public String getProductStandardInspectionNumber() {
+        return productStandardInspectionNumber;
+    }
+
+    public void setProductStandardInspectionNumber(String productStandardInspectionNumber) {
+        this.productStandardInspectionNumber = productStandardInspectionNumber;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -496,6 +508,7 @@ public class PalletDeviceUploadFailure extends BaseEntity
             .append("simCardStatus", getSimCardStatus())
             .append("networkStatus", getNetworkStatus())
             .append("trayCode", getTrayCode())
+            .append("productStandardInspectionNumber", getProductStandardInspectionNumber())
             .toString();
     }
 }

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

 package com.zehong.system.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 未上传成功的历史数据列对象 t_pallet_device_upload_history
  *
@@ -168,6 +167,10 @@ public class PalletDeviceUploadHistory extends BaseEntity
      */
     @Excel(name = "网络状态;0:异常 1:正常")
     private Integer networkStatus;
+
+    /** 产品标准检验编号 */
+    @Excel(name = "标检单号")
+    private String productStandardInspectionNumber;
     public void setId(Long id)
     {
         this.id = id;
@@ -463,6 +466,14 @@ public class PalletDeviceUploadHistory extends BaseEntity
         this.storeyCode = storeyCode;
     }
 
+    public String getProductStandardInspectionNumber() {
+        return productStandardInspectionNumber;
+    }
+
+    public void setProductStandardInspectionNumber(String productStandardInspectionNumber) {
+        this.productStandardInspectionNumber = productStandardInspectionNumber;
+    }
+
     @Override
     public String toString() {
         return "PalletDeviceUploadHistory{" +
@@ -500,6 +511,7 @@ public class PalletDeviceUploadHistory extends BaseEntity
                 ", moduleStatus=" + moduleStatus +
                 ", simCardStatus=" + simCardStatus +
                 ", networkStatus=" + networkStatus +
+                ", productStandardInspectionNumber='" + productStandardInspectionNumber +
                 '}';
     }
 }

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

@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="networkStatus"    column="f_network_status"    />
 
         <result property="calibrationUnbindStatus"    column="f_calibration_unbind_status"    />
+        <result property="productStandardInspectionNumber"    column="f_product_standard_inspection_number"    />
 
     </resultMap>
 
@@ -84,7 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_module_status,
                palDeviceBinding.f_sim_card_status,
                palDeviceBinding.f_network_status,
-               palDeviceBinding.f_calibration_unbind_status
+               palDeviceBinding.f_calibration_unbind_status,
+               palDeviceBinding.f_product_standard_inspection_number
         from t_pallet_device_binding palDeviceBinding
         left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
     </sql>
@@ -123,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unbindingTime != null "> and palDeviceBinding.f_unbinding_time = #{unbindingTime}</if>
             <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>
         </where>
         order by trayInfo.f_tray_code ,palDeviceBinding.f_number asc
     </select>
@@ -175,7 +178,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                f_module_status,
                f_sim_card_status,
                f_network_status,
-               f_calibration_unbind_status
+               f_calibration_unbind_status,
+               f_product_standard_inspection_number
         from t_pallet_device_binding palDeviceBinding where palDeviceBinding.f_tray_id = (
                     SELECT
                         trayInfo.f_tray_id
@@ -202,12 +206,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <insert id="batchInsertPalletDeviceBinding" parameterType="list"  useGeneratedKeys="true" keyProperty="palletDeviceBindingId">
         insert into t_pallet_device_binding (f_tray_id,f_storey_code ,f_motherboard_code,f_row,f_col,f_index,f_number,f_binding_time,
-        f_create_time,f_device_status,f_calibration_unbind_status)
+        f_create_time,f_device_status,f_calibration_unbind_status,f_product_standard_inspection_number)
         values
         <foreach collection="palletDeviceBindingList" item="item" index="index" separator=",">
             (
             #{item.trayId}, #{item.storeyCode}, #{item.motherboardCode}, #{item.row}, #{item.col},#{item.index},#{item.number},
-            #{item.bindingTime},#{item.createTime},#{item.deviceStatus},#{item.calibrationUnbindStatus}
+            #{item.bindingTime},#{item.createTime},#{item.deviceStatus},#{item.calibrationUnbindStatus},#{item.productStandardInspectionNumber}
             )
         </foreach>
     </insert>
@@ -244,7 +248,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_pulse_status = null,
             f_module_status = null,
             f_sim_card_status = null,
-            f_network_status = null
+            f_network_status = null,
+            f_product_standard_inspection_number = null
         where f_tray_id = #{trayId}
     </update>
     <insert id="insertPalletDeviceBinding" parameterType="PalletDeviceBinding" useGeneratedKeys="true" keyProperty="palletDeviceBindingId">
@@ -307,7 +312,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_pulse_status = null,
             f_module_status = null,
             f_sim_card_status = null,
-            f_network_status = null
+            f_network_status = null,
+            f_product_standard_inspection_number = null
         where f_pallet_device_binding_id = #{palletDeviceBindingId}
     </update>
     <update id="updatePalletDeviceBinding" parameterType="PalletDeviceBinding">
@@ -349,6 +355,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moduleStatus != null">f_module_status = #{moduleStatus},</if>
             <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>
         </trim>
         where f_pallet_device_binding_id = #{palletDeviceBindingId} and f_motherboard_code is not null
     </update>
@@ -406,7 +413,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 f_module_status = null,
                 f_sim_card_status = null,
                 f_network_status = null,
-                f_calibration_unbind_status = '0'
+                f_calibration_unbind_status = '0',
+                f_product_standard_inspection_number = null
                 <choose>
                     <when test="item.motherboardCode != null">
                         , f_motherboard_code = #{item.motherboardCode}
@@ -445,7 +453,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_module_status = null,
             f_sim_card_status = null,
             f_network_status = null,
-            f_calibration_unbind_status = null
+            f_calibration_unbind_status = null,
+            f_product_standard_inspection_number = null
         where f_tray_id = #{trayId}
     </update>
 

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="moduleStatus"    column="f_module_status"    />
         <result property="simCardStatus"    column="f_sim_card_status"    />
         <result property="networkStatus"    column="f_network_status"    />
+        <result property="productStandardInspectionNumber"    column="f_product_standard_inspection_number"    />
     </resultMap>
 
     <sql id="selectPalletDeviceUploadFailureVo">
@@ -76,7 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_pulse_status,
                palDeviceBinding.f_module_status,
                palDeviceBinding.f_sim_card_status,
-               palDeviceBinding.f_network_status
+               palDeviceBinding.f_network_status,
+               palDeviceBinding.f_product_standard_inspection_number
         from t_pallet_device_upload_failure palDeviceBinding
         left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
     </sql>
@@ -117,6 +119,7 @@ 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>
         </where>
     </select>
 
@@ -159,7 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_pulse_status,
             f_module_status,
             f_sim_card_status,
-            f_network_status
+            f_network_status,
+            f_product_standard_inspection_number
         </trim>
         values
         <foreach collection="list" item="item" separator=",">
@@ -196,7 +200,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.pulseStatus},
                 #{item.moduleStatus},
                 #{item.simCardStatus},
-                #{item.networkStatus}
+                #{item.networkStatus},
+                #{item.productStandardInspectionNumber}
             </trim>
         </foreach>
     </insert>
@@ -235,7 +240,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_pulse_status,
             f_module_status,
             f_sim_card_status,
-            f_network_status
+            f_network_status,
+            f_product_standard_inspection_number
         </trim>
         values
         <foreach collection="list" item="item" separator=",">
@@ -272,7 +278,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.pulseStatus},
                 #{item.moduleStatus},
                 #{item.simCardStatus},
-                #{item.networkStatus}
+                #{item.networkStatus},
+                #{item.productStandardInspectionNumber}
             </trim>
         </foreach>
     </insert>
@@ -312,6 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="trayId != null">#{trayId},</if>
@@ -347,6 +355,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moduleStatus != null">#{moduleStatus},</if>
             <if test="simCardStatus != null">#{simCardStatus},</if>
             <if test="networkStatus != null">#{networkStatus},</if>
+            <if test="productStandardInspectionNumber != null">#{productStandardInspectionNumber},</if>
          </trim>
     </insert>
 
@@ -386,6 +395,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moduleStatus != null">f_module_status = #{moduleStatus},</if>
             <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>
         </trim>
         where f_id = #{id}
     </update>

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

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="moduleStatus"    column="f_module_status"    />
         <result property="simCardStatus"    column="f_sim_card_status"    />
         <result property="networkStatus"    column="f_network_status"    />
+        <result property="productStandardInspectionNumber"    column="f_product_standard_inspection_number"    />
     </resultMap>
 
     <sql id="selectPalletDeviceUploadHistoryVo">
@@ -78,7 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_pulse_status,
                palDeviceBinding.f_module_status,
                palDeviceBinding.f_sim_card_status,
-               palDeviceBinding.f_network_status
+               palDeviceBinding.f_network_status,
+               palDeviceBinding.f_product_standard_inspection_number
         from t_pallet_device_upload_history palDeviceBinding
                  left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
     </sql>
@@ -131,7 +133,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_pulse_status,
             f_module_status,
             f_sim_card_status,
-            f_network_status
+            f_network_status,
+            f_product_standard_inspection_number
         </trim>
         values
         <foreach collection="list" item="item" separator=",">
@@ -168,7 +171,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.pulseStatus},
                 #{item.moduleStatus},
                 #{item.simCardStatus},
-                #{item.networkStatus}
+                #{item.networkStatus},
+                #{item.productStandardInspectionNumber}
             </trim>
         </foreach>
     </insert>
@@ -208,7 +212,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_pulse_status,
             f_module_status,
             f_sim_card_status,
-            f_network_status
+            f_network_status,
+            f_product_standard_inspection_number
         </trim>
         values
         <foreach collection="list" item="item" separator=",">
@@ -245,7 +250,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.pulseStatus},
                 #{item.moduleStatus},
                 #{item.simCardStatus},
-                #{item.networkStatus}
+                #{item.networkStatus},
+                #{item.productStandardInspectionNumber}
             </trim>
         </foreach>
     </insert>
@@ -286,6 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moduleStatus != null">#{moduleStatus},</if>
             <if test="simCardStatus != null">#{simCardStatus},</if>
             <if test="networkStatus != null">#{networkStatus},</if>
+            <if test="productStandardInspectionNumber != null">#{productStandardInspectionNumber}</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="trayId != null">#{trayId},</if>
@@ -322,6 +329,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moduleStatus != null">#{moduleStatus},</if>
             <if test="simCardStatus != null">#{simCardStatus},</if>
             <if test="networkStatus != null">#{networkStatus},</if>
+            <if test="productStandardInspectionNumber != null">#{productStandardInspectionNumber}</if>
          </trim>
     </insert>
 
@@ -362,6 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moduleStatus != null">f_module_status = #{moduleStatus},</if>
             <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>
 
         </trim>
         where f_id = #{id}

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

@@ -19,6 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="标检单号" prop="productStandardInspectionNumber">
+        <el-input
+          v-model="queryParams.productStandardInspectionNumber"
+          placeholder="请输入托盘编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
@@ -51,6 +60,7 @@
 
     <el-table v-loading="loading" :data="historyList">
       <el-table-column label="托盘编号" align="center" prop="trayCode" />
+      <el-table-column label="标检单号" align="center" prop="productStandardInspectionNumber" width="100px" />
       <el-table-column label="绑定层编号" align="center" prop="storeyCode" width="100px" />
       <el-table-column label="设备编号" align="center" prop="motherboardCode" />
       <el-table-column label="行" align="center" prop="row" />

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

@@ -19,6 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="标检单号" prop="productStandardInspectionNumber">
+        <el-input
+          v-model="queryParams.productStandardInspectionNumber"
+          placeholder="请输入托盘编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
@@ -41,6 +50,7 @@
 
     <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
       <el-table-column label="托盘编号" align="center" prop="trayCode" />
+      <el-table-column label="标检单号" align="center" prop="productStandardInspectionNumber" width="100px" />
       <el-table-column label="绑定层编号" align="center" prop="storeyCode" width="100px" />
       <el-table-column label="设备编号" align="center" prop="motherboardCode" />
       <el-table-column label="行" align="center" prop="row" />

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

@@ -58,6 +58,11 @@
               <div class="tray-id">{{ scope.row.fTrayCode }}</div>
             </template>
           </el-table-column>
+          <el-table-column label="标检单号" prop="productStandardInspectionNumber" align="center" width="150" fixed="left">
+            <template slot-scope="scope">
+              <div class="tray-id">{{ scope.row.productStandardInspectionNumber }}</div>
+            </template>
+          </el-table-column>
           <el-table-column label="绑定层编号" prop="storeyCode" align="center" width="150" fixed="left">
             <template slot-scope="scope">
               <div class="tray-id">{{ scope.row.storeyCode }}</div>