修改前端UI资产信息展示、盘点记录信息展示

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/TbInventoryDetail.java

@@ -36,9 +36,9 @@ public class TbInventoryDetail extends BaseEntity
     @Excel(name = "盘点元数据")
     private String inventoryMetadata;
 
-    /** 是否更新数据 0:异常 1:已盘点 2:未盘点 */
-    @Excel(name = "是否已盘点")
-    private Integer isUpdateData;
+    /** 盘点状态 0:异常 1:已盘点 2:未盘点 */
+    @Excel(name = "盘点状态 0:异常 1:已盘点 2:未盘点")
+    private Integer inventoryStatus;
 
     /**
      * 未盘点详细

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/impl/TbAssetInventoryServiceImpl.java

@@ -250,7 +250,7 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
             boolean flag = epcSet.stream().anyMatch(epc -> epc.equals(assetInformation.getEpc()));
             if (flag) {
                 // 设置盘点更新状态：已盘点
-                tbInventoryDetail.setIsUpdateData(1);
+                tbInventoryDetail.setInventoryStatus(1);
                 int update = tbInventoryDetailMapper.updateTbInventoryDetail(tbInventoryDetail);
                 if (update > 0) {
                     // 新增已盘点epc
@@ -536,7 +536,7 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
                 continue;
             }
             detail.setInventoryMetadata(JSONUtil.toJsonStr(tbAssetInformation));
-            detail.setIsUpdateData(isUpdate);
+            detail.setInventoryStatus(isUpdate);
             tbInventoryDetailMapper.insertTbInventoryDetail(detail);
         }
     }

ruoyi-admin/src/main/resources/mapper/inventory/TbInventoryDetailMapper.xml

@@ -8,21 +8,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="orderNumber"    column="order_number"    />
         <result property="inventoryMetadata"    column="inventory_metadata"    />
-        <result property="isUpdateData"    column="is_update_data"    />
+        <result property="inventoryStatus"    column="inventory_status"    />
         <result property="remark"    column="remark"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
     </resultMap>
 
     <sql id="selectTbInventoryDetailVo">
-        select id, order_number, inventory_metadata, is_update_data, remark, create_time, create_by from tb_inventory_detail
+        select id, order_number, inventory_metadata, inventory_status, remark, create_time, create_by from tb_inventory_detail
     </sql>
 
     <select id="selectTbInventoryDetailList" parameterType="TbInventoryDetail" resultMap="TbInventoryDetailResult">
         <include refid="selectTbInventoryDetailVo"/>
         <where>  
             <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
-            <if test="isUpdateData != null "> and is_update_data = #{isUpdateData}</if>
+            <if test="inventoryStatus != null "> and inventory_status = #{inventoryStatus}</if>
         </where>
     </select>
     
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="countUncounted" parameterType="String" resultType="Integer">
-        SELECT COUNT(0) FROM tb_inventory_detail WHERE order_number = #{orderNumber} and is_update_data &lt;&gt; 1;
+        SELECT COUNT(0) FROM tb_inventory_detail WHERE order_number = #{orderNumber} and inventory_status &lt;&gt; 1;
     </select>
         
     <insert id="insertTbInventoryDetail" parameterType="TbInventoryDetail" useGeneratedKeys="true" keyProperty="id">
@@ -45,13 +45,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderNumber != null and orderNumber != ''">order_number,</if>
             <if test="inventoryMetadata != null and inventoryMetadata != ''">inventory_metadata,</if>
-            <if test="isUpdateData != null">is_update_data,</if>
+            <if test="inventoryStatus != null">inventory_status,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNumber != null and orderNumber != ''">#{orderNumber},</if>
             <if test="inventoryMetadata != null and inventoryMetadata != ''">#{inventoryMetadata},</if>
-            <if test="isUpdateData != null">#{isUpdateData},</if>
+            <if test="inventoryStatus != null">#{inventoryStatus},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="orderNumber != null and orderNumber != ''">order_number = #{orderNumber},</if>
             <if test="inventoryMetadata != null and inventoryMetadata != ''">inventory_metadata = #{inventoryMetadata},</if>
-            <if test="isUpdateData != null">is_update_data = #{isUpdateData},</if>
+            <if test="inventoryStatus != null">inventory_status = #{inventoryStatus},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}

ruoyi-ui/src/views/inventory/detail/index.vue

@@ -10,8 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否更新数据" prop="isUpdateData">
-        <el-select v-model="queryParams.isUpdateData" placeholder="请选择是否更新数据" clearable>
+      <el-form-item label="盘点状态" prop="inventoryStatus">
+        <el-select v-model="queryParams.inventoryStatus" placeholder="请选择盘点状态" clearable>
           <el-option
             v-for="dict in dict.type.inventory_detail_is_update_data"
             :key="dict.value"
@@ -97,9 +97,9 @@
                 >
         </template>
       </el-table-column>
-      <el-table-column label="是否更新数据" align="center" prop="isUpdateData">
+      <el-table-column label="盘点状态" align="center" prop="inventoryStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.inventory_detail_is_update_data" :value="scope.row.isUpdateData"/>
+          <dict-tag :options="dict.type.inventory_detail_is_update_data" :value="scope.row.inventoryStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark"  v-if="columns[3].visible" />
@@ -140,8 +140,8 @@
         <el-form-item label="盘点元数据" prop="inventoryMetadata">
           <el-input v-model="form.inventoryMetadata" type="textarea" placeholder="请输入内容" disabled />
         </el-form-item>
-        <el-form-item label="是否更新数据" prop="isUpdateData">
-          <el-select v-model="form.isUpdateData" placeholder="请选择是否更新数据">
+        <el-form-item label="盘点状态" prop="inventoryStatus">
+          <el-select v-model="form.inventoryStatus" placeholder="请选择盘点状态">
             <el-option
               v-for="dict in dict.type.inventory_detail_is_update_data"
               :key="dict.value"
@@ -216,7 +216,7 @@ export default {
       columns: [
         { key: 0, label: `资产编号`, visible: false },
         { key: 1, label: `创建时间`, visible: false },
-        { key: 2, label: `盘点元数据`, visible: false },
+        { key: 2, label: `盘点元数据`, visible: true },
         { key: 3, label: `备注`, visible: false }
       ],
       // 是否显示弹出层
@@ -226,7 +226,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         orderNumber: null,
-        isUpdateData: null,
+        inventoryStatus: null,
       },
       // 表单参数
       form: {},
@@ -238,8 +238,8 @@ export default {
         inventoryMetadata: [
           { required: true, message: "盘点元数据不能为空", trigger: "blur" }
         ],
-        isUpdateData: [
-          { required: true, message: "是否更新数据不能为空", trigger: "change" }
+        inventoryStatus: [
+          { required: true, message: "盘点状态不能为空", trigger: "change" }
         ],
       }
     };
@@ -272,7 +272,7 @@ export default {
         id: null,
         orderNumber: null,
         inventoryMetadata: null,
-        isUpdateData: null,
+        inventoryStatus: null,
         remark: null
       };
       this.resetForm("form");
@@ -350,7 +350,6 @@ export default {
       const json = JSON.parse(info);
       this.adjustmentOriginalAssetInfo = json;
       this.openAdjustment = true;
-      console.log("资产原信息:", json);
     },
   }
 };