From f4e3d2c8982a7034d8447520f40be3af8dbb3b8c Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Tue, 24 Mar 2026 10:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=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/outStockout/domain/OutStockout.java   |  9 +++
 .../mapper/out/OutStockoutMapper.xml          |  6 +-
 .../resources/mapper/stock/BasStockMapper.xml |  3 +
 ruoyi-ui/src/components/Pagination/index.vue  |  2 +-
 ruoyi-ui/src/views/in/job/index.vue           | 18 +++---
 ruoyi-ui/src/views/in/stockIn/index.vue       | 13 ++--
 ruoyi-ui/src/views/job/outJobManagement.vue   | 24 ++++----
 ruoyi-ui/src/views/out/addOutStockout.vue     | 34 +++++------
 ruoyi-ui/src/views/out/cargoSpaceOut.vue      |  2 +-
 ruoyi-ui/src/views/out/outJobFlow.vue         | 59 ++++++++++---------
 ruoyi-ui/src/views/out/outStockoutManage.vue  | 18 +++---
 ruoyi-ui/src/views/stock/management/index.vue | 32 ++++++----
 ruoyi-ui/src/views/stock/pointOut.vue         | 30 +++++-----
 13 files changed, 138 insertions(+), 112 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
index 0ed3d38..3bcce8c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
@@ -44,6 +44,8 @@ public class OutStockout extends BaseEntity
     /** 建单人 */
     @Excel(name = "建单人")
     private String createManId;
+    @Excel(name = "建单人")
+    private String createManName;
 
     /** 单据状态 */
     @Excel(name = "单据状态")
@@ -96,6 +98,13 @@ public class OutStockout extends BaseEntity
 
     private List<String> typeData;
 
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName;
+    }
 
     public String getSupplierName() {
         return supplierName;
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
index 5bab6cc..243476e 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="departmentNo"    column="department_no"    />
         <result property="customerNo"    column="customer_no"    />
         <result property="createManId"    column="create_man_id"    />
+        <result property="createManName"    column="user_name"    />
         <result property="status"    column="status"    />
         <result property="stockoutSource"    column="stockout_source"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -34,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
         select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
-         o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,o.remark  from out_stockout o
+         o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,o.remark ,su.user_name
+        from out_stockout o
         left join out_stockout_detail d on d.stockout_id = o.stockout_id
         left join bas_customer bc on bc.customer_no = d.out_id
         left join bas_warehouse bw on bw.warehouse_id = d.warehouse_id
         left join bas_supplier bs on bs.supplier_no = d.supplier_id
         left join bas_product bp on bp.product_id = d.product_id
-
+        left join sys_user su on su.user_id = o.create_man_id
         <where>
             <if test="stockoutGuid != null  and stockoutGuid != ''"> and o.stockout_guid = #{stockoutGuid}</if>
             <if test="stockoutId != null  and stockoutId != ''"> and o.stockout_id = #{stockoutId}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index 483c48a..5ed2012 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -405,6 +405,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="productName != null and productName != ''">
             and bp.product_name like concat('%',#{productName},'%')
         </if>
+        <if test="distribution != null and distribution != ''">
+            and bs.distribution like concat('%',#{distribution},'%')
+        </if>
         <if test="warehouseIdList != null and warehouseIdList.size() > 0">
             and bs.warehouse_id in
             <foreach collection="warehouseIdList" open="(" close=")" item="it" separator=",">
diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
index 08ac487..7c45781 100644
--- a/ruoyi-ui/src/components/Pagination/index.vue
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [10, 50, 100, 500]
       }
     },
     // 移动端页码按钮的数量端默认值5
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index 096a4c5..7d195a6 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -133,17 +133,17 @@
     >
       <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="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="spare6" />
-      <el-table-column label="产品号" align="left" prop="spare7" />
-      <el-table-column label="代号" align="left" prop="spare9" />
+      <el-table-column label="合同号" align="left" prop="spare6" width="160"/>
+      <el-table-column label="产品号" align="left" prop="spare7" width="160"/>
+      <el-table-column label="代号" align="left" prop="spare9" width="160"/>
       <el-table-column label="台次" align="left" prop="spare5" />
-      <el-table-column label="物料编码" align="left" prop="productId" width="160" />
-      <el-table-column label="物料名称" align="left" prop="productName" width="160" />
-      <el-table-column label="供应商" align="left" prop="supplierName" width="160"/>
-      <el-table-column label="规格" align="left" prop="spec" 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="supplierName" width="160"/>-->
+<!--      <el-table-column label="规格" align="left" prop="spec" width="160"/>-->
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
     </el-table>
 
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index bdb22ac..3d5ec0b 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -77,7 +77,7 @@
           子单明细 <span style="font-weight: normal; color: #999; font-size: 13px; margin-left: 10px;">(当前主单: {{ queryDetailParams.stockinId }})</span>
         </span>
         <div style="float: right; display: flex; align-items: center;">
-          <el-button type="primary" size="mini" icon="el-icon-check" @click="handleBatchSave" v-hasPermi="['in:stockIn:edit']">暂存子单明细</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-check" @click="handleBatchSave" v-hasPermi="['in:stockIn:edit']">保存子单明细</el-button>
           <div style="width: 1px; height: 20px; background: #eee; margin: 0 15px;"></div>
           <el-input v-model="batchTrayCode" placeholder="批量条码" size="mini" style="width: 120px; margin-right: 5px;" clearable />
           <el-button type="warning" size="mini" icon="el-icon-copy-document" @click="handleBatchFillTrayCode">批量填充</el-button>
@@ -127,13 +127,14 @@
           </template>
         </el-table-column>
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="合同号" align="left" prop="spare6" width="120"/>
-        <el-table-column label="代号" align="left" prop="spare9" width="100"/>
-        <el-table-column label="台次" align="left" prop="spare5" width="80"/>
-        <el-table-column label="物料编码" align="left" prop="productId" width="120"/>
+        <el-table-column label="合同号" align="left" prop="spare6" width="160"/>
+        <el-table-column label="产品号" align="left" prop="spare7" width="160"/>
+        <el-table-column label="代号" align="left" prop="spare9" width="160"/>
+        <el-table-column label="台次" align="left" prop="spare5" />
+        <el-table-column label="物料编码" align="left" prop="productId" />
         <el-table-column label="物料名称" align="left" prop="productName" show-overflow-tooltip/>
         <el-table-column label="计划数量" align="center" prop="quantity" width="100"/>
-        <el-table-column label="实际数量" align="center" width="120">
+        <el-table-column label="实际数量" align="center" width="100">
           <template slot-scope="scope">
             <b :style="{color: scope.row.assignNum > scope.row.quantity ? '#F56C6C' : '#409EFF'}">{{ scope.row.assignNum }}</b>
           </template>
diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue
index 7e85c71..1b271d7 100644
--- a/ruoyi-ui/src/views/job/outJobManagement.vue
+++ b/ruoyi-ui/src/views/job/outJobManagement.vue
@@ -134,16 +134,16 @@
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
 <!--      <el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> &lt;!&ndash; 客户ID &ndash;&gt;-->
-      <el-table-column label="托盘码" align="left" prop="trayCode" /> <!-- 托盘码 -->
+      <el-table-column label="托盘码" align="left" prop="trayCode" width="140"/> <!-- 托盘码 -->
       <el-table-column label="巷道" align="left" prop="roadwayId" /> <!-- 巷道ID -->
       <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140"/> <!-- 货位ID -->
 <!--      <el-table-column label="订单号" align="left" prop="lineId" /> &lt;!&ndash; 结束时间 &ndash;&gt;-->
       <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="executionPhase"> &lt;!&ndash; 执行阶段 &ndash;&gt;-->
+<!--        <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="warehouseName" />
       <el-table-column label="出口" align="left" prop="exitId">
@@ -152,9 +152,9 @@
         </template>
       </el-table-column>
       <el-table-column label="部门" align="left" prop="departmentName" />
-      <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="createTime" width="150"/> <!-- 创建时间 -->
+      <el-table-column label="开始时间" align="left" prop="startTime" width="150"/> <!-- 开始时间 -->
+      <el-table-column label="结束时间" align="left" prop="finishTime" width="150"/> <!-- 结束时间 -->
 <!--      <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" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
     </el-table>
@@ -172,9 +172,9 @@
       <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="spare6" />
-      <el-table-column label="产品号" align="left" prop="spare7" />
-      <el-table-column label="代号" align="left" prop="spare9" />
+      <el-table-column label="合同号" align="left" prop="spare6" width="160"/>
+      <el-table-column label="产品号" align="left" prop="spare7" width="160"/>
+      <el-table-column label="代号" align="left" prop="spare9" width="160"/>
       <el-table-column label="台次" align="left" prop="spare5" />
       <el-table-column label="物料编码" align="left" prop="productId" />
       <el-table-column label="物料名称" align="left" prop="productName" />
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index 448b3c4..4a2c8fc 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.vue
@@ -43,29 +43,29 @@
 
     <!-- 物资明细表格 -->
     <el-table v-loading="loading" :data="materialList">
-      <el-table-column label="仓库编码" align="center" prop="warehouseId" />
+<!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
       <el-table-column label="仓库" align="center" prop="warehouseName" />
-      <el-table-column label="合同号" align="center" prop="cargoNo" />
-      <el-table-column label="产品号" align="center" prop="phase" />
-      <el-table-column label="代号" align="center" prop="fid" />
-      <el-table-column label="台次" align="center" prop="power" />
+      <el-table-column label="合同号" align="center" prop="cargoNo" width="160"/>
+      <el-table-column label="产品号" align="center" prop="phase" width="160"/>
+      <el-table-column label="代号" align="center" prop="fid" width="160"/>
+      <el-table-column label="台次" align="center" prop="power" 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="productSpec" />
+<!--      <el-table-column label="规格型号" align="center" prop="productSpec" />-->
 <!--      <el-table-column label="供应商" align="center" prop="supplierName" />-->
 <!--      <el-table-column label="客户编码" align="center" prop="outId" />-->
-      <el-table-column label="客户名称" align="center" prop="customerName" width="230">
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.customerName"
-            placeholder="点击选择客户"
-            readonly
-            size="mini"
-            @focus="openRowCustomerSelector(scope.row)"
-          />
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="客户名称" align="center" prop="customerName" width="230">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            v-model="scope.row.customerName"-->
+<!--            placeholder="点击选择客户"-->
+<!--            readonly-->
+<!--            size="mini"-->
+<!--            @focus="openRowCustomerSelector(scope.row)"-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column :label="'数量'" align="center" prop="quantity" width="150"><!--数量-->
         <template slot-scope="scope">
           <el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
diff --git a/ruoyi-ui/src/views/out/cargoSpaceOut.vue b/ruoyi-ui/src/views/out/cargoSpaceOut.vue
index 55637e7..fbb9414 100644
--- a/ruoyi-ui/src/views/out/cargoSpaceOut.vue
+++ b/ruoyi-ui/src/views/out/cargoSpaceOut.vue
@@ -83,7 +83,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="cargoSpaceList" @selection-change="handleSelectionChange" max-height="650">
+    <el-table v-loading="loading" :data="cargoSpaceList" @selection-change="handleSelectionChange" max-height="550">
       <el-table-column type="selection" width="55" align="center" />
       <!-- 货位ID -->
       <el-table-column label="货位编号" align="left" prop="cargoSpaceId" />
diff --git a/ruoyi-ui/src/views/out/outJobFlow.vue b/ruoyi-ui/src/views/out/outJobFlow.vue
index a0c3be0..e497986 100644
--- a/ruoyi-ui/src/views/out/outJobFlow.vue
+++ b/ruoyi-ui/src/views/out/outJobFlow.vue
@@ -86,37 +86,37 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange" max-height="550">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
-      <el-table-column label="子任务" align="center" prop="jobDetailId" width="160"/>
-      <el-table-column label="任务编码" align="center" prop="jobId" width="160"/>
-      <el-table-column label="单据编码" align="center" prop="inOrOutId" width="160"/>
-      <el-table-column label="子单据编码" align="center" prop="inOrOutDId" width="160" />
-      <el-table-column label="任务号" align="center" prop="taskNo" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_job_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="任务类型" align="center" prop="inOrOut" width="160">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="子任务" align="center" prop="jobDetailId" width="160"/>-->
+<!--      <el-table-column label="任务编码" align="center" prop="jobId" width="160"/>-->
+<!--      <el-table-column label="单据编码" align="center" prop="inOrOutId" width="160"/>-->
+<!--      <el-table-column label="子单据编码" align="center" prop="inOrOutDId" width="160" />-->
+<!--      <el-table-column label="任务号" align="center" prop="taskNo" />-->
+<!--      <el-table-column label="状态" align="center" prop="status">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.sys_job_status" :value="scope.row.status"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="任务类型" align="center" prop="inOrOut" width="160">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="托盘码" align="center" prop="trayCode" width="160"/>
-      <el-table-column label="出口" align="center" prop="exitId">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.exit_type" :value="scope.row.exitId"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="合同号" align="center" prop="contract" />
-      <el-table-column label="产品号" align="center" prop="cases" />
-      <el-table-column label="代号" align="center" prop="managementNo" />
-      <el-table-column label="台次" align="center" prop="units" />
+<!--      <el-table-column label="出口" align="center" prop="exitId">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.exit_type" :value="scope.row.exitId"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="合同号" align="center" prop="contract" width="160"/>
+      <el-table-column label="产品号" align="center" prop="cases" width="160"/>
+      <el-table-column label="代号" align="center" prop="managementNo" width="160"/>
+      <el-table-column label="台次" align="center" prop="units" width="160"/>
       <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="spec" width="160"/>
+<!--      <el-table-column label="规格" align="center" prop="spec" width="160"/>-->
       <el-table-column label="出库数量" align="center" prop="outQuantity" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="160"/>
       <el-table-column label="开始时间" align="center" prop="startTime" width="160"/>
@@ -252,7 +252,8 @@ export default {
     }
   },
   created() {
-    this.getList()
+    //this.getList()
+    this.loading = false
   },
   methods: {
     /** 查询出库作业流水Controller列表 */
@@ -323,7 +324,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm")
-      this.handleQuery()
+      //this.handleQuery()
+      this.ViewOutJobFlowList = []
+      this.total = 0
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index 2a05313..7699909 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -156,7 +156,7 @@
 <!--      <el-table-column :label="'出口'" align="left" prop="exitId" />-->
 <!--      <el-table-column :label="'客户编码'" align="left" prop="customerNo" />&lt;!&ndash; 客户编码 &ndash;&gt;-->
 <!--      <el-table-column label="客户名称" align="left" prop="customerName" />-->
-      <el-table-column label="建单人" align="left" prop="createManId" /> <!-- 建单人 -->
+      <el-table-column label="建单人" align="left" prop="createManName" /> <!-- 建单人 -->
       <el-table-column label="创建时间" align="left" prop="createDate" width="160"/><!-- 创建时间 -->
       <el-table-column label="开始时间" align="left" prop="startDate" width="160"/><!-- 开始时间 -->
       <el-table-column label="确认时间" align="left" prop="finishDate" width="160"/> <!-- 确认时间 -->
@@ -181,24 +181,24 @@
           <dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
         </template>
       </el-table-column>-->
-      <el-table-column label="合同号" align="center"  prop="cargoNo" />
-      <el-table-column label="产品号" align="center" prop="phase" />
-      <el-table-column label="代号" align="center"  prop="fid" />
-      <el-table-column label="台次" align="center" prop="power" />
+      <el-table-column label="合同号" align="center"  prop="cargoNo" width="160"/>
+      <el-table-column label="产品号" align="center" prop="phase" width="160"/>
+      <el-table-column label="代号" align="center"  prop="fid" width="160"/>
+      <el-table-column label="台次" align="center" prop="power" 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="productSpec" />
+<!--      <el-table-column label="规格型号" align="center" prop="productSpec" />-->
 <!--      <el-table-column label="供应商" align="center" prop="supplierName" />-->
-      <el-table-column label="客户" align="center" prop="customerName" />
+<!--      <el-table-column label="客户" align="center" prop="customerName" />-->
       <el-table-column label="计划数量" align="center" prop="quantity" /> <!-- 计划数量 -->
       <el-table-column label="分配数量" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
       <el-table-column label="实际数量" align="center" prop="assignNum" /> <!-- 实际数量 -->
-      <el-table-column label="回传状态" align="center" prop="swStatus" >
+<!--      <el-table-column label="回传状态" align="center" prop="swStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sw_status" :value="scope.row.swStatus"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
 <!--      <el-table-column :label="'入库单价'" align="center" prop="price"/>-->
 <!--      <el-table-column :label="'来源'" align="center" prop="unit">
         <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 fa5d2b1..fab858b 100644
--- a/ruoyi-ui/src/views/stock/management/index.vue
+++ b/ruoyi-ui/src/views/stock/management/index.vue
@@ -73,6 +73,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="代号" prop="distribution">
+        <el-input
+          v-model="queryParams.distribution"
+          placeholder="请输入代号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="台次" prop="spare5">
         <el-input
           v-model="queryParams.spare5"
@@ -186,33 +194,33 @@
 
     <el-table v-loading="detailLoading" :data="detailList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" align="center" />
-      <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
+<!--      <el-table-column label="仓库名称" align="center" prop="warehouseName"/>-->
       <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
-      <el-table-column label="库位" align="center" prop="cargoSpaceId" width="160"/>
-      <el-table-column label="托盘" align="center" prop="trayCode" width="160"/>
-      <el-table-column label="合同号" align="center" prop="orderId"/>
-      <el-table-column label="产品号" align="center" prop="power"/>
-      <el-table-column label="代号" align="center" prop="distribution"/>
+<!--      <el-table-column label="库位" align="center" prop="cargoSpaceId" width="160"/>-->
+<!--      <el-table-column label="托盘" align="center" prop="trayCode" width="160"/>-->
+      <el-table-column label="合同号" align="center" prop="orderId" width="160"/>
+      <el-table-column label="产品号" align="center" prop="power" width="160"/>
+      <el-table-column label="代号" align="center" prop="distribution" width="160"/>
       <el-table-column label="台次" align="center" prop="spare5"/>
       <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="spec" width="160"/>
+<!--      <el-table-column label="规格" align="center" prop="spec" 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="quantity"/>
-      <el-table-column label="重量" align="center" prop="netWeight" width="160"/>
-      <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
+<!--      <el-table-column label="重量" align="center" prop="netWeight" width="160"/>-->
+<!--      <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>-->
       <el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
       <el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
-      <el-table-column label="盘点标识" align="center" prop="spare7">
+<!--      <el-table-column label="盘点标识" align="center" prop="spare7">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.check_flag" :value="scope.row.spare7"/>
         </template>
-      </el-table-column>
-      <el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>
+      </el-table-column>-->
+<!--      <el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>-->
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
         <template slot-scope="scope">
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index d06f66e..ea60f6a 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -114,31 +114,31 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
+    <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="550">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="仓库" align="center" prop="warehouseId" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
         </template>
       </el-table-column>
-      <el-table-column label="库存编码" align="center" prop="stockId" width="140"/>
-      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="140"/>
-      <el-table-column label="巷道" align="center" prop="roadwayId" width="80"/>
-      <el-table-column label="排" align="center" prop="thePlatoon" />
-      <el-table-column label="列" align="center" prop="theColumn" />
-      <el-table-column label="层" align="center" prop="theFloor" />
-      <el-table-column label="托盘码" align="center" prop="trayCode" width="120"/>
-      <el-table-column label="部门" align="center" prop="deptName" width="120"/>
-      <el-table-column label="合同号" align="center" prop="orderId" />
-      <el-table-column label="产品号" align="center" prop="power" />
-      <el-table-column label="代号" align="center" prop="distribution" />
+<!--      <el-table-column label="库存编码" align="center" prop="stockId" width="140"/>-->
+      <el-table-column label="托盘码" align="center" prop="trayCode" width="100"/>
+      <el-table-column label="合同号" align="center" prop="orderId" width="160" />
+      <el-table-column label="产品号" align="center" prop="power" width="160"/>
+      <el-table-column label="代号" align="center" prop="distribution" width="160"/>
       <el-table-column label="台次" align="center" prop="spare5" />
       <el-table-column label="物料编码" align="center" prop="productId" />
       <el-table-column label="物料名称" align="center" prop="productName" />
-      <el-table-column label="规格型号" align="center" prop="netWeight" />
       <el-table-column label="重量" align="center" prop="theType" />
-      <el-table-column label="容量" align="center" prop="theTypeName" />
-      <el-table-column label="库存数量" align="center" prop="quantity" width="80" />
+      <el-table-column label="部门" align="center" prop="deptName" width="100"/>
+      <el-table-column label="库存数量" align="center" prop="quantity"  />
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="140"/>
+      <el-table-column label="巷道" align="center" prop="roadwayId"/>
+      <el-table-column label="排" align="center" prop="thePlatoon" />
+      <el-table-column label="列" align="center" prop="theColumn" />
+      <el-table-column label="层" align="center" prop="theFloor" />
+<!--      <el-table-column label="规格型号" align="center" prop="netWeight" />-->
+<!--      <el-table-column label="容量" align="center" prop="theTypeName" />-->
     </el-table>
 
     <pagination