diff --git a/ruoyi-ui/src/views/bas/basCustomer/index.vue b/ruoyi-ui/src/views/bas/basCustomer/index.vue
index 1699eb2..b83473b 100644
--- a/ruoyi-ui/src/views/bas/basCustomer/index.vue
+++ b/ruoyi-ui/src/views/bas/basCustomer/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="客户编号" prop="customerNo">
-        <el-input v-model="queryParams.customerNo" placeholder="请输入客户编号" clearable
+      <el-form-item label="客商编号" prop="customerNo">
+        <el-input v-model="queryParams.customerNo" placeholder="请输入客商编号" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="客户名称" prop="customerName">
-        <el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable
+      <el-form-item label="客商名称" prop="customerName">
+        <el-input v-model="queryParams.customerName" placeholder="请输入客商名称" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="简称" prop="simpleName">
@@ -56,9 +56,9 @@
 
     <el-table v-loading="loading" :data="BasCustomerList" @selection-change="handleSelectionChange" max-height="700">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column width="120" label="客户编号" align="left" prop="customerNo"/>
-      <el-table-column width="120" label="客户类别" align="left" prop="customerGroupNo"/>
-      <el-table-column width="220" label="客户名称" align="left" prop="customerName"/>
+      <el-table-column width="120" label="客商编号" align="left" prop="customerNo"/>
+      <el-table-column width="120" label="客商类别" align="left" prop="customerGroupNo"/>
+      <el-table-column width="220" label="客商名称" align="left" prop="customerName"/>
       <el-table-column width="120" label="简称" align="left" prop="simpleName"/>
       <el-table-column width="120" label="是否可用" align="left" prop="useable">
         <template slot-scope="scope">
@@ -69,11 +69,11 @@
       <el-table-column width="120" label="业务部门" align="left" prop="businessDepartment"/>
       <el-table-column width="120" label="业务员" align="left" prop="salesman"/>
       <el-table-column width="120" label="助记码" align="left" prop="mnemonicCode"/>
-      <el-table-column width="120" label="客户类型" align="left" prop="type"/>
+      <el-table-column width="120" label="客商类型" align="left" prop="type"/>
       <el-table-column width="120" label="纳税人识别号" align="left" prop="taxpayerRegistrationNumber"/>
       <el-table-column width="120" label="财务组织" align="left" prop="organization"/>
-      <el-table-column width="120" label="上级客户" align="left" prop="supCustomer"/>
-      <el-table-column width="120" label="个人客户" align="left" prop="retailInvestor"/>
+      <el-table-column width="120" label="上级客商" align="left" prop="supCustomer"/>
+      <el-table-column width="120" label="个人客商" align="left" prop="retailInvestor"/>
       <el-table-column width="120" label="国家/地区" align="left" prop="country"/>
       <el-table-column width="120" label="时区" align="left" prop="timeZone"/>
       <el-table-column width="120" label="数据格式" align="left" prop="dataFormat"/>
@@ -100,14 +100,14 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改客户对话框 -->
+    <!-- 添加或修改客商对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="客户编号" prop="customerNo">
-          <el-input v-model="form.customerNo" placeholder="请输入客户编号"/>
+        <el-form-item label="客商编号" prop="customerNo">
+          <el-input v-model="form.customerNo" placeholder="请输入客商编号"/>
         </el-form-item>
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称"/>
+        <el-form-item label="客商名称" prop="customerName">
+          <el-input v-model="form.customerName" placeholder="请输入客商名称"/>
         </el-form-item>
         <el-form-item label="简称" prop="simpleName">
           <el-input v-model="form.simpleName" placeholder="请输入简称"/>
@@ -134,8 +134,8 @@
         <el-form-item label="助记码" prop="mnemonicCode">
           <el-input v-model="form.mnemonicCode" placeholder="请输入助记码"/>
         </el-form-item>
-        <el-form-item label="客户类型" prop="type">
-          <el-input v-model="form.type" placeholder="请输入客户类型"/>
+        <el-form-item label="客商类型" prop="type">
+          <el-input v-model="form.type" placeholder="请输入客商类型"/>
         </el-form-item>
         <el-form-item label="纳税人识别号" prop="taxpayerRegistrationNumber">
           <el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人识别号"/>
@@ -143,11 +143,11 @@
         <el-form-item label="财务组织" prop="organization">
           <el-input v-model="form.organization" placeholder="请输入财务组织"/>
         </el-form-item>
-        <el-form-item label="上级客户" prop="supCustomer">
-          <el-input v-model="form.supCustomer" placeholder="请输入上级客户"/>
+        <el-form-item label="上级客商" prop="supCustomer">
+          <el-input v-model="form.supCustomer" placeholder="请输入上级客商"/>
         </el-form-item>
-        <el-form-item label="个人客户" prop="retailInvestor">
-          <el-input v-model="form.retailInvestor" placeholder="请输入个人客户"/>
+        <el-form-item label="个人客商" prop="retailInvestor">
+          <el-input v-model="form.retailInvestor" placeholder="请输入个人客商"/>
         </el-form-item>
         <el-form-item label="国家/地区" prop="country">
           <el-input v-model="form.country" placeholder="请输入国家/地区"/>
@@ -196,7 +196,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 客户管理表格数据
+      // 客商管理表格数据
       BasCustomerList: [],
       // 弹出层标题
       title: "",
@@ -234,10 +234,10 @@ export default {
           {required: true, message: "ID不能为空", trigger: "blur"}
         ],
         customerNo: [
-          {required: true, message: "客户编号不能为空", trigger: "blur"}
+          {required: true, message: "客商编号不能为空", trigger: "blur"}
         ],
         customerName: [
-          {required: true, message: "客户名称不能为空", trigger: "blur"}
+          {required: true, message: "客商名称不能为空", trigger: "blur"}
         ],
         useable: [
           {required: true, message: "是否可用不能为空", trigger: "blur"}
@@ -249,7 +249,7 @@ export default {
     this.getList()
   },
   methods: {
-    /** 查询客户管理列表 */
+    /** 查询客商管理列表 */
     getList() {
       this.loading = true
       listBasCustomer(this.queryParams).then(response => {
@@ -310,7 +310,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加客户"
+      this.title = "添加客商"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -319,7 +319,7 @@ export default {
       getBasCustomer(id).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改客户"
+        this.title = "修改客商"
       })
     },
     /** 提交按钮 */
@@ -345,7 +345,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除客户编号为"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认删除客商编号为"' + ids + '"的数据项?').then(function () {
         return delBasCustomer(ids)
       }).then(() => {
         this.getList()
diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue
index 6130216..1727cd8 100644
--- a/ruoyi-ui/src/views/check/difference/index.vue
+++ b/ruoyi-ui/src/views/check/difference/index.vue
@@ -165,8 +165,8 @@
         <el-form-item label="供应商" prop="supplier">
           <el-input v-model="form.supplier" placeholder="请输入供应商" />
         </el-form-item>
-        <el-form-item label="客户" prop="customer">
-          <el-input v-model="form.customer" placeholder="请输入客户" />
+        <el-form-item label="客商" prop="customer">
+          <el-input v-model="form.customer" placeholder="请输入客商" />
         </el-form-item>
         <el-form-item label="原值" prop="oldQuantity">
           <el-input v-model="form.oldQuantity" placeholder="请输入原值" />
diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue
index e7cccc9..e1eb905 100644
--- a/ruoyi-ui/src/views/in/receive/index.vue
+++ b/ruoyi-ui/src/views/in/receive/index.vue
@@ -127,7 +127,7 @@
 <!--      <el-table-column label="erp单号" align="center" prop="erpBill"/>-->
       <el-table-column label="单据来源" align="left" prop="stockSource"/><!--单据来源-->
       <el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->
-<!--      <el-table-column label="客户编码" align="center" prop="customerNo"/>-->
+<!--      <el-table-column label="客商代号" align="center" prop="customerNo"/>-->
 <!--      <el-table-column label="班组编码" align="center" prop="classNo"/>-->
       <el-table-column label="供应商" align="left" prop="supplierName"/><!--供应商-->
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -224,7 +224,7 @@
         </template>
       </el-table-column>
 <!--      <el-table-column label="供应商编码" align="center" prop="supplierId"/>-->
-<!--      <el-table-column label="客户编码" align="center" prop="customerId"/>-->
+<!--      <el-table-column label="客商代号" align="center" prop="customerId"/>-->
 <!--      <el-table-column label="单位" align="center" prop="unit"/>-->
 <!--      <el-table-column label="规格" align="center" prop="spec"/>-->
       <!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue
index 6dd0716..8fa9db0 100644
--- a/ruoyi-ui/src/views/job/outJobManagement.vue
+++ b/ruoyi-ui/src/views/job/outJobManagement.vue
@@ -1,6 +1,20 @@
 <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="仓库" 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
@@ -30,42 +44,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="巷道" prop="roadwayId"> <!-- 托盘条码 -->
-        <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道"
-          clearable
-          @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="productId"> <!-- 托盘条码 -->
+      <el-form-item label="存货编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入品号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单号" prop="lineId"> <!-- 托盘条码 -->
-        <el-input
-          v-model="queryParams.lineId"
-          placeholder="请输入订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出口" prop="exitId"> <!-- 托盘条码 -->
-        <el-input
-          v-model="queryParams.exitId"
-          placeholder="请输入出口"
+          placeholder="请输入存货编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -88,20 +78,7 @@
         </el-date-picker>
       </el-form-item>
 
-<!--      <el-form-item label="仓库" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
-<!--        <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>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <!-- 搜索 -->
@@ -172,7 +149,7 @@
       <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="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"/>
diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue
index 0316035..0dee672 100644
--- a/ruoyi-ui/src/views/monitor/cache/index.vue
+++ b/ruoyi-ui/src/views/monitor/cache/index.vue
@@ -17,8 +17,8 @@
                   <!-- 端口 -->
                   <td class="el-table__cell is-leaf"><div class="cell">端口</div></td>
                   <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>
-                  <!-- 客户端数 -->
-                  <td class="el-table__cell is-leaf"><div class="cell">客户端数</div></td>
+                  <!-- 客商端数 -->
+                  <td class="el-table__cell is-leaf"><div class="cell">客商端数</div></td>
                   <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div></td>
                 </tr>
                 <tr>
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index e488b73..5c940d5 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.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>&lt;!&ndash;仓库&ndash;&gt;-->
-<!--        <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="departmentNo">
+        <el-input v-model="formData.departmentNo" placeholder="请输入项目号"/>
+      </el-form-item>
       <el-form-item :label="'单据类型'" prop="outType" required><!--单据类型-->
         <el-select v-model="formData.outType" :placeholder="'请选择单据类型'" clearable>
           <el-option
@@ -22,16 +25,30 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="'客户'" prop="customerNo" required><!--客户-->
+      <el-form-item :label="'出库方式'" prop="carNumber" required><!--出库方式-->
+        <el-select v-model="formData.carNumber" :placeholder="'请选择出库方式'" clearable>
+          <el-option
+            v-for="dict in dict.type.out_method"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'客商'" prop="customerNo" required><!--客商-->
         <el-input
-          v-model="formData.customerName"
-          :placeholder="'请输入客户编号'"
+          v-model="formData.classNowId"
+          :placeholder="'请输入客商编号'"
           clearable
           @click.native="openCustomerSelector"
           readonly
         />
       </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" v-hasPermi="['out:outStockout:saveBill']">{{'保存单据'}}<!--保存单据--></el-button>
@@ -39,7 +56,7 @@
     </el-form>
 
     <div class="mb8">
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials" v-hasPermi="['out:productAndStock:list']">{{'选择物资'}}<!--选择物资--></el-button>
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials" v-hasPermi="['out:productAndStock:list']">{{'选择存货'}}<!--选择物资--></el-button>
       <el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{'重新建单'}}<!--重新建单--></el-button>
     </div>
 
@@ -48,8 +65,8 @@
       <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="warehouse_id" />
-      <el-table-column label="层次关系" align="center" prop="spare1" />
+      <el-table-column label="仓库编码" align="center" prop="warehouseId" />
+      <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" />
@@ -72,8 +89,8 @@
       </el-table-column>
     </el-table>
 
-    <!-- 选择物资弹窗 -->
-    <el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="800px" append-to-body><!--选择物资-->
+    <!-- 选择存货弹窗 -->
+    <el-dialog :title="'选择存货'" :visible.sync="materialDialog" width="70%" append-to-body><!--选择存货-->
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
 
         <el-form-item label="存货编码" prop="productId"><!--品号-->
@@ -92,32 +109,46 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-<!--        <el-form-item label="规格" prop="spare1">
-          <el-input v-model="queryParams.spare1" placeholder="请输入规格"
-                    clearable
-                    @keyup.enter.native="handleQuery"/>
+        <el-form-item label="层级关系" prop="spare1"><!--品名-->
+          <el-input
+            v-model="queryParams.spare1"
+            :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 label="上层物料" prop="spare2"><!--品名-->
+          <el-input
+            v-model="queryParams.spare2"
+            :placeholder="'请输入上层物料'"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
         </el-form-item>
-        <el-form-item label="型号" prop="spare4">
-          <el-input v-model="queryParams.spare4" placeholder="请输入型号"
-                    clearable
-                    @keyup.enter.native="handleQuery"/>
+        <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"
+          />
         </el-form-item>
-        <el-form-item label="序列号" prop="spare6">
-          <el-input v-model="queryParams.spare6" placeholder="请输入序列号"
-                    clearable
-                    @keyup.enter.native="handleQuery"/>
-        </el-form-item>-->
-<!--        <el-form-item label="订单号" prop="orderId">
-          <el-input v-model="queryParams.orderId" placeholder="请输入订单号"
-                    clearable
-                    @keyup.enter.native="handleQuery"/>
-        </el-form-item>-->
-
 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{'搜索'}}<!--搜索--></el-button>
@@ -134,7 +165,7 @@
         <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="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" />
@@ -159,21 +190,21 @@
       </div>
     </el-dialog>
 
-    <!-- 选择客户弹窗 -->
-    <el-dialog :title="'客户管理'" :visible.sync="customerDialog" width="800px" append-to-body>
+    <!-- 选择客商弹窗 -->
+    <el-dialog :title="'客商管理'" :visible.sync="customerDialog" width="70%" append-to-body>
       <el-form :model="customerQueryParams" ref="customerQueryForm" size="small" :inline="true" label-width="100px">
-        <el-form-item :label="'客户编号'" prop="customerNo"><!--客户编号-->
+        <el-form-item :label="'客商编号'" prop="customerNo"><!--客商编号-->
           <el-input
             v-model="customerQueryParams.customerNo"
-            :placeholder="'请输入客户编号'"
+            :placeholder="'请输入客商编号'"
             clearable
             @keyup.enter.native="handleCustomerQuery"
           />
         </el-form-item>
-        <el-form-item :label="'客户名称'" prop="customerName"><!--客户名称-->
+        <el-form-item :label="'客商名称'" prop="customerName"><!--客商名称-->
           <el-input
             v-model="customerQueryParams.customerName"
-            :placeholder="'请输入客户名称'"
+            :placeholder="'请输入客商名称'"
             clearable
             @keyup.enter.native="handleCustomerQuery"
           />
@@ -185,9 +216,9 @@
       </el-form>
 
       <el-table ref="customerTable" v-loading="customerLoading" :data="customerList" @row-click="handleCustomerRowClick" highlight-current-row>
-        <el-table-column :label="'客户编号'" align="left" prop="customerNo" /><!--客户编号-->
-        <el-table-column :label="'客户名称'" align="left" prop="customerName" /><!--客户名称-->
-        <!-- <el-table-column :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" />客户简称 -->
+        <el-table-column :label="'客商编号'" align="left" prop="customerNo" /><!--客商编号-->
+        <el-table-column :label="'客商名称'" align="left" prop="customerName" /><!--客商名称-->
+        <!-- <el-table-column :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" />客商简称 -->
         <el-table-column :label="'是否可用'" align="left" prop="useable">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
@@ -219,7 +250,7 @@ import Pagination from "@/components/Pagination";
 
 export default {
   name: "AddOutStock",
-  dicts: ['out_bill_type', 'bill_status', 'is_available'],
+  dicts: ['out_bill_type', 'bill_status', 'is_available','out_method'],
   components: {
     Pagination
   },
@@ -234,28 +265,38 @@ export default {
       customerTotal: 0,
       // 表单验证规则
       rules: {
-        // warehouseId: [
-        //   { required: true, message: '请选择仓库', trigger: "change" }
-        // ],
+        warehouseId: [
+          { required: true, message: '请选择仓库', trigger: "change" }
+        ],
         customerNo: [
-          { required: true, message: '请输入客户编号', trigger: "blur" }
+          { required: true, message: '请输入客商编号', trigger: "blur" }
         ],
         outType: [
           { required: true, message: '请选择单据类型', trigger: "change" }
+        ],
+        outMethod: [
+          { required: true, message: '请选择出库方式', trigger: "change" }
+        ],
+        departmentNo: [
+          { required: true, message: '请输入项目号', trigger: "change" }
         ]
       },
       // 主表数据
       formData: {
-        // warehouseId: null,
+        warehouseId: null,
         customerNo: null,
-        customerName: null, // 添加客户名称字段，用于显示
-        outType: null
+        customerName: null, // 添加客商名称字段，用于显示
+        outType: null,
+        carNumber:null,
+        departmentNo:null,
+        classNowId:null,
+        spare5:null
       },
       // 仓库选项
       warehouseOptions: [],
       // 物资明细列表
       materialList: [],
-      // 选择物资弹窗
+      // 选择存货弹窗
       materialDialog: false,
       // 物资选项数据
       materialOptions: [],
@@ -285,19 +326,19 @@ export default {
         model: null,
         orderId: null
       },
-      // 客户选择弹窗
+      // 客商选择弹窗
       customerDialog: false,
-      // 客户列表数据
+      // 客商列表数据
       customerList: [],
-      // 当前选中的客户
+      // 当前选中的客商
       selectedCustomer: null,
-      // 客户查询参数
+      // 客商查询参数
       customerQueryParams: {
         pageNum: 1,
         pageSize: 10,
         customerNo: null,
         customerName: null,
-        useable: '1' // 默认只查询可用的客户
+        useable: '1' // 默认只查询可用的客商
       }
     };
   },
@@ -315,12 +356,12 @@ export default {
         this.warehouseOptions = response.rows;
       });
     },
-    /** 打开客户选择弹窗 */
+    /** 打开客商选择弹窗 */
     openCustomerSelector() {
       this.customerDialog = true;
       this.getCustomerList();
     },
-    /** 获取客户列表 */
+    /** 获取客商列表 */
     getCustomerList() {
       this.customerLoading = true;
       listBasCustomer(this.customerQueryParams).then(response => {
@@ -329,45 +370,50 @@ export default {
         this.customerLoading = false;
       });
     },
-    /** 客户搜索按钮操作 */
+    /** 客商搜索按钮操作 */
     handleCustomerQuery() {
       this.customerQueryParams.pageNum = 1;
       this.getCustomerList();
     },
-    /** 客户重置按钮操作 */
+    /** 客商重置按钮操作 */
     resetCustomerQuery() {
       this.resetForm("customerQueryForm");
-      this.customerQueryParams.useable = '1'; // 保持默认只查询可用的客户
+      this.customerQueryParams.useable = '1'; // 保持默认只查询可用的客商
       this.handleCustomerQuery();
     },
-    /** 客户行点击事件 */
+    /** 客商行点击事件 */
     handleCustomerRowClick(row) {
       this.selectedCustomer = row;
       this.$refs['customerTable']?.setCurrentRow(row);
     },
-    /** 确认选择客户 */
+    /** 确认选择客商 */
     confirmSelectCustomer() {
       if (!this.selectedCustomer) {
-        this.$modal.msgError('请选择客户');
+        this.$modal.msgError('请选择客商');
         return;
       }
       this.formData.customerNo = this.selectedCustomer.customerNo;
-      this.formData.customerName = this.selectedCustomer.customerName;
+      this.formData.classNowId = this.selectedCustomer.customerName;
       this.customerDialog = false;
     },
-    /** 取消选择客户 */
+    /** 取消选择客商 */
     cancelSelectCustomer() {
       this.selectedCustomer = null;
       this.customerDialog = false;
     },
-    /** 打开选择物资弹窗 */
+    /** 打开选择存货弹窗 */
     handleSelectMaterials() {
-      // if (!this.formData.warehouseId) {
-      //   this.$modal.msgError('请选择仓库');
-      //   return;
-      // }
+      if (!this.formData.warehouseId) {
+        this.$modal.msgError('请选择仓库');
+        return;
+      }
+      if (!this.formData.departmentNo) {
+        this.$modal.msgError('请输入项目号');
+        return;
+      }
       this.materialDialog = true;
-      // this.queryParams.warehouseId = this.formData.warehouseId;
+      this.queryParams.warehouseId = this.formData.warehouseId;
+      this.queryParams.spare4 = this.formData.departmentNo;
       this.getMaterialList();
     },
     /** 获取物资列表 */
@@ -383,10 +429,10 @@ export default {
     handleSelectionChange(selection) {
       this.selectedMaterials = selection;
     },
-    /** 确认选择物资 */
+    /** 确认选择存货 */
     confirmSelectMaterials() {
       if (this.selectedMaterials.length === 0) {
-        this.$modal.msgError('请选择物资');
+        this.$modal.msgError('请选择存货');
         return;
       }
       // 过滤掉已经存在的物资
@@ -421,7 +467,7 @@ export default {
       this.materialDialog = false;
       this.selectedMaterials = [];
     },
-    /** 取消选择物资 */
+    /** 取消选择存货 */
     cancelSelectMaterials() {
       this.selectedMaterials = [];
       this.materialDialog = false;
@@ -458,7 +504,7 @@ export default {
       this.$refs.formRef.validate(valid => {
         if (valid) {
           if (this.materialList.length === 0) {
-            this.$modal.msgError('请选择物资');
+            this.$modal.msgError('请选择存货选择存货');
             return;
           }
           const data = {
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index dc531b9..c796934 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -2,6 +2,21 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item :label="'仓库'" prop="warehouseId"><!--仓库-->
+        <el-select
+          v-model="queryParams.warehouseId"
+          :placeholder="'请选择仓库'"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'出库单编号'" prop="stockoutId"> <!-- 出库单编号 -->
         <el-input
           v-model="queryParams.stockoutId"
@@ -30,18 +45,18 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="'客户名称'" prop="customerName">
+      <el-form-item :label="'客商名称'" prop="customerName">
         <el-input
           v-model="queryParams.customerName"
-          :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"
         />
@@ -57,21 +72,7 @@
           :default-time="['00:00:00', '23:59:59']"
         />
       </el-form-item>
-<!--      <el-form-item :label="'仓库'" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
-<!--        <el-select-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          :placeholder="'请选择仓库'"-->
-<!--          clearable-->
-<!--          @change="handleQuery"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in warehouseOptions"-->
-<!--            :key="item.warehouseId"-->
-<!--            :label="item.warehouseName"-->
-<!--            :value="item.warehouseId"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </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> <!-- 重置 -->
@@ -146,14 +147,24 @@
           <dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-<!--      <el-table-column :label="'出口'" align="left" prop="exitId" sortable/>-->
       <el-table-column :label="'项目号'" align="left" prop="departmentNo" />
-      <el-table-column :label="'客户编码'" align="left" prop="customerNo" />
-      <el-table-column :label="'客户编码'" align="left" prop="classNowId" />
+      <el-table-column :label="'客商代号'" align="left" prop="customerNo"/>
+      <el-table-column :label="'客商名称'" align="left" prop="classNowId"/>
       <el-table-column :label="'建单人'" align="left" prop="createManId" />
-<!--      <el-table-column :label="'仓库'" align="left" prop="warehouseId" />-->
-      <el-table-column :label="'合同号'" align="left" prop="spare1" />
-      <el-table-column :label="'销售订单号'" align="left" prop="spare2" />
+      <el-table-column :label="'出库方式'" align="left" prop="carNumber">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.out_method" :value="scope.row.carNumber"/>
+        </template>
+      </el-table-column>
+      <el-table-column :label="'单据来源'" align="left" prop="stockoutSource">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockoutSource"/>
+        </template>
+      </el-table-column>
+      <el-table-column :label="'仓库编码'" align="left" prop="warehouseId"/>
+      <el-table-column :label="'仓库名称'" align="left" prop="warehouseName"/>
+      <!--      <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="createDate" width="160" sortable/>
@@ -189,7 +200,7 @@
       <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="remark"/>
+      <!--      <el-table-column :label="'备注'" align="center" prop="remark"/>-->
     </el-table>
 
 <!--    <pagination-->
@@ -313,13 +324,19 @@
 </template>
 
 <script>
-import { listOutStockout,autoAllot,listOut,manualAllot} from "@/api/out/outStockout"
-import { getOutStockoutDetail,updateOutStockStatus } from "@/api/out/outStockout"
+import {
+  autoAllot,
+  getOutStockoutDetail,
+  listOut,
+  listOutStockout,
+  manualAllot,
+  updateOutStockStatus
+} from "@/api/out/outStockout"
 import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "OutStockWithDetail",
-  dicts: ['out_bill_type', 'out_bill_status'],
+  dicts: ['out_bill_type', 'out_bill_status', 'out_method', 'bill_resource'],
   data() {
     return {
       // 遮罩层
diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
index c21f0b4..78bf146 100644
--- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
@@ -204,7 +204,7 @@
 
       <!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
       <!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-      <el-table-column label="客户名称" align="left" prop="customerName"/>
+      <el-table-column label="客商名称" align="left" prop="customerName"/>
 
       <el-table-column label="品号描述" align="left" prop="price"/>
       <el-table-column label="英文描述" align="left" prop="cargoNo"/>
@@ -522,8 +522,8 @@
         <el-form-item label="包装材积" prop="spare39">
           <el-input v-model="form.spare39" placeholder="请输入包装材积"/>
         </el-form-item>
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称"/>
+        <el-form-item label="客商名称" prop="customerName">
+          <el-input v-model="form.customerName" placeholder="请输入客商名称"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
index 3c1b95d..5a734b6 100644
--- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
@@ -157,7 +157,7 @@
       <el-table-column width="160" label="分配数量" align="right" prop="allotQuantity" />
       <el-table-column width="160" label="确认数量" align="right" prop="assignNum" />
       <el-table-column width="160" label="批次号" align="left" prop="lotNo" />
-      <el-table-column width="160" label="客户名称" align="left" prop="customerName" />
+      <el-table-column width="160" label="客商名称" align="left" prop="customerName" />
       <!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
 <!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
       <el-table-column width="160" label="品号描述" align="left" prop="price" />
@@ -290,11 +290,11 @@
         <el-form-item label="ERP出库单ID" prop="erpStockoutId">
           <el-input v-model="form.erpStockoutId" placeholder="请输入ERP出库单ID" />
         </el-form-item>
-        <el-form-item label="客户编号" prop="entryid">
-          <el-input v-model="form.entryid" placeholder="请输入客户编号" />
+        <el-form-item label="客商编号" prop="entryid">
+          <el-input v-model="form.entryid" placeholder="请输入客商编号" />
         </el-form-item>
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+        <el-form-item label="客商名称" prop="customerName">
+          <el-input v-model="form.customerName" placeholder="请输入客商名称" />
         </el-form-item>
         <el-form-item label="物料主键" prop="productGuid">
           <el-input v-model="form.productGuid" placeholder="请输入物料主键" />
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index 54fa6e5..eba5ad0 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -1,66 +1,58 @@
 <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="品号" 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="序列号"><!-- 库存id -->
+      <el-form-item label="存货名称" prop="productName"><!-- 品名 -->
         <el-input
-          v-model="queryParams.序列号"
-          placeholder="请输入订单号"
+          v-model="queryParams.productName"
+          placeholder="请输入存货名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="序列号" prop="spare6"><!-- 库存id -->
+      <el-form-item label="项目号" prop="spare4"><!-- 品名 -->
         <el-input
-          v-model="queryParams.spare6"
-          placeholder="请输入序列号"
+          v-model="queryParams.spare4"
+          placeholder="请输入项目号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="批次" prop="lotNo"><!-- 库存id -->
+      <el-form-item label="合同号" prop="spare5"><!-- 品名 -->
         <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次"
+          v-model="queryParams.spare5"
+          placeholder="请输入合同号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="巷道" prop="roadwayId"><!-- 货位id -->
+      <el-form-item label="层级关系" prop="spare1"><!-- 品名 -->
         <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道"
+          v-model="queryParams.spare1"
+          placeholder="请输入层级关系"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="货位-排" prop="thePlatoon"><!-- 货位id -->
+      <el-form-item label="上层物料" prop="spare2"><!-- 品名 -->
         <el-input
-          v-model="queryParams.thePlatoon"
-          placeholder="请输入货位-排"
+          v-model="queryParams.spare2"
+          placeholder="请输入上层物料"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="货位-列" prop="theColumn"><!-- 货位id -->
+      <el-form-item label="顶层物料" prop="spare3"><!-- 品名 -->
         <el-input
-          v-model="queryParams.theColumn"
-          placeholder="请输入货位-列"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="货位-层" prop="theFloor"><!-- 货位id -->
-        <el-input
-          v-model="queryParams.theFloor"
-          placeholder="请输入货位-层"
+          v-model="queryParams.spare3"
+          placeholder="请输入顶层物料"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -170,7 +162,7 @@
 </template>
 
 <script>
-import {listManagement, getManagement, delManagement, addManagement, updateManagement} from "@/api/stock/management"
+import {addManagement, delManagement, getManagement, listManagement, updateManagement} from "@/api/stock/management"
 import {listWarehouse} from "@/api/bas/warehouse"
 import {pointOut} from "@/api/job/OutmydoJob"