From e14aac2fc3c7a331eedbfc7330a84cea06d12fea Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Wed, 7 Jan 2026 15:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CheckStockinServiceImpl.java |   2 +-
 .../ViewProductAndStockController.java        |  12 +
 .../mapper/ViewProductAndStockMapper.java     |  18 +-
 .../service/IViewProductAndStockService.java  |  25 +-
 .../impl/ViewProductAndStockServiceImpl.java  |  28 +-
 .../freeze/domain/BasStockFreezeRecord.java   |   2 +
 .../domain/BasStockMaintainRecord.java        |   3 +
 .../mapper/check/CheckStockinFinishMapper.xml |   1 +
 .../mapper/check/CheckStockinMapper.xml       |   1 +
 .../ViewProductAndStockMapper.xml             |  37 ++-
 ruoyi-ui/src/views/check/create/index.vue     | 250 ++++++++++--------
 ruoyi-ui/src/views/check/difference/index.vue |   9 +-
 ruoyi-ui/src/views/check/job/in/index.vue     | 128 +++++----
 ruoyi-ui/src/views/check/job/out/index.vue    | 128 ++++-----
 ruoyi-ui/src/views/check/stockCheck/index.vue |  39 ++-
 ruoyi-ui/src/views/stock/management/index.vue |  34 ++-
 16 files changed, 404 insertions(+), 313 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
index 53be5f9..e280463 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
@@ -175,7 +175,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
         checkStockin.setStatus("1");
         checkStockin.setStockSource("0");
         checkStockin.setCheckType(checkStockin.getCheckType());
-        //checkStockin.setErpBill(checkStockin.getErpBill());
+        checkStockin.setErpBill(checkStockin.getErpBill());
         if ("1".equals(checkStockin.getCheckType())) {
             //物料盘点
             for (int i = 0; i < detailList.size(); i++) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
index 41b36e7..e536960 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
@@ -46,6 +46,18 @@ public class ViewProductAndStockController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询库存物资列表
+     */
+    @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:list')")
+    @GetMapping("/pd/list")
+    public TableDataInfo pdList(ViewProductAndStock viewProductAndStock)
+    {
+        startPage();
+        List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockPdList(viewProductAndStock);
+        return getDataTable(list);
+    }
+
     /**
      * 导出库存物资列表
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java
index 386a65f..34ee239 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java
@@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
 
 /**
  * 库存物资Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2026-01-06
  */
-public interface ViewProductAndStockMapper 
+public interface ViewProductAndStockMapper
 {
     /**
      * 查询库存物资
-     * 
+     *
      * @param onlyIdentity 库存物资主键
      * @return 库存物资
      */
@@ -21,7 +21,7 @@ public interface ViewProductAndStockMapper
 
     /**
      * 查询库存物资列表
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 库存物资集合
      */
@@ -29,7 +29,7 @@ public interface ViewProductAndStockMapper
 
     /**
      * 新增库存物资
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ViewProductAndStockMapper
 
     /**
      * 修改库存物资
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ViewProductAndStockMapper
 
     /**
      * 删除库存物资
-     * 
+     *
      * @param onlyIdentity 库存物资主键
      * @return 结果
      */
@@ -53,9 +53,11 @@ public interface ViewProductAndStockMapper
 
     /**
      * 批量删除库存物资
-     * 
+     *
      * @param onlyIdentitys 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys);
+
+    List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java
index 268688b..0b0a07d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java
@@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
 
 /**
  * 库存物资Service接口
- * 
+ *
  * @author ruoyi
  * @date 2026-01-06
  */
-public interface IViewProductAndStockService 
+public interface IViewProductAndStockService
 {
     /**
      * 查询库存物资
-     * 
+     *
      * @param onlyIdentity 库存物资主键
      * @return 库存物资
      */
@@ -21,15 +21,23 @@ public interface IViewProductAndStockService
 
     /**
      * 查询库存物资列表
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 库存物资集合
      */
     public List<ViewProductAndStock> selectViewProductAndStockList(ViewProductAndStock viewProductAndStock);
+    /**
+     * 查询库存物资列表
+     *
+     * @param viewProductAndStock 库存物资
+     * @return 库存物资集合
+     */
+    List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
+
 
     /**
      * 新增库存物资
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -37,7 +45,7 @@ public interface IViewProductAndStockService
 
     /**
      * 修改库存物资
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -45,7 +53,7 @@ public interface IViewProductAndStockService
 
     /**
      * 批量删除库存物资
-     * 
+     *
      * @param onlyIdentitys 需要删除的库存物资主键集合
      * @return 结果
      */
@@ -53,9 +61,10 @@ public interface IViewProductAndStockService
 
     /**
      * 删除库存物资信息
-     * 
+     *
      * @param onlyIdentity 库存物资主键
      * @return 结果
      */
     public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity);
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java
index 1170916..ad2708b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java
@@ -9,19 +9,19 @@ import com.ruoyi.out.productAndStock.service.IViewProductAndStockService;
 
 /**
  * 库存物资Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2026-01-06
  */
 @Service
-public class ViewProductAndStockServiceImpl implements IViewProductAndStockService 
+public class ViewProductAndStockServiceImpl implements IViewProductAndStockService
 {
     @Autowired
     private ViewProductAndStockMapper viewProductAndStockMapper;
 
     /**
      * 查询库存物资
-     * 
+     *
      * @param onlyIdentity 库存物资主键
      * @return 库存物资
      */
@@ -33,7 +33,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
 
     /**
      * 查询库存物资列表
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 库存物资
      */
@@ -43,9 +43,21 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
         return viewProductAndStockMapper.selectViewProductAndStockList(viewProductAndStock);
     }
 
+    /**
+     * 查询库存物资列表
+     *
+     * @param viewProductAndStock 库存物资
+     * @return 库存物资
+     */
+    @Override
+    public List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock) {
+        return viewProductAndStockMapper.selectViewProductAndStockPdList(viewProductAndStock);
+
+    }
+
     /**
      * 新增库存物资
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -57,7 +69,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
 
     /**
      * 修改库存物资
-     * 
+     *
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -69,7 +81,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
 
     /**
      * 批量删除库存物资
-     * 
+     *
      * @param onlyIdentitys 需要删除的库存物资主键
      * @return 结果
      */
@@ -81,7 +93,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
 
     /**
      * 删除库存物资信息
-     * 
+     *
      * @param onlyIdentity 库存物资主键
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
index 248262a..d8d9a22 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
@@ -1,5 +1,6 @@
 package com.ruoyi.stock.freeze.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -90,6 +91,7 @@ public class BasStockFreezeRecord extends BaseEntity
     private String productGuid;
 //    创建时间
     @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Override
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
index 2b131e2..9f2edb3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
@@ -1,9 +1,11 @@
 package com.ruoyi.stock.maintain.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -69,6 +71,7 @@ public class BasStockMaintainRecord extends BaseEntity
     private String warehouseId;
 
     @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Override
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
index b48a9fc..c098c28 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
@@ -109,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.warehouseDataScope}
             </if>
         </where>
+        order by cs.create_date asc
     </select>
 
     <insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish">
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
index 282ffd1..5a369f9 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.warehouseDataScope}
             </if>
         </where>
+             order by cs.create_date asc
     </select>
 
     <select id="selectCheckStockinByStockGuid" parameterType="String" resultMap="CheckStockinResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml
index 8b8c786..8b9d313 100644
--- a/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper">
-    
+
     <resultMap type="ViewProductAndStock" id="ViewProductAndStockResult">
         <result property="onlyIdentity"    column="only_identity"    />
         <result property="productId"    column="product_id"    />
@@ -26,10 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectViewProductAndStockVo">
         select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock
     </sql>
+    <sql id="selectViewProductAndStockPdVo">
+        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock_pd
+    </sql>
 
     <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
         <include refid="selectViewProductAndStockVo"/>
-        <where>  
+        <where>
             <if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
             <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -48,11 +51,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
         </where>
     </select>
-    
+
     <select id="selectViewProductAndStockByOnlyIdentity" parameterType="Long" resultMap="ViewProductAndStockResult">
         <include refid="selectViewProductAndStockVo"/>
         where only_identity = #{onlyIdentity}
     </select>
+    <select id="selectViewProductAndStockPdList" parameterType="ViewProductAndStock"
+            resultMap="ViewProductAndStockResult">
+        <include refid="selectViewProductAndStockPdVo"/>
+        <where>
+            <if test="onlyIdentity != null ">and only_identity = #{onlyIdentity}</if>
+            <if test="productId != null  and productId != ''">and product_id = #{productId}</if>
+            <if test="lotNo != null  and lotNo != ''">and lot_no = #{lotNo}</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="quantity != null  and quantity != ''">and quantity = #{quantity}</if>
+            <if test="warehouseId != null  and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
+            <if test="stackingId != null  and stackingId != ''">and stacking_id = #{stackingId}</if>
+            <if test="spare1 != null  and spare1 != ''">and spare1 = #{spare1}</if>
+            <if test="spare2 != null  and spare2 != ''">and spare2 = #{spare2}</if>
+            <if test="spare3 != null  and spare3 != ''">and spare3 = #{spare3}</if>
+            <if test="spare4 != null  and spare4 != ''">and spare4 = #{spare4}</if>
+            <if test="spare5 != null  and spare5 != ''">and spare5 = #{spare5}</if>
+            <if test="spare6 != null  and spare6 != ''">and spare6 = #{spare6}</if>
+            <if test="voltage != null  and voltage != ''">and voltage = #{voltage}</if>
+            <if test="power != null  and power != ''">and power = #{power}</if>
+            <if test="phase != null  and phase != ''">and phase = #{phase}</if>
+        </where>
+    </select>
 
     <insert id="insertViewProductAndStock" parameterType="ViewProductAndStock">
         insert into view_product_and_stock
@@ -121,9 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewProductAndStockByOnlyIdentitys" parameterType="String">
-        delete from view_product_and_stock where only_identity in 
+        delete from view_product_and_stock where only_identity in
         <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
             #{onlyIdentity}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue
index 65830f6..8df60cb 100644
--- a/ruoyi-ui/src/views/check/create/index.vue
+++ b/ruoyi-ui/src/views/check/create/index.vue
@@ -2,16 +2,19 @@
   <div class="app-container">
     <!-- 主表信息录入 -->
     <el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
-      <!--       <el-form-item label="仓库" prop="warehouseId" required>-->
-      <!--          <el-select v-model="formData.warehouseId" placeholder="请选择仓库" clearable>-->
-      <!--            <el-option-->
-      <!--              v-for="dict in warehouseOptions"-->
-      <!--              :key="dict.warehouseId"-->
-      <!--              :label="dict.warehouseName"-->
-      <!--              :value="dict.warehouseId"-->
-      <!--            />-->
-      <!--          </el-select>-->
-      <!--        </el-form-item>-->
+      <el-form-item label="仓库" prop="warehouseId" required>
+        <el-select v-model="formData.warehouseId" placeholder="请选择仓库" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目号" prop="spare4">
+        <el-input v-model="formData.spare4" placeholder="请输入项目号"/>
+      </el-form-item>
       <el-form-item label="盘点类型" prop="checkType" required>
         <el-select v-model="formData.checkType" placeholder="请选择盘点类型" clearable @change="handleCheckTypeChange">
           <el-option
@@ -22,6 +25,10 @@
           />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="备注" prop="spare5">
+        <el-input v-model="formData.spare5" placeholder="请输入备注"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">重置</el-button>
         <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave"
@@ -32,19 +39,27 @@
 
     <div class="mb8">
       <el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['check:productAndStock:list']"
-                 @click="handleSelectMaterials">选择物资
+                 @click="handleSelectMaterials">选择存货
       </el-button>
       <el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">重新建单</el-button>
     </div>
 
-    <!-- 物资明细表格 -->
+    <!-- 存货明细表格 -->
     <el-table v-loading="loading" :data="materialList">
-      <el-table-column label="物资编号" align="left" prop="productId"/>
-      <el-table-column label="品名" align="left" prop="productName"/>
+      <el-table-column label="存货编号" align="left" prop="productId"/>
+      <el-table-column label="存货名称" align="left" prop="spare7"/>
       <el-table-column label="批号" align="left" prop="lotNo"/>
+      <el-table-column label="层级关系" align="right" prop="spare1"/>
+      <el-table-column label="上层物料" align="right" prop="spare2"/>
+      <el-table-column label="顶层物料" align="right" prop="spare3"/>
+      <el-table-column label="项目号" align="right" prop="spare4"/>
+      <el-table-column label="合同号" align="right" prop="spare5"/>
+      <el-table-column label="销售订单号" align="right" prop="spare6"/>
+      <el-table-column label="供应商编码" align="right" prop="supplierId"/>
+      <el-table-column label="规格型号" align="right" prop="spec"/>
+      <el-table-column label="计量单位" align="right" prop="unit"/>
+<!--      <el-table-column label="货位名称" align="left" prop="cargoSpaceName"/>-->
       <el-table-column label="数量" align="right" prop="quantity"/>
-      <el-table-column label="仓库编号" align="left" prop="warehouseId"/>
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">删除</el-button>
@@ -52,29 +67,61 @@
       </el-table-column>
     </el-table>
 
-    <!-- 选择物料物资弹窗 -->
-    <el-dialog title="选择物资" :visible.sync="materialDialogByProduct" width="800px" append-to-body>
+    <!-- 选择物料存货弹窗 -->
+    <el-dialog title="选择存货" :visible.sync="materialDialogByProduct" width="70%" append-to-body>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="品号" prop="productId">
+        <el-form-item label="存货编码" prop="productId"><!--品号-->
           <el-input
             v-model="queryParams.productId"
-            placeholder="请输入品号"
+            :placeholder="'请输入存货编码'"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="品名" prop="productName">
+        <el-form-item label="存货名称" prop="productName"><!--品名-->
           <el-input
             v-model="queryParams.productName"
-            placeholder="请输入品名"
+            :placeholder="'请输入存货名称'"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="批号" prop="lotNo">
+        <el-form-item label="层级关系" prop="spare1"><!--品名-->
           <el-input
-            v-model="queryParams.lotNo"
-            placeholder="请输入批号"
+            v-model="queryParams.spare1"
+            :placeholder="'请输入层级关系'"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="上层物料" prop="spare2"><!--品名-->
+          <el-input
+            v-model="queryParams.spare2"
+            :placeholder="'请输入上层物料'"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="顶层物料" prop="spare3"><!--品名-->
+          <el-input
+            v-model="queryParams.spare3"
+            :placeholder="'请输入顶层物料'"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="规格型号" prop="power"><!--品名-->
+          <el-input
+            v-model="queryParams.power"
+            :placeholder="'请输入规格型号'"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="计量单位" prop="phase"><!--品名-->
+          <el-input
+            v-model="queryParams.phase"
+            :placeholder="'请输入计量单位'"
             clearable
             @keyup.enter.native="handleQuery"
           />
@@ -99,52 +146,23 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column label="盘点状态" align="center" prop="spare7">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.check_status" :value="scope.row.spare7"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="品号" align="center" prop="productId"/>
-        <el-table-column label="NC号" align="center" prop="spare9"/>
-        <el-table-column label="品名" align="center" prop="productName"/>
-        <el-table-column label="数量" align="center" prop="quantity"/>
-        <el-table-column label="规格" align="center" prop="spec"/>
-        <el-table-column label="品号描述" align="center" prop="price"/>
-        <el-table-column label="英文描述" align="center" prop="cargoNo"/>
-        <el-table-column label="图号" align="center" prop="unit"/>
-        <el-table-column label="电压" align="center" prop="spare5"/>
-        <el-table-column label="电源线" align="center" prop="spare10"/>
-        <el-table-column label="插头" align="center" prop="spare11"/>
-        <el-table-column label="接嘴" align="center" prop="spare12"/>
-        <el-table-column label="快捷码" align="center" prop="spare13"/>
-        <el-table-column label="库存单位编号" align="center" prop="spare14"/>
-        <el-table-column label="库存单位名称" align="center" prop="spare15"/>
-        <el-table-column label="品号群组" align="center" prop="spare16"/>
-        <el-table-column label="归类品" align="center" prop="spare17"/>
-        <el-table-column label="计量体系" align="center" prop="spare18"/>
-        <el-table-column label="群组名称" align="center" prop="spare19"/>
-        <el-table-column label="批号管理" align="center" prop="spare20"/>
-        <el-table-column label="状态" align="center" prop="spare21"/>
-        <el-table-column label="产品大类" align="center" prop="spare22"/>
-        <el-table-column label="产品二类" align="center" prop="spare23"/>
-        <el-table-column label="产品线/产品系列" align="center" prop="spare24"/>
-        <el-table-column label="BOM状态" align="center" prop="spare25"/>
-        <el-table-column label="产品定位" align="center" prop="spare26"/>
-        <el-table-column label="电脑板型号" align="center" prop="spare27"/>
-        <el-table-column label="非标要求" align="center" prop="spare28"/>
-        <el-table-column label="品牌" align="center" prop="spare29"/>
-        <el-table-column label="非标颜色" align="center" prop="spare30"/>
-        <el-table-column label="主颜色" align="center" prop="spare31"/>
-        <el-table-column label="辅助颜色" align="center" prop="spare32"/>
-        <el-table-column label="是否标准款" align="center" prop="spare33"/>
-        <el-table-column label="包装方式" align="center" prop="spare34"/>
-        <el-table-column label="主要包装方式" align="center" prop="spare35"/>
-        <el-table-column label="描述" align="center" prop="remark"/>
-        <el-table-column label="长" align="center" prop="spare36"/>
-        <el-table-column label="宽" align="center" prop="spare37"/>
-        <el-table-column label="高" align="center" prop="spare38"/>
-        <el-table-column label="包装材积" align="center" prop="spare39"/>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" prop="onlyIdentity" />
+        <el-table-column label="存货编码" align="center" prop="productId" />
+        <el-table-column label="批号" align="center" prop="lotNo" />
+        <el-table-column label="存货名称" align="center" prop="productName" />
+        <el-table-column label="库存数量" align="center" prop="quantity" />
+        <el-table-column label="仓库编码" align="center" prop="warehouseId" />
+        <el-table-column label="供应商名称" align="center" prop="stackingId" />
+        <el-table-column label="层级关系" align="center" prop="spare1" />
+        <el-table-column label="上层物料" align="center" prop="spare2" />
+        <el-table-column label="顶层物料" align="center" prop="spare3" />
+        <el-table-column label="项目号" align="center" prop="spare4" />
+        <el-table-column label="合同号" align="center" prop="spare5" />
+        <el-table-column label="销售订单号" align="center" prop="spare6" />
+        <el-table-column label="供应商编码" align="center" prop="voltage" />
+        <el-table-column label="规格型号" align="center" prop="power" />
+        <el-table-column label="计量单位" align="center" prop="phase" />
       </el-table>
 
       <pagination
@@ -342,30 +360,36 @@ export default {
         ],
         checkType: [
           {required: true, message: '请选择单据类型', trigger: "change"}
+        ],
+        spare4: [
+          {required: true, message: '请输入项目号', trigger: "change"}
         ]
       },
       // 主表数据
       formData: {
-        warehouseId: "01",
+        warehouseId: null,
         customerNo: null,
-        checkType: null
+        checkType: null,
+        spare5: null,
+        spare4: null,
+        erpBill: null,
       },
       // 仓库选项
       warehouseOptions: [],
-      // 物资明细列表
+      // 存货明细列表
       materialList: [],
-      // 选择物资弹窗
+      // 选择存货弹窗
       materialDialogByProduct: false,
       materialDialogByTrayCode: false,
-      // 物资选择列表
+      // 存货选择列表
       materialOptions: [],
       // 托盘选择列表
       trayOptions: [],
-      // 已选择的物资
+      // 已选择的存货
       selectedMaterials: [],
       // 已选择的托盘
       selectedTrays: [],
-      // 物资查询参数
+      // 存货查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -412,7 +436,7 @@ export default {
         this.warehouseOptions = response.rows;
       });
     },
-    /** 打开选择物资弹窗 */
+    /** 打开选择存货弹窗 */
     handleSelectMaterials() {
       // if (!this.formData.warehouseId) {
       //   this.$modal.msgError('请选择仓库');
@@ -423,18 +447,23 @@ export default {
         return;
       }
       if (this.formData.checkType === '1') {
+        if (!this.formData.spare4){
+          this.$modal.msgError('请输入项目号');
+          return;
+        }
         this.materialDialogByProduct = true;
         // 设置查询参数中的仓库ID为主表选择的仓库
-        this.queryParams.warehouseId = "01";
+        this.queryParams.warehouseId = this.formData.warehouseId;
+        this.queryParams.spare4 = this.formData.spare4;
         this.getMaterialList();
       } else if (this.formData.checkType === '2') {
         this.materialDialogByTrayCode = true;
         // 设置查询参数中的仓库ID为主表选择的仓库
-        this.queryParams.warehouseId = "01";
+        this.queryParams.warehouseId = this.formData.warehouseId;
         this.getMaterialByTrayCodeList();
       }
     },
-    /** 获取物资列表 */
+    /** 获取存货列表 */
     getMaterialList() {
       this.materialLoading = true;
       if (this.formData.checkType === '1') {
@@ -445,7 +474,7 @@ export default {
         });
       }
     },
-    /* 获取托盘物资列表*/
+    /* 获取托盘存货列表*/
     getMaterialByTrayCodeList() {
       this.trayLoading = true;
       if (this.formData.checkType === '2') {
@@ -460,7 +489,7 @@ export default {
         });
       }
     },
-    /** 物资选择变更 */
+    /** 存货选择变更 */
     handleSelectionChange(selection) {
       this.selectedMaterials = selection;
     },
@@ -483,7 +512,7 @@ export default {
         });
       }
     },
-    /** 确认选择物资 */
+    /** 确认选择存货 */
     confirmSelectMaterials() {
       if (this.formData.checkType === '1') {
         this.confirmSelectMaterialsByProduct();
@@ -491,19 +520,19 @@ export default {
         this.confirmSelectMaterialsByTray();
       }
     },
-    /** 确认选择物料物资 */
+    /** 确认选择物料存货 */
     confirmSelectMaterialsByProduct() {
       if (this.selectedMaterials.length === 0) {
-        this.$modal.msgError('请选择物资');
+        this.$modal.msgError('请选择存货');
         return;
       }
-      // 过滤掉已经存在的物资
+      // 过滤掉已经存在的存货
       const newMaterials = this.selectedMaterials.filter(item => {
         return !this.materialList.some(existing => existing.onlyIdentity === item.onlyIdentity);
       });
 
       if (newMaterials.length === 0) {
-        this.$modal.msgWarning('选择的物资已存在');
+        this.$modal.msgWarning('选择的存货已存在');
         return;
       }
 
@@ -511,32 +540,29 @@ export default {
         newMaterials.map(item => ({
           productId: item.productId,
           productGuId: item.productGuid,
-          productName: item.productName,
+          spare7: item.productName,
           quantity: item.quantity,
           lotNo: item.lotNo,
           onlyIdentity: item.onlyIdentity,
           warehouseId: item.warehouseId,
           cargoSpaceId: item.cargoSpaceId,
           cargoSpaceName: item.cargoSpaceName,
-          spec: item.spare1,
-          // spare3: item.spare3,
-          spare1: item.spare4,
-          spare3: item.spare5,
-          spare4: item.spare6,
-          spare5: item.voltage,
-          spare6: item.power,
-          spare7: item.phase,
-          spare2: item.netWeight,
-          spare8: item.grossWeight,
-          spare9: item.distribution,
-          unit: item.model,
-          orderId: item.orderId
+          spare1: item.spare1,
+          spare2: item.spare2,
+          spare3: item.spare3,
+          spare4: item.spare4,
+          spare5: item.spare5,
+          spare6: item.spare6,
+          spec: item.power,
+          unit: item.phase,
+          supplierId: item.stackingId,
+
         }))
       );
       this.materialDialogByProduct = false;
       this.selectedMaterials = [];
     },
-    /** 确认选择托盘物资 */
+    /** 确认选择托盘存货 */
     confirmSelectMaterialsByTray() {
       if (this.selectedTrays.length === 0) {
         this.$modal.msgError('请选择托盘');
@@ -580,7 +606,7 @@ export default {
       this.materialDialogByTrayCode = false;
       this.selectedTrays = [];
     },
-    /** 取消选择物资 */
+    /** 取消选择存货 */
     cancelSelectMaterials() {
       if (this.formData.checkType === '1') {
         this.cancelSelectMaterialsByProduct();
@@ -588,22 +614,22 @@ export default {
         this.cancelSelectMaterialsByTray();
       }
     },
-    /** 取消选择物料物资 */
+    /** 取消选择物料存货 */
     cancelSelectMaterialsByProduct() {
       this.selectedMaterials = [];
       this.materialDialogByProduct = false;
     },
-    /** 取消选择托盘物资 */
+    /** 取消选择托盘存货 */
     cancelSelectMaterialsByTray() {
       this.selectedTrays = [];
       this.materialDialogByTrayCode = false;
     },
-    /** 物资搜索按钮操作 */
+    /** 存货搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getMaterialList();
     },
-    /** 物资重置按钮操作 */
+    /** 存货重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
@@ -625,7 +651,7 @@ export default {
         this.handleQuery();
       })
     },
-    /** 删除物资 */
+    /** 删除存货 */
     handleDelete(index) {
       this.materialList.splice(index, 1);
     },
@@ -634,7 +660,7 @@ export default {
       this.$refs.formRef.validate(valid => {
         if (valid) {
           if (this.materialList.length === 0) {
-            this.$modal.msgError('请选择物资');
+            this.$modal.msgError('请选择存货');
             return;
           }
           const data = {
@@ -655,7 +681,7 @@ export default {
     /** 单据类型变更处理 */
     handleCheckTypeChange(value) {
       if (this.materialList.length > 0) {
-        this.$modal.msgWarning('已添加物资，不能更改单据类型');
+        this.$modal.msgWarning('已添加存货，不能更改单据类型');
         this.$nextTick(() => {
           this.formData.checkType = this.oldCheckType;
         });
diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue
index 1727cd8..585e921 100644
--- a/ruoyi-ui/src/views/check/difference/index.vue
+++ b/ruoyi-ui/src/views/check/difference/index.vue
@@ -33,10 +33,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品号" prop="productId">
+      <el-form-item label="存货编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入品号"
+          placeholder="请输入存货编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -115,9 +115,8 @@
       <el-table-column label="库存编号" align="left" prop="stockId" />
       <el-table-column label="托盘编码" align="left" prop="trayCode" />
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
-      <el-table-column label="品号" align="left" prop="productId" />
-      <el-table-column label="品名" align="left" prop="extraField.materialDesc"/>
-      <el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/>
+      <el-table-column label="存货编码" align="left" prop="productId" />
+      <el-table-column label="存货名称" align="left" prop="extraField.materialDesc"/>
       <el-table-column label="原值" align="right" prop="oldQuantity" />
       <el-table-column label="新值" align="right" prop="newQuantity" />
       <el-table-column label="操作方式" align="left" prop="recordType" >
diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue
index f6e6ece..800bdad 100644
--- a/ruoyi-ui/src/views/check/job/in/index.vue
+++ b/ruoyi-ui/src/views/check/job/in/index.vue
@@ -1,15 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="任务ID" prop="jobId">
-        <el-input
-          v-model="queryParams.jobId"
-          placeholder="请输入任务ID"
+      <el-form-item label="仓库" prop="warehouseId"> <!-- 仓库 -->
+        <el-select
+          v-model="queryParams.warehouseId"
+          placeholder="请选择仓库"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="任务状态" prop="status">
+        >
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务状态" prop="status"> <!-- 状态 -->
         <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
           <el-option
             v-for="dict in dict.type.mydo_job_status"
@@ -19,7 +25,18 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务号" prop="taskNo">
+      <el-form-item label="作业类型" prop="inOrOut"> <!-- 作业类型 -->
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
+          <el-option
+            v-for="dict in dict.type.out_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="任务号" prop="taskNo"> <!-- 任务号 -->
         <el-input
           v-model="queryParams.taskNo"
           placeholder="请输入任务号"
@@ -27,36 +44,37 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="序列号" prop="trayCode">
+      <el-form-item label="托盘码" prop="trayCode"> <!-- 托盘条码 -->
         <el-input
           v-model="queryParams.trayCode"
-          placeholder="请输入序列号"
+          placeholder="请输入托盘码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单号" prop="lineId">
+      <el-form-item label="存货编码" prop="productId">
         <el-input
-          v-model="queryParams.lineId"
-          placeholder="请输入订单号"
+          v-model="queryParams.productId"
+          placeholder="请输入存货编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
+      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
         <el-date-picker clearable
                         v-model="queryParams.startTime"
-                        type="datetime" style="width: 206px"
+                        type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择开始时间">
+                        placeholder="请选择开始时间" style="width: 206px">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="结束时间" prop="finishTime">
+
+      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
         <el-date-picker clearable
                         v-model="queryParams.finishTime"
-                        type="datetime" style="width: 206px"
+                        type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择结束时间">
+                        placeholder="请选择结束时间" style="width: 206px">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -94,40 +112,25 @@
     <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
       max-height="400">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
-      <el-table-column label="任务状态" align="left" prop="status">
+      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <!-- 任务ID -->
+      <el-table-column label="任务状态" align="left" prop="status"> <!-- 任务状态 -->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="上线类型" align="left" prop="onLineType">
+      <el-table-column label="任务类型" align="left" prop="inOrOut"> <!-- 任务类型 -->
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
-        </template>
-      </el-table-column>-->
-      <el-table-column label="任务号" align="left" prop="taskNo" />
-      <el-table-column label="任务类型" align="left" prop="inOrOut">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.check_in_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="供应商" align="left" prop="supplierName" key="supplierId" value="supplierName" />-->
-<!--      <el-table-column label="部门" align="left" prop="departmentName" />-->
-      <el-table-column label="序列号" align="left" prop="trayCode" />
-      <el-table-column label="货位" align="left" prop="cargoSpaceName"  width="160"/>
-      <el-table-column label="订单号" align="left" prop="lineId" />
-      <el-table-column label="入口" align="left" prop="entranceId" />
-
-<!--      <el-table-column label="优先级" align="right" prop="priority" />-->
-<!--      <el-table-column label="执行阶段" align="left" prop="executionPhase">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
-        </template>
-      </el-table-column>-->
-      <el-table-column label="创建时间" align="left" prop="createTime" width="160"/>
-      <el-table-column label="开始时间" align="left" prop="startTime" width="160"/>
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="160"/>
-<!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
+      <el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
+      <el-table-column label="托盘码" align="left" prop="trayCode"  width="130" />
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID -->
+      <el-table-column label="项目号" align="left" prop="lineId" width="130"/> <!-- 结束时间 -->
+      <el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 -->
+      <el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 -->
+      <el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 -->
     </el-table>
 
     <pagination
@@ -141,25 +144,20 @@
     <el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange"
               max-height="300"
     >
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
-      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
-      <el-table-column label="品号" align="left" prop="productId" />
-      <el-table-column label="品名" align="left" prop="productName" width="160"/>
-      <el-table-column label="入库数量" align="right" prop="inQuantity" />
-      <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
-      <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
-      <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
-      <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
-      <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
-      <el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
-      <el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
-      <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
-      <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
-      <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
+      <el-table-column label="库存ID" align="left" prop="stockId" width="160" />
+      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
+      <el-table-column label="存货编码" align="left" prop="productId" />
+      <el-table-column label="存货名称" align="left" prop="productName" />
+      <el-table-column label="批次号" align="left" prop="lotNo" />
+      <el-table-column label="客商名称" align="left" prop="stackingId"/>
+      <el-table-column label="层级关系" align="left" prop="spare1"/>
+      <el-table-column label="上层物料" align="left" prop="spare2"/>
+      <el-table-column label="顶层物料" align="left" prop="spare3"/>
+      <el-table-column label="项目号" align="left" prop="spare4"/>
+      <el-table-column label="合同号" align="left" prop="spare5"/>
+      <el-table-column label="销售订单" align="left" prop="spare6"/>
+      <el-table-column label="出库数量" align="right" prop="outQuantity" />
     </el-table>
 
     <pagination
diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue
index fffd2f4..ac48313 100644
--- a/ruoyi-ui/src/views/check/job/out/index.vue
+++ b/ruoyi-ui/src/views/check/job/out/index.vue
@@ -1,15 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <!--      <el-form-item label="任务ID" prop="jobId">
-              <el-input
-                v-model="queryParams.jobId"
-                placeholder="请输入任务ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>-->
-      <el-form-item label="任务状态" prop="status">
+      <el-form-item label="仓库" prop="warehouseId"> <!-- 仓库 -->
+        <el-select
+          v-model="queryParams.warehouseId"
+          placeholder="请选择仓库"
+          clearable
+        >
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务状态" prop="status"> <!-- 状态 -->
         <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
           <el-option
             v-for="dict in dict.type.mydo_job_status"
@@ -19,7 +25,18 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务号" prop="taskNo">
+      <el-form-item label="作业类型" prop="inOrOut"> <!-- 作业类型 -->
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
+          <el-option
+            v-for="dict in dict.type.out_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="任务号" prop="taskNo"> <!-- 任务号 -->
         <el-input
           v-model="queryParams.taskNo"
           placeholder="请输入任务号"
@@ -27,36 +44,37 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="序列号" prop="trayCode">
+      <el-form-item label="托盘码" prop="trayCode"> <!-- 托盘条码 -->
         <el-input
           v-model="queryParams.trayCode"
-          placeholder="请输入序列号"
+          placeholder="请输入托盘码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单号" prop="lineId">
+      <el-form-item label="存货编码" prop="productId">
         <el-input
-          v-model="queryParams.lineId"
-          placeholder="请输入订单号"
+          v-model="queryParams.productId"
+          placeholder="请输入存货编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
+      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
         <el-date-picker clearable
                         v-model="queryParams.startTime"
-                        type="datetime" style="width: 206px"
+                        type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择开始时间">
+                        placeholder="请选择开始时间" style="width: 206px">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="结束时间" prop="finishTime">
+
+      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
         <el-date-picker clearable
                         v-model="queryParams.finishTime"
-                        type="datetime" style="width: 206px"
+                        type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择结束时间">
+                        placeholder="请选择结束时间" style="width: 206px">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -92,36 +110,25 @@
 
     <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange"
               @row-click="handleRowClick" max-height="400">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="任务ID" align="left" prop="jobId"/>
-      <el-table-column label="任务状态" align="left" prop="status">
+      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <!-- 任务ID -->
+      <el-table-column label="任务状态" align="left" prop="status"> <!-- 任务状态 -->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-
-
-      <el-table-column label="任务号" align="left" prop="taskNo"/>
-      <el-table-column label="任务类型" align="left" prop="inOrOut">
+      <el-table-column label="任务类型" align="left" prop="inOrOut"> <!-- 任务类型 -->
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.check_out_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="部门" align="left" prop="departmentName" />-->
-      <el-table-column label="序列号" align="left" prop="trayCode"/>
-      <el-table-column label="货位" align="left" prop="cargoSpaceName"/>
-      <el-table-column label="订单号" align="right" prop="lineId"/>
-      <!--      <el-table-column label="执行阶段" align="left" prop="executionPhase">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
-              </template>
-            </el-table-column>-->
-      <el-table-column label="出口" align="left" prop="exitId"/>
-      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
-      </el-table-column>
-      <el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
-      <!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
+      <el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
+      <el-table-column label="托盘码" align="left" prop="trayCode"  width="130" />
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID -->
+      <el-table-column label="项目号" align="left" prop="lineId" width="130"/> <!-- 结束时间 -->
+      <el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 -->
+      <el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 -->
+      <el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 -->
 
     </el-table>
 
@@ -134,25 +141,20 @@
     />
 
     <el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160"/>
-      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
-      <el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
-      <el-table-column label="品号" align="left" prop="productId"/>
-      <el-table-column label="品名" align="left" prop="productName" width="160"/>
-      <el-table-column label="出库数量" align="right" prop="outQuantity"/> <!-- 出库数量 -->
-      <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
-      <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
-      <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
-      <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
-      <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
-      <el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
-      <el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
-      <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
-      <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
-      <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
+      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
+      <el-table-column label="库存ID" align="left" prop="stockId" width="160" />
+      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
+      <el-table-column label="存货编码" align="left" prop="productId" />
+      <el-table-column label="存货名称" align="left" prop="productName" />
+      <el-table-column label="批次号" align="left" prop="lotNo" />
+      <el-table-column label="客商名称" align="left" prop="stackingId"/>
+      <el-table-column label="层级关系" align="left" prop="spare1"/>
+      <el-table-column label="上层物料" align="left" prop="spare2"/>
+      <el-table-column label="顶层物料" align="left" prop="spare3"/>
+      <el-table-column label="项目号" align="left" prop="spare4"/>
+      <el-table-column label="合同号" align="left" prop="spare5"/>
+      <el-table-column label="销售订单" align="left" prop="spare6"/>
+      <el-table-column label="出库数量" align="right" prop="outQuantity" />
     </el-table>
 
     <pagination
diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue
index 3f54530..16137da 100644
--- a/ruoyi-ui/src/views/check/stockCheck/index.vue
+++ b/ruoyi-ui/src/views/check/stockCheck/index.vue
@@ -55,7 +55,7 @@
           :disabled="single"
           @click="handleReview"
           v-hasPermi="['check:stockCheck:edit']"
-        >审核</el-button>
+        >审核单据</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -77,7 +77,7 @@
           :disabled="single"
           @click="handleConfirmation"
           v-hasPermi="['check:stockCheck:edit']"
-        >确认</el-button>
+        >确认单据</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,7 +88,7 @@
           :disabled="multiple"
           @click="handleInvalidated"
           v-hasPermi="['check:stockCheck:edit']"
-        >作废</el-button>
+        >作废单据</el-button>
       </el-col>
 
 
@@ -109,12 +109,14 @@
           <dict-tag :options="dict.type.check_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
-      <el-table-column label="部门" align="left" prop="departmentName" />
+      <el-table-column label="项目号" align="left" prop="spare4" />
+      <el-table-column label="仓库" align="left" prop="warehouseName" />
+<!--      <el-table-column label="部门" align="left" prop="departmentName" />-->
       <el-table-column label="创建人" align="left" prop="createManId" />
 <!--      <el-table-column label="盘点位置" align="left" prop="spare1" />-->
       <el-table-column label="创建时间" align="left" prop="createDate" />
       <el-table-column label="完成时间" align="left" prop="finishDate" />
+      <el-table-column label="备注" align="left" prop="spare5" />
     </el-table>
 
     <pagination
@@ -128,21 +130,18 @@
     <el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange">
       <el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160" />
       <el-table-column label="主单ID" align="left" prop="stockCheckId" width="160" />
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName"  width="160"/>
-      <el-table-column label="品号" align="left" prop="productId"/><!--品号-->
-      <el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
-      <el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
-      <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
-      <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
-      <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
-      <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
-      <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
-      <el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
-      <el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
-      <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
-      <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
-      <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
+<!--      <el-table-column label="货位名称" align="left" prop="cargoSpaceName"  width="160"/>-->
+      <el-table-column label="存货编码" align="left" prop="productId" width="160"/>
+      <el-table-column label="存货名称" align="left" prop="spare7" width="160"/>
+      <el-table-column label="批号" align="left" prop="lotNo"/>
+      <el-table-column label="计量单位" align="left" prop="unit"/>
+      <el-table-column label="规格型号" align="left" prop="spec"/>
+      <el-table-column label="层级关系" align="left" prop="spare1"/>
+      <el-table-column label="上层物料" align="left" prop="spare2"/>
+      <el-table-column label="顶层物料" align="left" prop="spare3"/>
+      <el-table-column label="项目号" align="left" prop="spare4"/>
+      <el-table-column label="合同号" align="left" prop="spare5"/>
+      <el-table-column label="销售订单" align="left" prop="spare6"/>
       <el-table-column label="计划数量" align="right" prop="quantity"/>
       <el-table-column label="扫码数量" align="right" prop="scanNum"/>
       <el-table-column label="实际数量" align="right" prop="assignNum"/>
diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue
index fb4d6b8..159a824 100644
--- a/ruoyi-ui/src/views/stock/management/index.vue
+++ b/ruoyi-ui/src/views/stock/management/index.vue
@@ -46,10 +46,10 @@
       </el-form-item>-->
 
 
-      <el-form-item label="品名" prop="productName"><!-- 品名 -->
+      <el-form-item label="存货名称" prop="productName"><!-- 存货名称 -->
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入品名"
+          placeholder="请输入存货名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -107,10 +107,10 @@
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="品号" align="center" prop="productId" />
-      <el-table-column label="品名" align="center" prop="productName" width="160"/>
-      <el-table-column label="批次号" align="center" prop="lotNo" sortable width="160"/>
-      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>
+      <el-table-column label="存货编码" align="center" prop="productId" />
+      <el-table-column label="存货名称" align="center" prop="productName" width="160"/>
+      <el-table-column label="批次号" align="center" prop="lotNo"  width="160"/>
+<!--      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
       <el-table-column label="入库时间" align="center" prop="inDate" width="160" sortable/>
       <el-table-column label="数量" align="center" prop="quantity" sortable/>
       <el-table-column label="作业编码" align="center" prop="jobId" width="160" sortable/>
@@ -119,18 +119,16 @@
       <el-table-column label="入库单号" align="center" prop="stockinId" width="160" sortable/>
 <!--      <el-table-column label="入库类型" align="center" prop="inType" />-->
 <!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
-      <el-table-column label="规格" align="center" prop="spare1" />
-      <el-table-column label="单位" align="center" prop="spare3" />
-      <el-table-column label="型号" align="center" prop="spare4" />
-      <el-table-column label="颜色" align="center" prop="spare5" />
-      <el-table-column label="序列号" align="center" prop="spare6" />
-      <el-table-column label="电压" align="center" prop="voltage" />
-      <el-table-column label="功率" align="center" prop="power" />
-      <el-table-column label="相位" align="center" prop="phase" />
-      <el-table-column label="净重" align="center" prop="netWeight" />
-      <el-table-column label="毛重" align="center" prop="grossWeight" />
-      <el-table-column label="分销" align="center" prop="distribution" />
-      <el-table-column label="机型" align="center" prop="model" />
+      <el-table-column label="层级关系" align="center" prop="spare1" />
+      <el-table-column label="层级关系" align="center" prop="spare2" />
+      <el-table-column label="顶层物料" align="center" prop="spare3" />
+      <el-table-column label="项目号" align="center" prop="spare4" />
+      <el-table-column label="合同号" align="center" prop="spare5" />
+      <el-table-column label="销售订单" align="center" prop="spare6" />
+      <el-table-column label="供应商编码" align="center" prop="voltage" />
+      <el-table-column label="规格型号" align="center" prop="power" />
+      <el-table-column label="计量单位" align="center" prop="phase" />
+<!--      <el-table-column label="净重" align="center" prop="netWeight" />-->
       <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
         <template slot-scope="scope">
           <el-button