From 54406b480b4b37f47dbb1dfe6d9e6b6903bf0e1a Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Sat, 11 Oct 2025 14:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../out/OutStockoutDetailFinishMapper.xml     | 11 ++--
 ruoyi-ui/src/views/check/job/in/index.vue     | 65 +++++++++----------
 ruoyi-ui/src/views/check/job/out/index.vue    | 61 ++++++++---------
 ruoyi-ui/src/views/check/stockCheck/index.vue | 20 +++---
 ruoyi-ui/src/views/in/job/index.vue           | 43 ++++++------
 ruoyi-ui/src/views/in/stockIn/index.vue       | 10 +--
 ruoyi-ui/src/views/job/outJobManagement.vue   | 10 +--
 ruoyi-ui/src/views/out/addOutStockout.vue     | 22 +++----
 ruoyi-ui/src/views/out/outStockoutManage.vue  | 20 +++---
 ruoyi-ui/src/views/out/productAndStock.vue    | 16 ++---
 ruoyi-ui/src/views/stock/freeze/index.vue     | 12 ++--
 ruoyi-ui/src/views/stock/management/index.vue | 30 ++++-----
 ruoyi-ui/src/views/stock/pointOut.vue         | 59 ++++++-----------
 ruoyi-ui/src/views/stock/record/index.vue     | 12 ++--
 14 files changed, 180 insertions(+), 211 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
index f0b12f5..02ba957 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.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.outStockoutDetailFinish.mapper.OutStockoutDetailFinishMapper">
-    
+
     <resultMap type="OutStockoutDetailFinish" id="OutStockoutDetailFinishResult">
         <result property="stockoutDetailId"    column="stockout_detail_id"    />
         <result property="stockoutGuid"    column="stockout_guid"    />
@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="distribution"    column="distribution"    />
         <result property="model"    column="model"    />
         <result property="orderId"    column="order_id"    />
+        <result property="productName"    column="product_name"    />
     </resultMap>
 
     <sql id="selectOutStockoutDetailFinishVo">
@@ -87,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOutStockoutDetailFinishList" parameterType="OutStockoutDetailFinish" resultMap="OutStockoutDetailFinishResult">
         <include refid="selectOutStockoutDetailFinishVo"/>
-        <where>  
+        <where>
             <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</if>
             <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid = #{stockoutGuid}</if>
             <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
@@ -120,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</if>
         </where>
     </select>
-    
+
     <select id="selectOutStockoutDetailFinishByStockoutDetailId" parameterType="String" resultMap="OutStockoutDetailFinishResult">
         <include refid="selectOutStockoutDetailFinishVo"/>
         where stockout_detail_id = #{stockoutDetailId}
@@ -241,7 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteOutStockoutDetailFinishByStockoutDetailIds" parameterType="String">
-        delete from out_stockout_detail_finish where stockout_detail_id in 
+        delete from out_stockout_detail_finish where stockout_detail_id in
         <foreach item="stockoutDetailId" collection="array" open="(" separator="," close=")">
             #{stockoutDetailId}
         </foreach>
@@ -257,4 +258,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from out_stockout_detail_finish d left join bas_product p on d.product_id = p.product_id
         where stockout_guid = #{stockoutGuid}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue
index 9f968dd..58799a8 100644
--- a/ruoyi-ui/src/views/check/job/in/index.vue
+++ b/ruoyi-ui/src/views/check/job/in/index.vue
@@ -1,14 +1,14 @@
 <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-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>-->
       <el-form-item label="任务状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择任务状态" >
           <el-option
@@ -27,7 +27,7 @@
           @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="请输入托盘码"
@@ -55,7 +55,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable
           v-model="queryParams.startTime"
@@ -81,7 +81,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="仓库" prop="warehouseId">
+<!--      <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
           placeholder="请选择仓库"
@@ -95,7 +95,7 @@
             :value="item.warehouseId"
           />
         </el-select>
-      </el-form-item>
+      </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>
@@ -131,45 +131,40 @@
     <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" />
+      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
       <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="onLineType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
         </template>
-      </el-table-column>
+      </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"/>
         </template>
       </el-table-column>
-      <el-table-column label="任务号" align="left" prop="taskNo" />
-      <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" />
-      <el-table-column label="优先级" align="right" prop="priority" />
-      <el-table-column label="执行阶段" align="left" prop="executionPhase">
+<!--      <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="startTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="入口ID" align="left" prop="entranceId" />
-      <el-table-column label="仓库" align="left" prop="warehouseName" />
+      </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>
 
     <pagination
@@ -184,12 +179,13 @@
               max-height="300"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" />
-      <el-table-column label="任务ID" align="left" prop="jobId" />
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" />
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
+      <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" />
+      <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"/><!--规格-->
@@ -201,7 +197,6 @@
       <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="right" prop="inQuantity" />
     </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 90e2f76..0d470ca 100644
--- a/ruoyi-ui/src/views/check/job/out/index.vue
+++ b/ruoyi-ui/src/views/check/job/out/index.vue
@@ -1,14 +1,14 @@
 <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-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>-->
       <el-form-item label="任务状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择任务状态">
           <el-option
@@ -27,7 +27,7 @@
           @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="请输入托盘码"
@@ -54,7 +54,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable
           v-model="queryParams.startTime"
@@ -72,15 +72,15 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="出口ID" prop="exitId">
+      <el-form-item label="出口" prop="exitId">
         <el-input
           v-model="queryParams.exitId"
-          placeholder="请输入出口ID"
+          placeholder="请输入出口"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库" prop="warehouseId">
+<!--      <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
           placeholder="请选择仓库"
@@ -94,7 +94,7 @@
             :value="item.warehouseId"
           />
         </el-select>
-      </el-form-item>
+      </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>
@@ -135,35 +135,29 @@
         </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_out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <el-table-column label="任务号" align="left" prop="taskNo" />
-      <el-table-column label="部门" align="left" prop="departmentName" />
-      <el-table-column label="托盘码" align="left" prop="trayCode" />
+<!--      <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="priority" />
-      <el-table-column label="执行阶段" align="left" prop="executionPhase">
+      <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>-->
+      <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">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="出口ID" align="left" prop="exitId" />
-      <el-table-column label="仓库" align="left" prop="warehouseName" />
+      <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>
 
@@ -176,13 +170,14 @@
     />
 
     <el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" />
-      <el-table-column label="任务ID" align="left" prop="jobId" />
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" />
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
-      <el-table-column label="库存ID" align="left" prop="stockId" />
+      <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" />
+      <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"/><!--规格-->
@@ -194,8 +189,6 @@
       <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="right" prop="outQuantity" /> <!-- 出库数量 -->
-      <el-table-column label="拣选数量" align="right" prop="pickQuantity" /> <!-- 拣选数量 -->
     </el-table>
 
     <pagination
diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue
index 2db09f6..f8e8beb 100644
--- a/ruoyi-ui/src/views/check/stockCheck/index.vue
+++ b/ruoyi-ui/src/views/check/stockCheck/index.vue
@@ -1,10 +1,10 @@
 <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="stockCheckId">
+      <el-form-item label="盘点单据" prop="stockCheckId">
         <el-input
           v-model="queryParams.stockCheckId"
-          placeholder="请输入盘点单据ID"
+          placeholder="请输入盘点单据"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -29,7 +29,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库" prop="warehouseId">
+<!--      <el-form-item label="仓库" prop="warehouseId">
         <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
           <el-option
             v-for="item in warehouseOptions"
@@ -38,7 +38,7 @@
             :value="item.warehouseId"
           />
         </el-select>
-      </el-form-item>
+      </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>
@@ -98,7 +98,7 @@
 
     <el-table v-loading="loading" :data="stockCheckList" @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="stockCheckId" />
+      <el-table-column label="盘点单据" align="left" prop="stockCheckId" />
       <el-table-column label="盘库类型" align="left" prop="checkType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.check_stock_type" :value="scope.row.checkType"/>
@@ -110,7 +110,7 @@
           <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="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" />
@@ -127,11 +127,11 @@
     />
 
     <el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange">
-      <el-table-column label="子单ID" align="left" prop="stockCheckDetailId" />
-      <el-table-column label="主单ID" align="left" prop="stockCheckId" />
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
+      <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"/><!--物料编码-->
+      <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"/><!--分销-->
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index 5aa36a1..917c3fb 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -1,14 +1,14 @@
 <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-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>-->
       <el-form-item label="任务状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择任务状态" >
           <el-option
@@ -27,16 +27,16 @@
           @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="请输入托盘码"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
 
-      <el-form-item label="执行阶段" prop="executionPhase">
+<!--      <el-form-item label="执行阶段" prop="executionPhase">
         <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
           <el-option
             v-for="dict in dict.type.execution_phase_type"
@@ -45,8 +45,8 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
-      <el-form-item label="任务类型" prop="inOrOut">
+      </el-form-item>-->
+<!--      <el-form-item label="任务类型" prop="inOrOut">
         <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
           <el-option
             v-for="dict in dict.type.in_job_type"
@@ -55,7 +55,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable
           v-model="queryParams.startTime"
@@ -72,10 +72,10 @@
                         placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="入口ID" prop="entranceId">
+      <el-form-item label="入口" prop="entranceId">
         <el-input
           v-model="queryParams.entranceId"
-          placeholder="请输入入口ID"
+          placeholder="请输入入口"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -145,16 +145,17 @@
         </template>
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" />
-      <el-table-column label="托盘码" align="left" prop="trayCode" width="140" />
+<!--      <el-table-column label="托盘码" align="left" prop="trayCode" width="140" />-->
       <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" />
-      <el-table-column label="优先级" align="left" 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="入口ID" align="left" prop="entranceId" />
-      <el-table-column label="仓库" align="left" prop="warehouseName" />
+<!--      <el-table-column label="优先级" align="left" 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="lineId" />
+      <el-table-column label="入口" align="left" prop="entranceId" />
+<!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
       <el-table-column label="创建时间" align="left" prop="createTime" width="180"/>
       <el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
       <el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
@@ -174,8 +175,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="150" />
       <el-table-column label="任务ID" align="left" prop="jobId" width="140" />
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" />
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
+      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="150" />
+      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
       <el-table-column label="物料编码" align="left" prop="productId" width="140" />
       <el-table-column label="物料名称" align="left" prop="productName" />
       <el-table-column label="批号" align="left" prop="lotNo" />
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index 3adb92f..9cf92f6 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -133,8 +133,8 @@
               @row-click="handleRowClick" max-height="400">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
-      <el-table-column label="入库订单" align="left" prop="stockinId"/><!--入库订单-->
-      <el-table-column label="订单号" align="left" prop="erpBill"/><!--入库订单-->
+      <el-table-column label="入库订单" align="left" prop="stockinId" width="150"/><!--入库订单-->
+      <el-table-column label="订单号" align="left" prop="erpBill"  width="150"/><!--入库订单-->
       <el-table-column label="入库类型" align="left" prop="inType"><!--入库类型-->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -168,10 +168,10 @@
 
     <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子单ID" align="left" prop="stockinDetailId"/><!--子单ID-->
-      <el-table-column label="主单ID" align="left" prop="stockinId"/><!--主单ID-->
+      <el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160"/><!--子单ID-->
+      <el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
       <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
-      <el-table-column label="物料名称" align="left" prop="productName"/><!--物料编码-->
+      <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"/><!--分销-->
diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue
index bd0c3d6..4d24d76 100644
--- a/ruoyi-ui/src/views/job/outJobManagement.vue
+++ b/ruoyi-ui/src/views/job/outJobManagement.vue
@@ -136,12 +136,12 @@
 <!--      </el-table-column>-->
 
 
-      <el-table-column label="出口ID" align="left" prop="exitId"/> <!-- 出口ID -->
+      <el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
       <el-table-column label="创建时间" align="left" prop="createTime" width="180"/> <!-- 创建时间 -->
       <el-table-column label="开始时间" align="left" prop="startTime" width="180"/> <!-- 开始时间 -->
       <el-table-column label="结束时间" align="left" prop="finishTime" width="180"/> <!-- 结束时间 -->
 <!--      <el-table-column :label="$t('outJobManagement.warehouseId')" align="left" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
-      <el-table-column label="仓库ID" align="left" prop="warehouseName" /> <!-- 仓库ID -->
+<!--      <el-table-column label="仓库ID" align="left" prop="warehouseName" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
     </el-table>
 
     <pagination
@@ -154,9 +154,9 @@
 
     <el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" /> <!-- 子任务ID -->
-      <el-table-column label="库存ID" align="left" prop="stockId" /> <!-- 库存ID -->
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" /> <!-- 子单据ID -->
+      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" /> <!-- 子任务ID -->
+      <el-table-column label="库存ID" align="left" prop="stockId" width="160" /> <!-- 库存ID -->
+      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" /> <!-- 子单据ID -->
       <el-table-column label="物料编码" align="left" prop="productId" />
       <el-table-column label="物料名称" align="left" prop="productName" />
       <el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index 70c9467..34d7f01 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.vue
@@ -45,8 +45,8 @@
 
     <!-- 物资明细表格 -->
     <el-table v-loading="loading" :data="materialList">
-      <el-table-column :label="'品号'" align="center" prop="productId" /><!--物资编号-->
-      <el-table-column :label="'品名'" align="center" prop="productName" /><!--物资名称-->
+      <el-table-column label="物料编码" align="center" prop="productId" /><!--物资编号-->
+      <el-table-column label="物料名称" align="center" prop="productName" /><!--物资名称-->
       <el-table-column label="批次号" align="center" prop="lotNo" />
       <el-table-column label="订单号" align="center" prop="orderId" />
       <el-table-column label="序列号" align="center" prop="printDate" />
@@ -79,23 +79,23 @@
     <el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="800px" 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="spare1">
+<!--        <el-form-item label="规格" prop="spare1">
           <el-input v-model="queryParams.spare1" placeholder="请输入规格"
                     clearable
                     @keyup.enter.native="handleQuery"/>
@@ -114,7 +114,7 @@
           <el-input v-model="queryParams.spare6" placeholder="请输入序列号"
                     clearable
                     @keyup.enter.native="handleQuery"/>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="订单号" prop="orderId">
           <el-input v-model="queryParams.orderId" placeholder="请输入订单号"
                     clearable
@@ -132,11 +132,11 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" prop="onlyIdentity" />
         <el-table-column label="订单号" align="center" prop="orderId" />
-        <el-table-column label="品号" align="center" prop="productId" />
+        <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="productName" />
         <el-table-column label="数量" align="center" prop="quantity" />
-        <el-table-column label="仓库" align="center" prop="warehouseId" />
+<!--        <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" />
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index 1dd2545..dd1c77e 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -38,10 +38,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="'物资名称'" prop="productName">
+      <el-form-item :label="'物料名称'" prop="productName">
         <el-input
-          v-model="queryParams.customerNo"
-          :placeholder="'请输入物资名称'"
+          v-model="queryParams.productName"
+          :placeholder="'请输入物料名称'"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -153,7 +153,7 @@
       <el-table-column :label="'创建时间'" align="left" prop="createDate" /><!-- 创建时间 -->
       <el-table-column :label="'开始时间'" align="left" prop="startDate" /><!-- 开始时间 -->
       <el-table-column :label="'确认时间'" align="left" prop="finishDate" /> <!-- 确认时间 -->
-      <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" /><!-- 仓库名称 -->
+<!--      <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />&lt;!&ndash; 仓库名称 &ndash;&gt;-->
     </el-table>
 
     <pagination
@@ -167,12 +167,12 @@
     <!-- 子表数据 -->
     <el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" /> <!-- 出库子单编号 -->
-      <el-table-column :label="'品号'" align="center" prop="productId" /> <!-- 物资编码 -->
-      <el-table-column :label="'品名'" align="center" prop="productName" />
+      <el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 -->
+      <el-table-column :label="'物料编码'" align="center" prop="productId" /> <!-- 物资编码 -->
+      <el-table-column :label="'物料名称'" align="center" prop="productName" />
       <el-table-column :label="'批次号'" align="center" prop="lotNo"/><!--英文描述-->
       <el-table-column :label="'序列号'" align="center"  prop="printDate" /> <!--序列号-->
-      <el-table-column label="订单号" align="center" prop="orderId" />
+      <el-table-column label="订单号" align="center" prop="orderId"  width="160" />
       <el-table-column :label="'计划数量'" align="center" prop="quantity" /> <!-- 计划数量 -->
       <el-table-column :label="'分配数量'" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
       <el-table-column :label="'实际数量'" align="center" prop="assignNum" /> <!-- 实际数量 -->
@@ -275,8 +275,8 @@
         <el-table-column label="库存编码" align="center" prop="stockId" />
         <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
         <el-table-column label="批次号" align="center" prop="lotNo" />
-        <el-table-column label="品号" align="center" prop="productId" />
-        <el-table-column label="品名" align="center" prop="productName" />
+        <el-table-column label="物料编码" align="center" prop="productId" />
+        <el-table-column label="物料名称" align="center" prop="productName" />
         <el-table-column label="数量" align="center" prop="quantity" width="80" />
         <el-table-column label="规格" align="center" prop="spare1" />
         <el-table-column label="单位" align="center" prop="spare3" />
diff --git a/ruoyi-ui/src/views/out/productAndStock.vue b/ruoyi-ui/src/views/out/productAndStock.vue
index 721bf2b..7e917d1 100644
--- a/ruoyi-ui/src/views/out/productAndStock.vue
+++ b/ruoyi-ui/src/views/out/productAndStock.vue
@@ -9,10 +9,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"
         />
@@ -25,22 +25,22 @@
           @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="warehouseId"> <!-- 仓库 -->
+<!--      <el-form-item :label="'仓库'" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;
         <el-input
           v-model="queryParams.warehouseId"
           :placeholder="'请输入仓库'"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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> <!-- 重置 -->
@@ -63,9 +63,9 @@
 
     <el-table v-loading="loading" :data="productAndStockList">
       <el-table-column :label="'序号'" align="left" prop="onlyIdentity" /> <!-- 序号 -->
-      <el-table-column :label="'物资编码'" align="left" prop="productId" /> <!-- 物资编码 -->
+      <el-table-column :label="'物料编码'" align="left" prop="productId" /> <!-- 物资编码 -->
       <el-table-column :label="'批号'" align="left" prop="lotNo" /> <!-- 批号 -->
-      <el-table-column :label="'物资名称'" align="left" prop="productName" /> <!-- 物资名称 -->
+      <el-table-column :label="'物料名称'" align="left" prop="productName" /> <!-- 物资名称 -->
       <el-table-column :label="'数量'" align="right" prop="quantity" /> <!-- 数量 -->
       <el-table-column :label="'仓库'" align="left" prop="warehouseId" /> <!-- 仓库 -->
     </el-table>
diff --git a/ruoyi-ui/src/views/stock/freeze/index.vue b/ruoyi-ui/src/views/stock/freeze/index.vue
index 4179b0b..0a0923c 100644
--- a/ruoyi-ui/src/views/stock/freeze/index.vue
+++ b/ruoyi-ui/src/views/stock/freeze/index.vue
@@ -9,14 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="托盘条码" prop="trayCode"> <!-- 托盘条码 -->
+<!--      <el-form-item label="托盘条码" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;
         <el-input
           v-model="queryParams.trayCode"
           placeholder="请输入托盘条码"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="物品名称" prop="productName"> <!-- 物品名称 -->
         <el-input
           v-model="queryParams.productName"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库" prop="warehouseId"> <!-- 仓库 -->
+<!--      <el-form-item label="仓库" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;
         <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库">
           <el-option
             v-for="item in warehouseOptions"
@@ -34,7 +34,7 @@
             :value="item.warehouseId"
           />
         </el-select>
-      </el-form-item>
+      </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> <!-- 重置 -->
@@ -60,7 +60,7 @@
 <!--      <el-table-column label="库存编码" align="center" prop="stockId" /> &lt;!&ndash; 库存编码 &ndash;&gt;-->
       <el-table-column label="货位编码" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName" /> <!-- 货位名称 -->
-      <el-table-column label="托盘条码" align="left" prop="trayCode" /> <!-- 托盘条码 -->
+<!--      <el-table-column label="托盘条码" align="left" prop="trayCode" /> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
       <el-table-column label="原库位状态" align="left" prop="oldStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.oldStatus"/>
@@ -72,7 +72,7 @@
         </template>
       </el-table-column><!-- 现库位状态 -->
 <!--      <el-table-column label="操作" align="left" prop="method" /> &lt;!&ndash; 操作 &ndash;&gt;-->
-      <el-table-column label="仓库" align="left" prop="warehouseName" /> <!-- 仓库 -->
+<!--      <el-table-column label="仓库" align="left" prop="warehouseName" /> &lt;!&ndash; 仓库 &ndash;&gt;-->
       <el-table-column label="创建时间" align="left" prop="createTime" /> <!-- 创建时间 -->
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;-->
 <!--        <template slot-scope="scope">-->
diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue
index ee78b46..e08cf78 100644
--- a/ruoyi-ui/src/views/stock/management/index.vue
+++ b/ruoyi-ui/src/views/stock/management/index.vue
@@ -36,20 +36,20 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="入库时间" prop="startDate"><!-- 入库时间 -->
+<!--      <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
         <el-date-picker clearable
                         v-model="queryParams.inDate"
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="请选择入库时间">
         </el-date-picker>
-      </el-form-item>
+      </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"
         />
@@ -100,25 +100,25 @@
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" align="center" />
-      <el-table-column label="库存编码" align="center" prop="stockId" />
-      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
+      <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
       <el-table-column label="库存状态" align="center" prop="stockStatus" >
         <template slot-scope="scope">
           <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" />
+      <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" />
-      <el-table-column label="订单号" align="center" prop="orderId" />
-      <el-table-column label="入库时间" align="center" prop="inDate" />
+      <el-table-column label="订单号" align="center" prop="orderId" width="160"/>
+      <el-table-column label="入库时间" align="center" prop="inDate" width="160"/>
       <el-table-column label="数量" align="center" prop="quantity" />
-      <el-table-column label="作业编码" align="center" prop="jobId" />
+      <el-table-column label="作业编码" align="center" prop="jobId" width="160"/>
       <el-table-column label="出库数量" align="center" prop="outQuantity" />
-      <el-table-column label="入库子单号" align="center" prop="stockinDetailId" />
-      <el-table-column label="入库单号" align="center" prop="stockinId" />
-      <el-table-column label="入库类型" align="center" prop="inType" />
-      <el-table-column label="仓库编码" align="center" prop="warehouseId" />
+      <el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160"/>
+      <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
+<!--      <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" />
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index 7943ead..f363160 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -1,57 +1,36 @@
 <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="stockId"><!-- 库存id -->
+      <el-form-item label="库存编码" prop="stockId"><!-- 库存id -->
         <el-input
           v-model="queryParams.stockId"
-          placeholder="请输入库存ID"
+          placeholder="请输入库存编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="货位ID" prop="cargoSpaceId"><!-- 货位id -->
+      <el-form-item label="货位名称" prop="cargoSpaceName"><!-- 货位id -->
         <el-input
-          v-model="queryParams.cargoSpaceId"
-          placeholder="请输入货位ID"
+          v-model="queryParams.cargoSpaceName"
+          placeholder="请输入货位名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="库存状态" prop="stockStatus">&lt;!&ndash; 库存状态 &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.stock_status"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('stockManagement.cargoSpaceStockStatus')" prop="cargoSpaceStockStatus">&lt;!&ndash; 货位状态 &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.cargoSpaceStockStatus" :placeholder="$t('stockManagement.cargoSpaceStockStatus')" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.cargo_space_status"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-
-      <el-form-item label="入库时间" prop="startDate"><!-- 入库时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.inDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择入库时间">
-        </el-date-picker>
+      <el-form-item label="订单号" prop="orderId"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.orderId"
+          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"
         />
@@ -80,11 +59,12 @@
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="库存编码" align="center" prop="stockId" />
-      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
+      <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName"  width="160"/>
       <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="品号" align="center" prop="productId" />
-      <el-table-column label="品名" align="center" prop="productName" />
+      <el-table-column label="订单号" align="center" prop="orderId" width="160"/>
+      <el-table-column label="物料编码" align="center" prop="productId" />
+      <el-table-column label="物料名称" align="center" prop="productName" />
       <el-table-column label="数量" align="center" prop="quantity" width="80" />
       <el-table-column label="规格" align="center" prop="spare1" />
       <el-table-column label="单位" align="center" prop="spare3" />
@@ -98,7 +78,6 @@
       <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="orderId" />
 
     </el-table>
 
diff --git a/ruoyi-ui/src/views/stock/record/index.vue b/ruoyi-ui/src/views/stock/record/index.vue
index 8c53dd3..bdd5ec5 100644
--- a/ruoyi-ui/src/views/stock/record/index.vue
+++ b/ruoyi-ui/src/views/stock/record/index.vue
@@ -25,10 +25,10 @@
           @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"
         />
@@ -41,7 +41,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="操作" prop="method"> <!-- 操作 -->
+<!--      <el-form-item label="操作" prop="method"> &lt;!&ndash; 操作 &ndash;&gt;
         <el-select v-model="queryParams.method" placeholder="请选择操作" clearable>
 
           <el-option
@@ -51,8 +51,8 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
-      <el-form-item label="仓库" prop="warehouseId"> <!-- 仓库 -->
+      </el-form-item>-->
+<!--      <el-form-item label="仓库" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;
         <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库">
           <el-option
             v-for="item in warehouseOptions"
@@ -61,7 +61,7 @@
             :value="item.warehouseId"
           />
         </el-select>
-      </el-form-item>
+      </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> <!-- 重置 -->