From 4f550e2f4bfa425adf1ce7f2d56531c132c328d1 Mon Sep 17 00:00:00 2001
From: zj <zhangjun@fortucky.cn>
Date: Sun, 4 Jan 2026 13:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/ToWmsApiController.java    |  27 +-
 .../src/views/bas/BasProductCode/index.vue    |  38 +-
 ruoyi-ui/src/views/bas/basCustomer/index.vue  | 134 ++---
 ruoyi-ui/src/views/bas/basProduct/index.vue   | 544 ++----------------
 ruoyi-ui/src/views/bas/basSupplier/index.vue  | 222 ++-----
 ruoyi-ui/src/views/check/job/in/index.vue     |   8 +-
 ruoyi-ui/src/views/check/job/out/index.vue    |   8 +-
 ruoyi-ui/src/views/check/stockCheck/index.vue |  11 +-
 ruoyi-ui/src/views/in/job/index.vue           |  10 +-
 ruoyi-ui/src/views/job/outJobManagement.vue   |   2 +-
 ruoyi-ui/src/views/stock/pointOut.vue         |  24 +-
 11 files changed, 221 insertions(+), 807 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
index 7ef9ac6..a2c3989 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
@@ -211,8 +211,27 @@ public class ToWmsApiController {
         basProduct.setProductName(param.get("item_name").toString());
         basProduct.setPrice(param.get("item_desc").toString());
         basProduct.setSpec(param.get("item_spec").toString());
-        basProduct.setUnit(param.get("inv_unit_no").toString());
+        basProduct.setUnit(param.get("item_group_no").toString());
         basProduct.setParentId(param.get("item_group_no").toString());
+        JSONArray param1 = JSONUtil.parseArray(param.get("packing_mode").toString());
+        if(param1.size() > 0){
+            basProduct.setSpare36(JSONUtil.parseObj(param1.get(0).toString()).get("length").toString());
+            basProduct.setSpare37(JSONUtil.parseObj(param1.get(0).toString()).get("width").toString());
+            basProduct.setSpare38(JSONUtil.parseObj(param1.get(0).toString()).get("heigth").toString());
+            if(basProduct.getSpare36() != null && basProduct.getSpare37() != null){
+                if("760".equals(basProduct.getSpare36()) && "960".equals(basProduct.getSpare37())){
+                    basProduct.setSpare10("1");
+                } else if ("1000".equals(basProduct.getSpare36()) && "800".equals(basProduct.getSpare37())) {
+                    basProduct.setSpare10("2");
+                } else if ("1130".equals(basProduct.getSpare36()) && "800".equals(basProduct.getSpare37())) {
+                    basProduct.setSpare10("3");
+                } else if ("1130".equals(basProduct.getSpare36()) && "900".equals(basProduct.getSpare37())) {
+                    basProduct.setSpare10("4");
+                } else{
+                    basProduct.setSpare10("5");
+                }
+            }
+        }
         AjaxResult ajaxResult = toWmsService.receiveProduct(basProduct);
         RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(basProduct), "接收物料", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
@@ -249,6 +268,12 @@ public class ToWmsApiController {
         basProduct.setPrice(param.get("item_desc").toString());
         basProduct.setSpec(param.get("item_spec").toString());
         basProduct.setUnit(param.get("inv_unit_no").toString());
+        JSONArray param1 = JSONUtil.parseArray(param.get("packing_mode").toString());
+        if(param1.size() > 0){
+            basProduct.setSpare36(JSONUtil.parseObj(param1.get(0).toString()).get("length").toString());
+            basProduct.setSpare37(JSONUtil.parseObj(param1.get(0).toString()).get("width").toString());
+            basProduct.setSpare38(JSONUtil.parseObj(param1.get(0).toString()).get("heigth").toString());
+        }
         AjaxResult ajaxResult = toWmsService.InvalidProduct(basProduct);
         RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(basProduct), "作废物料", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
diff --git a/ruoyi-ui/src/views/bas/BasProductCode/index.vue b/ruoyi-ui/src/views/bas/BasProductCode/index.vue
index 1c2bd98..eec6449 100644
--- a/ruoyi-ui/src/views/bas/BasProductCode/index.vue
+++ b/ruoyi-ui/src/views/bas/BasProductCode/index.vue
@@ -290,46 +290,14 @@
       >
         <el-table-column type="index" width="50" align="center" />
          <el-table-column label="品号" align="center" prop="productId" />
-      <el-table-column label="NC号" align="center" prop="spare9" />
       <el-table-column label="品名" align="center" prop="productName" />
       <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="品号描述" align="center" prop="price" />
-      <el-table-column label="英文描述" align="center" prop="cargoNo" />
-      <el-table-column label="图号" align="center" prop="unit" />
-      <el-table-column label="电压" align="center" prop="spare5" />
-      <el-table-column label="电源线" align="center" prop="spare10" />
-      <el-table-column label="插头" align="center" prop="spare11" />
-      <el-table-column label="接嘴" align="center" prop="spare12" />
-      <el-table-column label="快捷码" align="center" prop="spare13" />
-      <el-table-column label="库存单位编号" align="center" prop="spare14" />
-      <el-table-column label="库存单位名称" align="center" prop="spare15" />
-      <el-table-column label="品号群组" align="center" prop="spare16" />
-      <el-table-column label="归类品" align="center" prop="spare17" />
-      <el-table-column label="计量体系" align="center" prop="spare18" />
-      <el-table-column label="群组名称" align="center" prop="spare19" />
-      <el-table-column label="批号管理" align="center" prop="spare20" />
-      <el-table-column label="状态" align="center" prop="spare21" />
-      <el-table-column label="产品大类" align="center" prop="spare22" />
-      <el-table-column label="产品二类" align="center" prop="spare23" />
-      <el-table-column label="产品线/产品系列" align="center" prop="spare24" />
-      <el-table-column label="BOM状态" align="center" prop="spare25" />
-      <el-table-column label="产品定位" align="center" prop="spare26" />
-      <el-table-column label="电脑板型号" align="center" prop="spare27" />
-      <el-table-column label="非标要求" align="center" prop="spare28" />
-      <el-table-column label="品牌" align="center" prop="spare29" />
-      <el-table-column label="非标颜色" align="center" prop="spare30" />
-      <el-table-column label="主颜色" align="center" prop="spare31" />
-      <el-table-column label="辅助颜色" align="center" prop="spare32" />
-      <el-table-column label="是否标准款" align="center" prop="spare33" />
-      <el-table-column label="包装方式" align="center" prop="spare34" />
-      <el-table-column label="主要包装方式" align="center" prop="spare35" />
-      <el-table-column label="描述" align="center" prop="remark" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="托盘尺寸" align="center" prop="spare10" />
       <el-table-column label="长" align="center" prop="spare36" />
       <el-table-column label="宽" align="center" prop="spare37" />
       <el-table-column label="高" align="center" prop="spare38" />
-      <el-table-column label="包装材积" align="center" prop="spare39" />
       </el-table>
-
       <pagination
         v-show="productTotal > 0"
         :total="productTotal"
@@ -381,7 +349,7 @@ const TABLE_COLUMNS = [
   },
   { prop: 'spare1', label: '订单号', width: 150 },
   { prop: 'spare2', label: '机型', width: 120 },
-  { prop: 'spare3', label: '分箱', width: 100 }
+  { prop: 'spare3', label: '分销', width: 100 }
 ]
 
 const DEFAULT_FORM = {
diff --git a/ruoyi-ui/src/views/bas/basCustomer/index.vue b/ruoyi-ui/src/views/bas/basCustomer/index.vue
index 1699eb2..3cbd585 100644
--- a/ruoyi-ui/src/views/bas/basCustomer/index.vue
+++ b/ruoyi-ui/src/views/bas/basCustomer/index.vue
@@ -9,10 +9,10 @@
         <el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="简称" prop="simpleName">
-        <el-input v-model="queryParams.simpleName" placeholder="请输入简称" clearable
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
+<!--      <el-form-item label="简称" prop="simpleName">-->
+<!--        <el-input v-model="queryParams.simpleName" placeholder="请输入简称" clearable-->
+<!--                  @keyup.enter.native="handleQuery"/>-->
+<!--      </el-form-item>-->
       <el-form-item label="是否可用" prop="useable">
         <el-select v-model="queryParams.useable" placeholder="请选择是否可用" clearable>
           <el-option
@@ -55,31 +55,31 @@
     </el-row>
 
     <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="simpleName"/>
-      <el-table-column width="120" label="是否可用" align="left" prop="useable">
+      <el-table-column type="selection" align="center"/>
+      <el-table-column label="客户编号" align="left" prop="customerNo"/>
+<!--      <el-table-column width="120" label="客户类别" align="left" prop="customerGroupNo"/>-->
+      <el-table-column label="客户名称" align="left" prop="customerName"/>
+      <el-table-column label="简称" 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"/>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="备注" align="left" prop="remark"/>
-      <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="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="country"/>
-      <el-table-column width="120" label="时区" align="left" prop="timeZone"/>
-      <el-table-column width="120" label="数据格式" align="left" prop="dataFormat"/>
-      <el-table-column width="120" label="联系人" align="left" prop="contactName"/>
-      <el-table-column width="120" label="装运国家" align="left" prop="shipment"/>
-      <el-table-column width="120" label="税种" align="left" prop="taxCategory"/>
+      <el-table-column label="备注" align="left" prop="remark"/>
+<!--      <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="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="country"/>-->
+<!--      <el-table-column width="120" label="时区" align="left" prop="timeZone"/>-->
+<!--      <el-table-column width="120" label="数据格式" align="left" prop="dataFormat"/>-->
+<!--      <el-table-column width="120" label="联系人" align="left" prop="contactName"/>-->
+<!--      <el-table-column width="120" label="装运国家" align="left" prop="shipment"/>-->
+<!--      <el-table-column width="120" label="税种" align="left" prop="taxCategory"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -125,48 +125,48 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"/>
         </el-form-item>
-        <el-form-item label="业务部门" prop="businessDepartment">
-          <el-input v-model="form.businessDepartment" placeholder="请输入业务部门"/>
-        </el-form-item>
-        <el-form-item label="业务员" prop="salesman">
-          <el-input v-model="form.salesman" placeholder="请输入业务员"/>
-        </el-form-item>
-        <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>
-        <el-form-item label="纳税人识别号" prop="taxpayerRegistrationNumber">
-          <el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人识别号"/>
-        </el-form-item>
-        <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>
-        <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="请输入国家/地区"/>
-        </el-form-item>
-        <el-form-item label="时区" prop="timeZone">
-          <el-input v-model="form.timeZone" placeholder="请输入时区"/>
-        </el-form-item>
-        <el-form-item label="数据格式" prop="dataFormat">
-          <el-input v-model="form.dataFormat" placeholder="请输入数据格式"/>
-        </el-form-item>
-        <el-form-item label="联系人" prop="contactName">
-          <el-input v-model="form.contactName" placeholder="请输入联系人"/>
-        </el-form-item>
-        <el-form-item label="装运国家" prop="shipment">
-          <el-input v-model="form.shipment" placeholder="请输入装运国家"/>
-        </el-form-item>
-        <el-form-item label="税种" prop="taxCategory">
-          <el-input v-model="form.taxCategory" placeholder="请输入税种"/>
-        </el-form-item>
+<!--        <el-form-item label="业务部门" prop="businessDepartment">-->
+<!--          <el-input v-model="form.businessDepartment" placeholder="请输入业务部门"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="业务员" prop="salesman">-->
+<!--          <el-input v-model="form.salesman" placeholder="请输入业务员"/>-->
+<!--        </el-form-item>-->
+<!--        <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>-->
+<!--        <el-form-item label="纳税人识别号" prop="taxpayerRegistrationNumber">-->
+<!--          <el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人识别号"/>-->
+<!--        </el-form-item>-->
+<!--        <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>-->
+<!--        <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="请输入国家/地区"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="时区" prop="timeZone">-->
+<!--          <el-input v-model="form.timeZone" placeholder="请输入时区"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="数据格式" prop="dataFormat">-->
+<!--          <el-input v-model="form.dataFormat" placeholder="请输入数据格式"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="联系人" prop="contactName">-->
+<!--          <el-input v-model="form.contactName" placeholder="请输入联系人"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="装运国家" prop="shipment">-->
+<!--          <el-input v-model="form.shipment" placeholder="请输入装运国家"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="税种" prop="taxCategory">-->
+<!--          <el-input v-model="form.taxCategory" placeholder="请输入税种"/>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确定</el-button>
diff --git a/ruoyi-ui/src/views/bas/basProduct/index.vue b/ruoyi-ui/src/views/bas/basProduct/index.vue
index f3a5d40..6841893 100644
--- a/ruoyi-ui/src/views/bas/basProduct/index.vue
+++ b/ruoyi-ui/src/views/bas/basProduct/index.vue
@@ -9,94 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="产品分类" prop="parentId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.parentId"-->
-<!--          placeholder="请输入产品分类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号描述" prop="price">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          placeholder="请输入品号描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="英文描述" prop="cargoNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
-<!--          placeholder="请输入英文描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图号" prop="unit">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入图号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格" prop="spec">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @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>-->
-<!--      <el-form-item label="单件净重" prop="spare2">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare2"-->
-<!--          placeholder="请输入单件净重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="颜色" prop="spare3">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare3"-->
-<!--          placeholder="请输入颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="序列号" prop="spare4">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare4"-->
-<!--          placeholder="请输入序列号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电压" prop="spare5">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare5"-->
-<!--          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="productName">
         <el-input
           v-model="queryParams.productName"
@@ -105,270 +18,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="相位" prop="spare7">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare7"-->
-<!--          placeholder="请输入相位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="毛重" prop="spare8">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare8"-->
-<!--          placeholder="请输入毛重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="NC号" prop="spare9">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare9"-->
-<!--          placeholder="请输入NC号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="托盘尺寸" prop="spare10">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare10"-->
-<!--          placeholder="请输入托盘尺寸"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="插头" prop="spare11">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare11"-->
-<!--          placeholder="请输入插头"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="接嘴" prop="spare12">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare12"-->
-<!--          placeholder="请输入接嘴"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="快捷码" prop="spare13">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare13"-->
-<!--          placeholder="请输入快捷码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位编号" prop="spare14">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare14"-->
-<!--          placeholder="请输入库存单位编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位名称" prop="spare15">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare15"-->
-<!--          placeholder="请输入库存单位名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号群组" prop="spare16">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare16"-->
-<!--          placeholder="请输入品号群组"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="归类品" prop="spare17">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare17"-->
-<!--          placeholder="请输入归类品"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计量体系" prop="spare18">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare18"-->
-<!--          placeholder="请输入计量体系"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="群组名称" prop="spare19">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare19"-->
-<!--          placeholder="请输入群组名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号管理" prop="spare20">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare20"-->
-<!--          placeholder="请输入批号管理"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="spare21">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare21"-->
-<!--          placeholder="请输入状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品大类" prop="spare22">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare22"-->
-<!--          placeholder="请输入产品大类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品二类" prop="spare23">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare23"-->
-<!--          placeholder="请输入产品二类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare24"-->
-<!--          placeholder="请输入产品线/产品系列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="BOM状态" prop="spare25">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare25"-->
-<!--          placeholder="请输入BOM状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品定位" prop="spare26">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare26"-->
-<!--          placeholder="请输入产品定位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电脑板型号" prop="spare27">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare27"-->
-<!--          placeholder="请输入电脑板型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标要求" prop="spare28">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare28"-->
-<!--          placeholder="请输入非标要求"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品牌" prop="spare29">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare29"-->
-<!--          placeholder="请输入品牌"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标颜色" prop="spare30">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare30"-->
-<!--          placeholder="请输入非标颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主颜色" prop="spare31">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare31"-->
-<!--          placeholder="请输入主颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="辅助颜色" prop="spare32">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare32"-->
-<!--          placeholder="请输入辅助颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="是否标准款" prop="spare33">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare33"-->
-<!--          placeholder="请输入是否标准款"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装方式" prop="spare34">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare34"-->
-<!--          placeholder="请输入包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主要包装方式" prop="spare35">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare35"-->
-<!--          placeholder="请输入主要包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="长" prop="spare36">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare36"-->
-<!--          placeholder="请输入长"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="宽" prop="spare37">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare37"-->
-<!--          placeholder="请输入宽"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="高" prop="spare38">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare38"-->
-<!--          placeholder="请输入高"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装材积" prop="spare39">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare39"-->
-<!--          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>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -422,47 +72,43 @@
     </el-row>
 
     <el-table v-loading="loading" :data="BasProductList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" align="center" />
 <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
-      <el-table-column label="品号" align="center" prop="productId" />
-      <el-table-column label="NC号" align="center" prop="spare9" />
-      <el-table-column label="品名" align="center" prop="productName" />
-      <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="品号描述" align="center" prop="price" />
-      <el-table-column label="英文描述" align="center" prop="cargoNo" />
-      <el-table-column label="图号" align="center" prop="unit" />
-      <el-table-column label="电压" align="center" prop="spare5" />
+      <el-table-column label="品号" align="center" prop="productId" width="150"/>
+      <el-table-column label="品名" align="left" prop="productName" width="200"/>
+      <el-table-column label="规格" align="left" prop="spec" width="500"/>
+      <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="托盘尺寸" align="center" prop="spare10" />
-      <el-table-column label="插头" align="center" prop="spare11" />
-      <el-table-column label="接嘴" align="center" prop="spare12" />
-      <el-table-column label="快捷码" align="center" prop="spare13" />
-      <el-table-column label="库存单位编号" align="center" prop="spare14" />
-      <el-table-column label="库存单位名称" align="center" prop="spare15" />
-      <el-table-column label="品号群组" align="center" prop="spare16" />
-      <el-table-column label="归类品" align="center" prop="spare17" />
-      <el-table-column label="计量体系" align="center" prop="spare18" />
-      <el-table-column label="群组名称" align="center" prop="spare19" />
-      <el-table-column label="批号管理" align="center" prop="spare20" />
-      <el-table-column label="状态" align="center" prop="spare21" />
-      <el-table-column label="产品大类" align="center" prop="spare22" />
-      <el-table-column label="产品二类" align="center" prop="spare23" />
-      <el-table-column label="产品线/产品系列" align="center" prop="spare24" />
-      <el-table-column label="BOM状态" align="center" prop="spare25" />
-      <el-table-column label="产品定位" align="center" prop="spare26" />
-      <el-table-column label="电脑板型号" align="center" prop="spare27" />
-      <el-table-column label="非标要求" align="center" prop="spare28" />
-      <el-table-column label="品牌" align="center" prop="spare29" />
-      <el-table-column label="非标颜色" align="center" prop="spare30" />
-      <el-table-column label="主颜色" align="center" prop="spare31" />
-      <el-table-column label="辅助颜色" align="center" prop="spare32" />
-      <el-table-column label="是否标准款" align="center" prop="spare33" />
-      <el-table-column label="包装方式" align="center" prop="spare34" />
-      <el-table-column label="主要包装方式" align="center" prop="spare35" />
-      <el-table-column label="描述" align="center" prop="remark" />
+<!--      <el-table-column label="插头" align="center" prop="spare11" />-->
+<!--      <el-table-column label="接嘴" align="center" prop="spare12" />-->
+<!--      <el-table-column label="快捷码" align="center" prop="spare13" />-->
+<!--      <el-table-column label="库存单位编号" align="center" prop="spare14" />-->
+<!--      <el-table-column label="库存单位名称" align="center" prop="spare15" />-->
+<!--      <el-table-column label="品号群组" align="center" prop="spare16" />-->
+<!--      <el-table-column label="归类品" align="center" prop="spare17" />-->
+<!--      <el-table-column label="计量体系" align="center" prop="spare18" />-->
+<!--      <el-table-column label="群组名称" align="center" prop="spare19" />-->
+<!--      <el-table-column label="批号管理" align="center" prop="spare20" />-->
+<!--      <el-table-column label="状态" align="center" prop="spare21" />-->
+<!--      <el-table-column label="产品大类" align="center" prop="spare22" />-->
+<!--      <el-table-column label="产品二类" align="center" prop="spare23" />-->
+<!--      <el-table-column label="产品线/产品系列" align="center" prop="spare24" />-->
+<!--      <el-table-column label="BOM状态" align="center" prop="spare25" />-->
+<!--      <el-table-column label="产品定位" align="center" prop="spare26" />-->
+<!--      <el-table-column label="电脑板型号" align="center" prop="spare27" />-->
+<!--      <el-table-column label="非标要求" align="center" prop="spare28" />-->
+<!--      <el-table-column label="品牌" align="center" prop="spare29" />-->
+<!--      <el-table-column label="非标颜色" align="center" prop="spare30" />-->
+<!--      <el-table-column label="主颜色" align="center" prop="spare31" />-->
+<!--      <el-table-column label="辅助颜色" align="center" prop="spare32" />-->
+<!--      <el-table-column label="是否标准款" align="center" prop="spare33" />-->
+<!--      <el-table-column label="包装方式" align="center" prop="spare34" />-->
+<!--      <el-table-column label="主要包装方式" align="center" prop="spare35" />-->
+<!--      <el-table-column label="描述" align="center" prop="remark" />-->
       <el-table-column label="长" align="center" prop="spare36" />
       <el-table-column label="宽" align="center" prop="spare37" />
       <el-table-column label="高" align="center" prop="spare38" />
-      <el-table-column label="包装材积" align="center" prop="spare39" />
+<!--      <el-table-column label="包装材积" align="center" prop="spare39" />-->
 <!--      <el-table-column label="产品分类" align="center" prop="parentId" />-->
 <!--      <el-table-column label="型号" align="center" prop="spare1" />-->
 <!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
@@ -509,130 +155,15 @@
         <el-form-item label="品名" prop="productName">
           <el-input v-model="form.productName" placeholder="请输入品名" />
         </el-form-item>
-<!--        <el-form-item label="产品分类" prop="parentId">-->
-<!--          <el-input v-model="form.parentId" placeholder="请输入产品分类" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="品号描述" prop="price">
-          <el-input v-model="form.price" placeholder="请输入品号描述" />
-        </el-form-item>
-        <el-form-item label="英文描述" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入英文描述" />
-        </el-form-item>
-        <el-form-item label="图号" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入图号" />
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
         </el-form-item>
         <el-form-item label="规格" prop="spec">
           <el-input v-model="form.spec" placeholder="请输入规格" />
         </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
-        </el-form-item>
-<!--        <el-form-item label="型号" prop="spare1">-->
-<!--          <el-input v-model="form.spare1" placeholder="请输入型号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="单件净重" prop="spare2">-->
-<!--          <el-input v-model="form.spare2" placeholder="请输入单件净重" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="颜色" prop="spare3">-->
-<!--          <el-input v-model="form.spare3" placeholder="请输入颜色" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="序列号" prop="spare4">-->
-<!--          <el-input v-model="form.spare4" placeholder="请输入序列号" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="电压" prop="spare5">
-          <el-input v-model="form.spare5" placeholder="请输入电压" />
-        </el-form-item>
-<!--        <el-form-item label="功率" prop="spare6">-->
-<!--          <el-input v-model="form.spare6" placeholder="请输入功率" />-->
-<!--        </el-form-item>-->
-
-<!--        <el-form-item label="相位" prop="spare7">-->
-<!--          <el-input v-model="form.spare7" placeholder="请输入相位" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="毛重" prop="spare8">-->
-<!--          <el-input v-model="form.spare8" placeholder="请输入毛重" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="NC号" prop="spare9">
-          <el-input v-model="form.spare9" placeholder="请输入NC号" />
-        </el-form-item>
         <el-form-item label="托盘尺寸" prop="spare10">
           <el-input v-model="form.spare10" placeholder="请输入托盘尺寸" />
         </el-form-item>
-        <el-form-item label="插头" prop="spare11">
-          <el-input v-model="form.spare11" placeholder="请输入插头" />
-        </el-form-item>
-        <el-form-item label="接嘴" prop="spare12">
-          <el-input v-model="form.spare12" placeholder="请输入接嘴" />
-        </el-form-item>
-        <el-form-item label="快捷码" prop="spare13">
-          <el-input v-model="form.spare13" placeholder="请输入快捷码" />
-        </el-form-item>
-        <el-form-item label="库存单位编号" prop="spare14">
-          <el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
-        </el-form-item>
-        <el-form-item label="库存单位名称" prop="spare15">
-          <el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
-        </el-form-item>
-        <el-form-item label="品号群组" prop="spare16">
-          <el-input v-model="form.spare16" placeholder="请输入品号群组" />
-        </el-form-item>
-        <el-form-item label="归类品" prop="spare17">
-          <el-input v-model="form.spare17" placeholder="请输入归类品" />
-        </el-form-item>
-        <el-form-item label="计量体系" prop="spare18">
-          <el-input v-model="form.spare18" placeholder="请输入计量体系" />
-        </el-form-item>
-        <el-form-item label="群组名称" prop="spare19">
-          <el-input v-model="form.spare19" placeholder="请输入群组名称" />
-        </el-form-item>
-        <el-form-item label="批号管理" prop="spare20">
-          <el-input v-model="form.spare20" placeholder="请输入批号管理" />
-        </el-form-item>
-        <el-form-item label="状态" prop="spare21">
-          <el-input v-model="form.spare21" placeholder="请输入状态" />
-        </el-form-item>
-        <el-form-item label="产品大类" prop="spare22">
-          <el-input v-model="form.spare22" placeholder="请输入产品大类" />
-        </el-form-item>
-        <el-form-item label="产品二类" prop="spare23">
-          <el-input v-model="form.spare23" placeholder="请输入产品二类" />
-        </el-form-item>
-        <el-form-item label="产品线/产品系列" prop="spare24">
-          <el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
-        </el-form-item>
-        <el-form-item label="BOM状态" prop="spare25">
-          <el-input v-model="form.spare25" placeholder="请输入BOM状态" />
-        </el-form-item>
-        <el-form-item label="产品定位" prop="spare26">
-          <el-input v-model="form.spare26" placeholder="请输入产品定位" />
-        </el-form-item>
-        <el-form-item label="电脑板型号" prop="spare27">
-          <el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
-        </el-form-item>
-        <el-form-item label="非标要求" prop="spare28">
-          <el-input v-model="form.spare28" placeholder="请输入非标要求" />
-        </el-form-item>
-        <el-form-item label="品牌" prop="spare29">
-          <el-input v-model="form.spare29" placeholder="请输入品牌" />
-        </el-form-item>
-        <el-form-item label="非标颜色" prop="spare30">
-          <el-input v-model="form.spare30" placeholder="请输入非标颜色" />
-        </el-form-item>
-        <el-form-item label="主颜色" prop="spare31">
-          <el-input v-model="form.spare31" placeholder="请输入主颜色" />
-        </el-form-item>
-        <el-form-item label="辅助颜色" prop="spare32">
-          <el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
-        </el-form-item>
-        <el-form-item label="是否标准款" prop="spare33">
-          <el-input v-model="form.spare33" placeholder="请输入是否标准款" />
-        </el-form-item>
-        <el-form-item label="包装方式" prop="spare34">
-          <el-input v-model="form.spare34" placeholder="请输入包装方式" />
-        </el-form-item>
-        <el-form-item label="主要包装方式" prop="spare35">
-          <el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
-        </el-form-item>
         <el-form-item label="长" prop="spare36">
           <el-input v-model="form.spare36" placeholder="请输入长" />
         </el-form-item>
@@ -642,9 +173,6 @@
         <el-form-item label="高" prop="spare38">
           <el-input v-model="form.spare38" placeholder="请输入高" />
         </el-form-item>
-        <el-form-item label="包装材积" prop="spare39">
-          <el-input v-model="form.spare39" placeholder="请输入包装材积" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/ruoyi-ui/src/views/bas/basSupplier/index.vue b/ruoyi-ui/src/views/bas/basSupplier/index.vue
index fdbb69c..c3e820f 100644
--- a/ruoyi-ui/src/views/bas/basSupplier/index.vue
+++ b/ruoyi-ui/src/views/bas/basSupplier/index.vue
@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="供应商名称" prop="supplierGroupNo">
-        <el-input
-          v-model="queryParams.supplierGroupNo"
-          placeholder="请输入供应商名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item label="供应商名称" prop="supplierName">
         <el-input
           v-model="queryParams.supplierName"
@@ -44,102 +36,6 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item :label="$t('BasSupplier.supplierArae')" prop="supplierArae"> 地区分类
-        <el-input
-          v-model="queryParams.supplierArae"
-          :placeholder="$t('BasSupplier.inputSupplierArae')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.taxpayerRegistrationNumber')" prop="taxpayerRegistrationNumber"> 纳税人登记号
-        <el-input
-          v-model="queryParams.taxpayerRegistrationNumber"
-          :placeholder="$t('BasSupplier.inputTaxpayerRegistrationNumber')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.country')" prop="country"> 国家
-        <el-input
-          v-model="queryParams.country"
-          :placeholder="$t('BasSupplier.inputCountry')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.timeZone')" prop="timeZone"> 时区
-        <el-input
-          v-model="queryParams.timeZone"
-          :placeholder="$t('BasSupplier.inputTimeZone')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.dataFormat')" prop="dataFormat"> 数据格式
-        <el-input
-          v-model="queryParams.dataFormat"
-          :placeholder="$t('BasSupplier.inputDataFormat')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.receivingCountry')" prop="receivingCountry"> 收货国家
-        <el-input
-          v-model="queryParams.receivingCountry"
-          :placeholder="$t('BasSupplier.inputReceivingCountry')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.taxCategory')" prop="taxCategory"> 税类
-        <el-input
-          v-model="queryParams.taxCategory"
-          :placeholder="$t('BasSupplier.inputTaxCategory')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.legalPerson')" prop="legalPerson"> 法人
-        <el-input
-          v-model="queryParams.legalPerson"
-          :placeholder="$t('BasSupplier.inputLegalPerson')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.registeredCapital')" prop="registeredCapital"> 注册资金
-        <el-input
-          v-model="queryParams.registeredCapital"
-          :placeholder="$t('BasSupplier.inputRegisteredCapital')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.address')" prop="address"> 企业地址
-        <el-input
-          v-model="queryParams.address"
-          :placeholder="$t('BasSupplier.inputAddress')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.contactName')" prop="contactName"> 联系人姓名
-        <el-input
-          v-model="queryParams.contactName"
-          :placeholder="$t('BasSupplier.inputContactName')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('BasSupplier.contactNumber')" prop="contactNumber"> 联系电话
-        <el-input
-          v-model="queryParams.contactNumber"
-          :placeholder="$t('BasSupplier.inputContactNumber')"
-          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>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -193,30 +89,30 @@
     </el-row>
 
     <el-table v-loading="loading" :data="BasSupplierList" @selection-change="handleSelectionChange" max-height="700">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="供应商编号" align="left" prop="supplierNo" width="120" />
-      <el-table-column label="供应商组" align="left" prop="supplierGroupNo" width="120" />
-      <el-table-column label="供应商名称" align="left" prop="supplierName" width="120" />
-      <el-table-column label="简称" align="left" prop="simpleName" width="120" />
-      <el-table-column label="是否可用" align="left" prop="useable" width="120" >
+      <el-table-column type="selection" align="center" />
+      <el-table-column label="供应商编号" align="left" prop="supplierNo"/>
+<!--      <el-table-column label="供应商组" align="left" prop="supplierGroupNo" width="120" />-->
+      <el-table-column label="供应商名称" align="left" prop="supplierName"/>
+      <el-table-column label="简称" 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"/>
         </template>
         </el-table-column>
-      <el-table-column label="备注" align="left" prop="remark" width="120" />
-      <el-table-column label="地区" align="left" prop="supplierArae" width="120" />
-      <el-table-column label="纳税人登记号" align="left" prop="taxpayerRegistrationNumber" width="120" />
-      <el-table-column label="国家" align="left" prop="country" width="120" />
-      <el-table-column label="时区" align="left" prop="timeZone" width="120" />
-      <el-table-column label="数据格式" align="left" prop="dataFormat" width="120" />
-      <el-table-column label="收货国家" align="left" prop="receivingCountry" width="120" />
-      <el-table-column label="税收类别" align="left" prop="taxCategory" width="120" />
-      <el-table-column label="法人" align="left" prop="legalPerson" width="120" />
-      <el-table-column label="注册资本" align="right" prop="registeredCapital" width="120" />
-      <el-table-column label="地址" align="left" prop="address" width="120" />
-      <el-table-column label="联系人" align="left" prop="contactName" width="120" />
-      <el-table-column label="联系电话" align="left" prop="contactNumber" width="120" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+      <el-table-column label="备注" align="left" prop="remark"/>
+<!--      <el-table-column label="地区" align="left" prop="supplierArae" width="120" />-->
+<!--      <el-table-column label="纳税人登记号" align="left" prop="taxpayerRegistrationNumber" width="120" />-->
+<!--      <el-table-column label="国家" align="left" prop="country" width="120" />-->
+<!--      <el-table-column label="时区" align="left" prop="timeZone" width="120" />-->
+<!--      <el-table-column label="数据格式" align="left" prop="dataFormat" width="120" />-->
+<!--      <el-table-column label="收货国家" align="left" prop="receivingCountry" width="120" />-->
+<!--      <el-table-column label="税收类别" align="left" prop="taxCategory" width="120" />-->
+<!--      <el-table-column label="法人" align="left" prop="legalPerson" width="120" />-->
+<!--      <el-table-column label="注册资本" align="right" prop="registeredCapital" width="120" />-->
+<!--      <el-table-column label="地址" align="left" prop="address" width="120" />-->
+<!--      <el-table-column label="联系人" align="left" prop="contactName" width="120" />-->
+<!--      <el-table-column label="联系电话" align="left" prop="contactNumber" width="120" />-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -250,9 +146,9 @@
         <el-form-item label="供应商编号" prop="supplierNo">
           <el-input v-model="form.supplierNo" placeholder="请输入供应商编号" />
         </el-form-item>
-        <el-form-item label="供应商组编号" prop="supplierGroupNo">
-          <el-input v-model="form.supplierGroupNo" placeholder="请输入供应商组编号" />
-        </el-form-item>
+<!--        <el-form-item label="供应商组编号" prop="supplierGroupNo">-->
+<!--          <el-input v-model="form.supplierGroupNo" placeholder="请输入供应商组编号" />-->
+<!--        </el-form-item>-->
         <el-form-item label="供应商名称" prop="supplierName">
           <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
         </el-form-item>
@@ -272,42 +168,42 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="地区" prop="supplierArae">
-          <el-input v-model="form.supplierArae" placeholder="请输入地区" />
-        </el-form-item>
-        <el-form-item label="纳税人登记号" prop="taxpayerRegistrationNumber">
-          <el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人登记号" />
-        </el-form-item>
-        <el-form-item label="国家" prop="country">
-          <el-input v-model="form.country" placeholder="请输入国家" />
-        </el-form-item>
-        <el-form-item label="时区" prop="timeZone">
-          <el-input v-model="form.timeZone" placeholder="请输入时区" />
-        </el-form-item>
-        <el-form-item label="数据格式" prop="dataFormat">
-          <el-input v-model="form.dataFormat" placeholder="请输入数据格式" />
-        </el-form-item>
-        <el-form-item label="收货国家" prop="receivingCountry">
-          <el-input v-model="form.receivingCountry" placeholder="请输入收货国家" />
-        </el-form-item>
-        <el-form-item label="税收类别" prop="taxCategory">
-          <el-input v-model="form.taxCategory" placeholder="请输入税收类别" />
-        </el-form-item>
-        <el-form-item label="法人" prop="legalPerson">
-          <el-input v-model="form.legalPerson" placeholder="请输入法人" />
-        </el-form-item>
-        <el-form-item label="注册资本" prop="registeredCapital">
-          <el-input v-model="form.registeredCapital" placeholder="请输入注册资本" />
-        </el-form-item>
-        <el-form-item label="地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入地址" />
-        </el-form-item>
-        <el-form-item label="联系人" prop="contactName">
-          <el-input v-model="form.contactName" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactNumber">
-          <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
-        </el-form-item>
+<!--        <el-form-item label="地区" prop="supplierArae">-->
+<!--          <el-input v-model="form.supplierArae" placeholder="请输入地区" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="纳税人登记号" prop="taxpayerRegistrationNumber">-->
+<!--          <el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人登记号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="国家" prop="country">-->
+<!--          <el-input v-model="form.country" placeholder="请输入国家" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="时区" prop="timeZone">-->
+<!--          <el-input v-model="form.timeZone" placeholder="请输入时区" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="数据格式" prop="dataFormat">-->
+<!--          <el-input v-model="form.dataFormat" placeholder="请输入数据格式" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="收货国家" prop="receivingCountry">-->
+<!--          <el-input v-model="form.receivingCountry" placeholder="请输入收货国家" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="税收类别" prop="taxCategory">-->
+<!--          <el-input v-model="form.taxCategory" placeholder="请输入税收类别" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="法人" prop="legalPerson">-->
+<!--          <el-input v-model="form.legalPerson" placeholder="请输入法人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="注册资本" prop="registeredCapital">-->
+<!--          <el-input v-model="form.registeredCapital" placeholder="请输入注册资本" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="地址" prop="address">-->
+<!--          <el-input v-model="form.address" placeholder="请输入地址" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="联系人" prop="contactName">-->
+<!--          <el-input v-model="form.contactName" placeholder="请输入联系人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="联系电话" prop="contactNumber">-->
+<!--          <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确定</el-button>
diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue
index f6e6ece..ab51069 100644
--- a/ruoyi-ui/src/views/check/job/in/index.vue
+++ b/ruoyi-ui/src/views/check/job/in/index.vue
@@ -143,15 +143,15 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
-      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
+<!--      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>-->
+<!--      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>-->
+<!--      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>-->
       <el-table-column label="品号" align="left" prop="productId" />
       <el-table-column label="品名" align="left" prop="productName" width="160"/>
+      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
       <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
       <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
       <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue
index fffd2f4..62a0a3c 100644
--- a/ruoyi-ui/src/views/check/job/out/index.vue
+++ b/ruoyi-ui/src/views/check/job/out/index.vue
@@ -135,16 +135,16 @@
 
     <el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
       <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160"/>
-      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
+<!--      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>-->
+<!--      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>-->
+<!--      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>-->
       <el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
       <el-table-column label="品号" align="left" prop="productId"/>
       <el-table-column label="品名" align="left" prop="productName" width="160"/>
+      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
       <el-table-column label="出库数量" align="right" prop="outQuantity"/> <!-- 出库数量 -->
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
       <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
       <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
       <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue
index 3f54530..b17f318 100644
--- a/ruoyi-ui/src/views/check/stockCheck/index.vue
+++ b/ruoyi-ui/src/views/check/stockCheck/index.vue
@@ -127,14 +127,15 @@
 
     <el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange">
       <el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160" />
-      <el-table-column label="主单ID" align="left" prop="stockCheckId" width="160" />
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName"  width="160"/>
       <el-table-column label="品号" align="left" prop="productId"/><!--品号-->
       <el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
-      <el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
+      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
+      <el-table-column label="计划数量" align="right" prop="quantity"/>
+      <el-table-column label="扫码数量" align="right" prop="scanNum"/>
+      <el-table-column label="实际数量" align="right" prop="assignNum"/>
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
       <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
       <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
       <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
@@ -143,9 +144,7 @@
       <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="quantity"/>
-      <el-table-column label="扫码数量" align="right" prop="scanNum"/>
-      <el-table-column label="实际数量" align="right" prop="assignNum"/>
+
     </el-table>
 
     <pagination
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index 4d73988..60183bc 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -181,16 +181,16 @@
     >
       <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" width="150" />
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
+<!--      <el-table-column label="任务ID" align="left" prop="jobId" width="140" />-->
+<!--      <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" />
+      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
+      <!--      <el-table-column label="批号" align="left" prop="lotNo" />-->
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
       <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
       <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
       <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue
index f63ccf8..ec7114e 100644
--- a/ruoyi-ui/src/views/job/outJobManagement.vue
+++ b/ruoyi-ui/src/views/job/outJobManagement.vue
@@ -180,11 +180,11 @@
       <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="left" prop="spec"/><!--规格-->
       <el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
       <el-table-column label="批次号" align="left" prop="lotNo" />
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
       <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
       <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
       <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index 24ea22c..b717201 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -25,14 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="批次" prop="lotNo"><!-- 库存id -->
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="批次" prop="lotNo">&lt;!&ndash; 库存id &ndash;&gt;-->
+<!--        <el-input-->
+<!--          v-model="queryParams.lotNo"-->
+<!--          placeholder="请输入批次"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="巷道" prop="roadwayId"><!-- 货位id -->
         <el-input
           v-model="queryParams.roadwayId"
@@ -91,14 +91,13 @@
       <el-table-column label="巷道" align="center" prop="roadwayId" sortable/>
       <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/>
       <el-table-column label="入库日期" align="center" prop="inDate" width="160" sortable/>
-      <el-table-column label="批次号" align="center" prop="lotNo"/>
-      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>
-      <el-table-column label="序列号" align="center" prop="trayCode"  width="130" sortable/>
       <el-table-column label="品号" align="center" prop="productId" sortable/>
       <el-table-column label="品名" align="center" prop="productName"/>
-      <el-table-column label="数量" align="center" prop="quantity"/>
       <el-table-column label="规格" align="center" prop="spare1"/>
       <el-table-column label="单位" align="center" prop="spare3"/>
+      <el-table-column label="序列号" align="center" prop="trayCode"  width="130" sortable/>
+      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>
+      <el-table-column label="数量" align="center" prop="quantity"/>
       <el-table-column label="型号" align="center" prop="spare4"/>
       <el-table-column label="颜色" align="center" prop="spare5"/>
       <el-table-column label="序列号" align="center" prop="spare6"/>
@@ -109,7 +108,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>
 
     <pagination