From cd09975b852652be516ba238928e26b60ee6ef40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?=
 <9290821+guowen-the-cat@user.noreply.gitee.com>
Date: Mon, 18 Aug 2025 08:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=91=E7=8E=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasTraycodeFormatServiceImpl.java    |   4 +
 .../bas/cargoSpace/BasCargoSpaceMapper.xml    |   3 +-
 ruoyi-ui/src/lang/zh.js                       |   2 +
 ruoyi-ui/src/views/bas/basCustomer/index.vue  |  56 +++----
 ruoyi-ui/src/views/bas/basSupplier/index.vue  |  52 +++---
 ruoyi-ui/src/views/bas/cargoSpace/index.vue   | 157 +++++++++++++-----
 .../src/views/bas/traycodeFormat/index.vue    |  52 ++++--
 ruoyi-ui/src/views/bas/warehouse/index.vue    |  38 ++++-
 8 files changed, 244 insertions(+), 120 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java
index 70ab885..fa8b00b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java
@@ -64,6 +64,10 @@ public class BasTraycodeFormatServiceImpl implements IBasTraycodeFormatService
     public int insertBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat)
     {
         basTraycodeFormat.setCreateTime(DateUtils.getNowDate());
+        // 设置流水号默认值为0
+        if (basTraycodeFormat.getSerialRule() == null || basTraycodeFormat.getSerialRule().trim().isEmpty()) {
+            basTraycodeFormat.setSerialRule("0");
+        }
         return basTraycodeFormatMapper.insertBasTraycodeFormat(basTraycodeFormat);
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
index dff6a91..1d4db7c 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasCargoSpaceList" resultMap="BasCargoSpaceResult">
         <include refid="selectBasCargoSpaceVo"/>
         <where>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bcs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
             <if test="warehouseId != null  and warehouseId != ''"> and bcs.warehouse_id = #{warehouseId}</if>
             <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
             <if test="cargoAreaId != null  and cargoAreaId != ''"> and bcs.cargo_area_id = #{cargoAreaId}</if>
@@ -68,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="theFloor != null "> and bcs.the_floor = #{theFloor}</if>
             <if test="status != null  and status != ''"> and bcs.status = #{status}</if>
             <if test="locked != null  and locked != ''"> and bcs.locked = #{locked}</if>
-            <if test="trayCode != null  and trayCode != ''"> and bcs.tray_code = #{trayCode}</if>
+            <if test="trayCode != null  and trayCode != ''"> and bcs.tray_code like concat('%', #{trayCode}, '%')</if>
             <if test="cargoHight != null  and cargoHight != ''"> and bcs.cargo_hight = #{cargoHight}</if>
             <if test="issDouble != null  and issDouble != ''"> and bcs.iss_double = #{issDouble}</if>
             <if test="groupCodingNo != null  and groupCodingNo != ''"> and bcs.group_coding_no = #{groupCodingNo}</if>
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index cd65889..fb85ca1 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -1837,6 +1837,8 @@ export default {
     floorIsNull: '层不能为空',
     statusIsNull: '货位状态不能为空',
     lockedIsNull: '是否可用不能为空',
+    cargoSpaceIdIsNull:'货位ID不能为空',
+    cargoSpaceNameIsNull:'货位名称不能为空'
   },
 
   //=====================基础信息:容器管理=====================
diff --git a/ruoyi-ui/src/views/bas/basCustomer/index.vue b/ruoyi-ui/src/views/bas/basCustomer/index.vue
index 24c2473..a56e763 100644
--- a/ruoyi-ui/src/views/bas/basCustomer/index.vue
+++ b/ruoyi-ui/src/views/bas/basCustomer/index.vue
@@ -4,9 +4,9 @@
       <el-form-item :label="$t('basCustomer.customerNo')" prop="customerNo"> <!-- 客户编号 -->
         <el-input v-model="queryParams.customerNo" :placeholder="$t('basCustomer.inputCustomerNo')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('basCustomer.customerGroupNo')" prop="customerGroupNo"> <!-- 客户基本分类 -->
+      <!-- <el-form-item :label="$t('basCustomer.customerGroupNo')" prop="customerGroupNo"> 客户基本分类
         <el-input v-model="queryParams.customerGroupNo" :placeholder="$t('basCustomer.inputCustomerGroupNo')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('basCustomer.customerName')" prop="customerName"> <!-- 客户名称 -->
         <el-input v-model="queryParams.customerName" :placeholder="$t('basCustomer.inputCustomerName')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -23,45 +23,45 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('basCustomer.businessDepartment')" prop="businessDepartment"> <!-- 业务部门 -->
+      <!-- <el-form-item :label="$t('basCustomer.businessDepartment')" prop="businessDepartment"> 业务部门
         <el-input v-model="queryParams.businessDepartment" :placeholder="$t('basCustomer.inputBusinessDepartment')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.salesman')" prop="salesman"> <!-- 业务员 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.salesman')" prop="salesman"> 业务员
         <el-input v-model="queryParams.salesman" :placeholder="$t('basCustomer.inputSalesman')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.mnemonicCode')" prop="mnemonicCode"> <!-- 助忆码 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.mnemonicCode')" prop="mnemonicCode"> 助忆码
         <el-input v-model="queryParams.mnemonicCode" :placeholder="$t('basCustomer.inputMnemonicCode')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.taxpayerRegistrationNumber')" prop="taxpayerRegistrationNumber"> <!-- 纳税人登记号 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.taxpayerRegistrationNumber')" prop="taxpayerRegistrationNumber"> 纳税人登记号
         <el-input v-model="queryParams.taxpayerRegistrationNumber" :placeholder="$t('basCustomer.inputTaxpayerRegistrationNumber')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.organization')" prop="organization"> <!-- 对应财务组织 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.organization')" prop="organization"> 对应财务组织
         <el-input v-model="queryParams.organization" :placeholder="$t('basCustomer.inputOrganization')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.supCustomer')" prop="supCustomer"> <!-- 上级客户 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.supCustomer')" prop="supCustomer"> 上级客户
         <el-input v-model="queryParams.supCustomer" :placeholder="$t('basCustomer.inputSupCustomer')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.retailInvestor')" prop="retailInvestor"> <!-- 散户 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.retailInvestor')" prop="retailInvestor"> 散户
         <el-input v-model="queryParams.retailInvestor" :placeholder="$t('basCustomer.inputRetailInvestor')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.country')" prop="country"> <!-- 国家/地区 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.country')" prop="country"> 国家/地区
         <el-input v-model="queryParams.country" :placeholder="$t('basCustomer.inputCountry')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.timeZone')" prop="timeZone"> <!-- 时区 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.timeZone')" prop="timeZone"> 时区
         <el-input v-model="queryParams.timeZone" :placeholder="$t('basCustomer.inputTimeZone')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.dataFormat')" prop="dataFormat"> <!-- 数据格式 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.dataFormat')" prop="dataFormat"> 数据格式
         <el-input v-model="queryParams.dataFormat" :placeholder="$t('basCustomer.inputDataFormat')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.contactName')" prop="contactName"> <!-- 联系人姓名 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.contactName')" prop="contactName"> 联系人姓名
         <el-input v-model="queryParams.contactName" :placeholder="$t('basCustomer.inputContactName')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.shipment')" prop="shipment"> <!-- 发货国家 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.shipment')" prop="shipment"> 发货国家
         <el-input v-model="queryParams.shipment" :placeholder="$t('basCustomer.inputShipment')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('basCustomer.taxCategory')" prop="taxCategory"> <!-- 税类 -->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('basCustomer.taxCategory')" prop="taxCategory"> 税类
         <el-input v-model="queryParams.taxCategory" :placeholder="$t('basCustomer.inputTaxCategory')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('basCustomer.search')}}</el-button> <!-- 搜索 -->
diff --git a/ruoyi-ui/src/views/bas/basSupplier/index.vue b/ruoyi-ui/src/views/bas/basSupplier/index.vue
index 5533741..926fa94 100644
--- a/ruoyi-ui/src/views/bas/basSupplier/index.vue
+++ b/ruoyi-ui/src/views/bas/basSupplier/index.vue
@@ -9,14 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('BasSupplier.supplierGroupNo')" prop="supplierGroupNo"> <!-- 供应商名称 -->
+      <!-- <el-form-item :label="$t('BasSupplier.supplierGroupNo')" prop="supplierGroupNo"> 供应商名称
         <el-input
           v-model="queryParams.supplierGroupNo"
           :placeholder="$t('BasSupplier.inputSupplierGroupNo')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('BasSupplier.supplierName')" prop="supplierName"> <!-- 供应商名称 -->
         <el-input
           v-model="queryParams.supplierName"
@@ -44,102 +44,102 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('BasSupplier.supplierArae')" prop="supplierArae"> <!-- 地区分类 -->
+      <!-- <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-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-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-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-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-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-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-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-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-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-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-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-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('BasSupplier.search')}}</el-button> <!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('BasSupplier.reset')}}</el-button> <!-- 重置 -->
diff --git a/ruoyi-ui/src/views/bas/cargoSpace/index.vue b/ruoyi-ui/src/views/bas/cargoSpace/index.vue
index ba90ed6..7db87cf 100644
--- a/ruoyi-ui/src/views/bas/cargoSpace/index.vue
+++ b/ruoyi-ui/src/views/bas/cargoSpace/index.vue
@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="labelWidthForSearch">
+      <!-- 货位ID -->
+      <el-form-item :label="$t('cargoSpace.cargoSpaceId')" prop="cargoSpaceId">
+        <el-input
+          v-model="queryParams.cargoSpaceId"
+          :placeholder="$t('cargoSpace.cargoSpaceId')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!-- 仓库ID -->
       <el-form-item :label="$t('cargoSpace.warehouseName')" prop="warehouseId"><!-- 仓库id -->
         <el-select v-model="queryParams.warehouseId" :placeholder="$t('cargoSpace.warehouseName')">
@@ -12,41 +21,41 @@
           />
         </el-select>
       </el-form-item>
-       <el-form-item label="货位名称" prop="cargoSpaceName">
+       <el-form-item :label="$t('cargoSpace.cargoSpaceName')" prop="cargoSpaceName">
         <el-input
           v-model="queryParams.cargoSpaceName"
-          placeholder="请输入货位名称"
+          :placeholder="$t('cargoSpace.cargoSpaceName')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <!-- 排 -->
-      <el-form-item :label="$t('cargoSpace.platoon')" prop="thePlatoon">
+      <!-- <el-form-item :label="$t('cargoSpace.platoon')" prop="thePlatoon">
         <el-input
           v-model="queryParams.thePlatoon"
           :placeholder="$t('cargoSpace.platoon')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 列 -->
-      <el-form-item :label="$t('cargoSpace.column')" prop="theColumn">
+      <!-- <el-form-item :label="$t('cargoSpace.column')" prop="theColumn">
         <el-input
           v-model="queryParams.theColumn"
           :placeholder="$t('cargoSpace.column')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 层 -->
-      <el-form-item :label="$t('cargoSpace.floor')" prop="theFloor">
+      <!-- <el-form-item :label="$t('cargoSpace.floor')" prop="theFloor">
         <el-input
           v-model="queryParams.theFloor"
           :placeholder="$t('cargoSpace.floor')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 货位状态 -->
       <el-form-item :label="$t('cargoSpace.status')" prop="status">
         <el-select v-model="queryParams.status" :placeholder="$t('cargoSpace.status')" clearable>
@@ -78,6 +87,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <!-- 货位高度 -->
+      <!-- <el-form-item :label="$t('cargoSpace.cargoHeight')" prop="cargoHight">
+        <el-input
+          v-model="queryParams.cargoHight"
+          :placeholder="$t('cargoSpace.cargoHeight')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
       <el-form-item>
         <!-- 【查询】按钮 -->
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('cargoSpace.btnSubmit') }}</el-button>
@@ -140,8 +158,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- 货位ID -->
       <el-table-column :label="$t('cargoSpace.cargoSpaceId')" align="left" prop="cargoSpaceId" />
-      <!-- 仓库ID -->
-      <el-table-column :label="$t('cargoSpace.warehouseId')" align="left" prop="warehouseId" />
+      <!-- 仓库名称 -->
+      <el-table-column :label="$t('cargoSpace.warehouseName')" align="left" prop="warehouseName" />
       <!-- 货位名称 -->
       <el-table-column :label="$t('cargoSpace.cargoSpaceName')" align="center" prop="cargoSpaceName" />
       <!-- 排 -->
@@ -201,14 +219,25 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <!-- 货位ID -->
-        <el-form-item :label="$t('cargoSpace.cargoSpaceId')" prop="warehouseId">
-          <el-input v-model="form.warehouseId" :placeholder="$t('cargoSpace.placeholderCargoSpaceId')" />
+        <el-form-item :label="$t('cargoSpace.cargoSpaceId')" prop="cargoSpaceId">
+          <el-input v-model="form.cargoSpaceId" :placeholder="$t('cargoSpace.placeholderCargoSpaceId')" />
         </el-form-item>
-        <!-- 仓库编号 -->
+        <!-- 仓库 -->
+        <el-form-item :label="$t('cargoSpace.warehouseName')" prop="warehouseId">
+          <el-select v-model="form.warehouseId" :placeholder="$t('cargoSpace.warehouseName')">
+            <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="$t('cargoSpace.roadwayId')" prop="roadwayId">
           <el-input v-model="form.roadwayId" :placeholder="$t('cargoSpace.placeholderRoadwayId')" />
         </el-form-item>
-        <!-- 巷道号 -->
+        <!-- 货区编码 -->
         <el-form-item :label="$t('cargoSpace.cargoAreaId')" prop="cargoAreaId">
           <el-input v-model="form.cargoAreaId" :placeholder="$t('cargoSpace.placeholderCargoAreaId')" />
         </el-form-item>
@@ -232,34 +261,37 @@
         <el-form-item :label="$t('cargoSpace.floor')" prop="theFloor">
           <el-input v-model="form.theFloor" :placeholder="$t('cargoSpace.placeholderFloor')" />
         </el-form-item>
+        <!-- 货位状态 -->
+        <el-form-item :label="$t('cargoSpace.status')" prop="status">
+          <el-select v-model="form.status" :placeholder="$t('cargoSpace.status')">
+            <el-option
+              v-for="dict in dict.type.cargo_space_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <!-- 是否锁定 -->
         <el-form-item :label="$t('cargoSpace.locked')" prop="locked">
-          <el-input v-model="form.locked" :placeholder="$t('cargoSpace.placeholderLocked')" />
+          <el-select v-model="form.locked" :placeholder="$t('cargoSpace.locked')">
+            <el-option
+              v-for="dict in dict.type.cargo_space_lock_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <!-- 托盘编码 -->
         <el-form-item :label="$t('cargoSpace.trayCode')" prop="trayCode">
           <el-input v-model="form.trayCode" :placeholder="$t('cargoSpace.placeholderTrayCode')" />
         </el-form-item>
-        <!-- 是否双伸 -->
-        <el-form-item :label="$t('cargoSpace.isDouble')" prop="issDouble">
-          <el-input v-model="form.issDouble" :placeholder="$t('cargoSpace.placeholderIsDouble')" />
-        </el-form-item>
-        <!-- 双货位分组编码 -->
-        <el-form-item :label="$t('cargoSpace.groupCodingNo')" prop="groupCodingNo">
-          <el-input v-model="form.groupCodingNo" :placeholder="$t('cargoSpace.placeholderGroupCodingNo')" />
-        </el-form-item>
-        <!-- 双货位分组编码名称1、2… -->
-        <el-form-item :label="$t('cargoSpace.groupCodingName')" prop="groupCoding">
-          <el-input v-model="form.groupCoding" :placeholder="$t('cargoSpace.placeholderGroupCodingName')" />
-        </el-form-item>
-        <!-- 双货位标识 0 外1内 -->
-        <el-form-item :label="$t('cargoSpace.cargoSpaceLogo')" prop="cargoSpaceLogo">
-          <el-input v-model="form.cargoSpaceLogo" :placeholder="$t('cargoSpace.placeholderCargoSpaceLogo')" />
-        </el-form-item>
-        <!-- 本仓库区域 1--8 A 9--15 B -->
-        <el-form-item :label="$t('cargoSpace.thisCargoAreaId')" prop="thisCargoArea">
-          <el-input v-model="form.thisCargoArea" :placeholder="$t('cargoSpace.placeholderThisCargoAreaId')" />
+        <!-- 货位高度 -->
+        <el-form-item :label="$t('cargoSpace.cargoHeight')" prop="cargoHight">
+          <el-input v-model="form.cargoHight" :placeholder="$t('cargoSpace.cargoHeight')" />
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- 二级窗口---【确定】按钮 -->
@@ -309,6 +341,7 @@ export default {
         theType: null,
         theTypeName: null,
         cargoSpaceName: null,
+        cargoSpaceId: null,
         thePlatoon: null,
         theColumn: null,
         theFloor: null,
@@ -326,9 +359,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        cargoSpaceId: [
+          //  校验---货位ID是否为空
+          { required: true, message: this.$t('cargoSpace.cargoSpaceIdIsNull'), trigger: "blur" }
+        ],
         warehouseId: [
-          //  校验---仓库编号是否为空
-          { required: true, message: this.$t('cargoSpace.warehosueIdIsNull'), trigger: "blur" }
+          //  校验---仓库是否为空
+          { required: true, message: this.$t('cargoSpace.warehosueIdIsNull'), trigger: "change" }
+        ],
+        cargoSpaceName: [
+          // 校验---货位名称是否为空
+          { required: true, message: this.$t('cargoSpace.cargoSpaceNameIsNull'), trigger: "blur" }
         ],
         thePlatoon: [
           // 校验---排是否为空
@@ -348,7 +389,7 @@ export default {
         ],
         locked: [
           // 校验---锁定状态是否为空
-          { required: true, message: this.$t('cargoSpace.lockedIsNull'), trigger: "blur" }
+          { required: true, message: this.$t('cargoSpace.lockedIsNull'), trigger: "change" }
         ],
       }
     }
@@ -439,13 +480,36 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.cargoSpaceId != null) {
-            updateCargoSpace(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('cargoSpace.editSuccessInfo'))
-              this.open = false
-              this.getList()
+          // 检查cargoSpaceId是否存在且不为空
+          if (this.form.cargoSpaceId && this.form.cargoSpaceId.trim() !== '') {
+            // 检查数据库中是否存在该ID的记录
+            getCargoSpace(this.form.cargoSpaceId).then(response => {
+              // 检查返回的数据是否为null或空对象
+              if (response.data && response.data.cargoSpaceId) {
+                // 如果能获取到有效数据，说明记录存在，调用修改方法
+                updateCargoSpace(this.form).then(response => {
+                  this.$modal.msgSuccess(this.$t('cargoSpace.editSuccessInfo'))
+                  this.open = false
+                  this.getList()
+                })
+              } else {
+                // 如果返回数据为空，说明记录不存在，调用新增方法
+                addCargoSpace(this.form).then(response => {
+                  this.$modal.msgSuccess(this.$t('cargoSpace.addSuccessInfo'))
+                  this.open = false
+                  this.getList()
+                })
+              }
+            }).catch(() => {
+              // 如果请求失败，调用新增方法
+              addCargoSpace(this.form).then(response => {
+                this.$modal.msgSuccess(this.$t('cargoSpace.addSuccessInfo'))
+                this.open = false
+                this.getList()
+              })
             })
           } else {
+            // 如果cargoSpaceId为空，直接调用新增方法
             addCargoSpace(this.form).then(response => {
               this.$modal.msgSuccess(this.$t('cargoSpace.addSuccessInfo'))
               this.open = false
@@ -472,7 +536,7 @@ export default {
       }, `cargoSpace_${new Date().getTime()}.xlsx`)
     }
   },
-  comped: {
+  computed: {
     labelWidthForSearch() {
         const lang = this.$i18n.locale;
         return lang.startsWith('en') ? '84px' : '68px';
@@ -484,3 +548,10 @@ export default {
   },
 }
 </script>
+<style scoped>
+/* 统一表单控件宽度 */
+.el-select,
+.el-input {
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/bas/traycodeFormat/index.vue b/ruoyi-ui/src/views/bas/traycodeFormat/index.vue
index cc55ced..0b40ec3 100644
--- a/ruoyi-ui/src/views/bas/traycodeFormat/index.vue
+++ b/ruoyi-ui/src/views/bas/traycodeFormat/index.vue
@@ -17,14 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('traycodeFormat.serialExample')" prop="serialExample">
+      <!-- <el-form-item :label="$t('traycodeFormat.serialExample')" prop="serialExample">
         <el-input
           v-model="queryParams.serialExample"
           :placeholder="$t('traycodeFormat.placeholder.serialExample')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('traycodeFormat.remarks')" prop="remarks">
         <el-input
           v-model="queryParams.remarks"
@@ -49,30 +49,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('traycodeFormat.spare1')" prop="spare1">
+      <!-- <el-form-item :label="$t('traycodeFormat.spare1')" prop="spare1">
         <el-input
           v-model="queryParams.spare1"
           :placeholder="$t('traycodeFormat.placeholder.spare1')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item :label="$t('traycodeFormat.spare2')" prop="spare2">
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('traycodeFormat.spare2')" prop="spare2">
         <el-input
           v-model="queryParams.spare2"
           :placeholder="$t('traycodeFormat.placeholder.spare2')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item :label="$t('traycodeFormat.spare3')" prop="spare3">
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('traycodeFormat.spare3')" prop="spare3">
         <el-input
           v-model="queryParams.spare3"
           :placeholder="$t('traycodeFormat.placeholder.spare3')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('traycodeFormat.search') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('traycodeFormat.reset') }}</el-button>
@@ -146,8 +146,8 @@
       <el-table-column :label="$t('traycodeFormat.minNum')" align="center" prop="minNum" />
       <el-table-column :label="$t('traycodeFormat.maxNum')" align="center" prop="maxNum" />
       <el-table-column :label="$t('traycodeFormat.spare1')" align="center" prop="spare1" />
-      <el-table-column :label="$t('traycodeFormat.spare2')" align="center" prop="spare2" />
-      <el-table-column :label="$t('traycodeFormat.spare3')" align="center" prop="spare3" />
+      <!-- <el-table-column :label="$t('traycodeFormat.spare2')" align="center" prop="spare2" /> -->
+      <!-- <el-table-column :label="$t('traycodeFormat.spare3')" align="center" prop="spare3" /> -->
       <el-table-column :label="$t('traycodeFormat.operation')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -200,12 +200,12 @@
         <el-form-item :label="$t('traycodeFormat.spare1')" prop="spare1">
           <el-input v-model="form.spare1" :placeholder="$t('traycodeFormat.placeholder.spare1')" />
         </el-form-item>
-        <el-form-item :label="$t('traycodeFormat.spare2')" prop="spare2">
+        <!-- <el-form-item :label="$t('traycodeFormat.spare2')" prop="spare2">
           <el-input v-model="form.spare2" :placeholder="$t('traycodeFormat.placeholder.spare2')" />
-        </el-form-item>
-        <el-form-item :label="$t('traycodeFormat.spare3')" prop="spare3">
+        </el-form-item> -->
+        <!-- <el-form-item :label="$t('traycodeFormat.spare3')" prop="spare3">
           <el-input v-model="form.spare3" :placeholder="$t('traycodeFormat.placeholder.spare3')" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('traycodeFormat.confirm') }}</el-button>
@@ -270,6 +270,18 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        barcodeFormat: [
+          { required: true, message: this.$t('traycodeFormat.placeholder.barcodeFormat'), trigger: "blur" }
+        ],
+        remarks: [
+          { required: true, message: this.$t('traycodeFormat.placeholder.remarks'), trigger: "blur" }
+        ],
+        minNum: [
+          { required: true, message: this.$t('traycodeFormat.placeholder.minNum'), trigger: "blur" }
+        ],
+        maxNum: [
+          { required: true, message: this.$t('traycodeFormat.placeholder.maxNum'), trigger: "blur" }
+        ]
       },
       // 打印对话框显示状态
       printDialogVisible: false,
@@ -423,3 +435,15 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+/* 统一表单控件宽度 */
+.el-select,
+.el-input {
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/bas/warehouse/index.vue b/ruoyi-ui/src/views/bas/warehouse/index.vue
index 1edf4ae..2024e3d 100644
--- a/ruoyi-ui/src/views/bas/warehouse/index.vue
+++ b/ruoyi-ui/src/views/bas/warehouse/index.vue
@@ -30,32 +30,34 @@
         />
       </el-form-item>
       <!-- 仓库地址 -->
-      <el-form-item :label="$t('warehouse.address')" prop="address">
+      <!-- <el-form-item :label="$t('warehouse.address')" prop="address">
         <el-input
           v-model="queryParams.address"
           :placeholder="$t('warehouse.placeholderAddress')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 备注 -->
-      <el-form-item :label="$t('warehouse.cDesc')" prop="cDesc">
+      <!-- <el-form-item :label="$t('warehouse.cDesc')" prop="cDesc">
         <el-input
           v-model="queryParams.cDesc"
           :placeholder="$t('warehouse.placeholderCDesc')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 仓库级别 -->
-      <el-form-item :label="$t('warehouse.warehouseKind')" prop="warehouseKind">
+      <!-- <el-form-item :label="$t('warehouse.warehouseKind')" prop="warehouseKind">
         <el-input
           v-model="queryParams.warehouseKind"
           :placeholder="$t('warehouse.placeholderWarehouseKind')"
           clearable
+          maxlength="2"
+          show-word-limit
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 仓库是否可用 -->
       <el-form-item :label="$t('warehouse.isCurrent')" prop="isCurrent">
         <el-select v-model="queryParams.isCurrent" :placeholder="$t('warehouse.placeholderIsCurrent')" clearable>
@@ -225,7 +227,23 @@
         </el-form-item>
         <!-- 仓库级别 -->
         <el-form-item :label="$t('warehouse.warehouseKind')" prop="warehouseKind">
-          <el-input v-model="form.warehouseKind" :placeholder="$t('warehouse.placeholderWarehouseKind')" />
+          <el-input 
+            v-model="form.warehouseKind" 
+            :placeholder="$t('warehouse.placeholderWarehouseKind')" 
+            maxlength="2"
+            show-word-limit
+          />
+        </el-form-item>
+        <!-- 仓库类型 -->
+        <el-form-item :label="$t('warehouse.warehouseType')" prop="warehouseType">
+          <el-select v-model="form.warehouseType" :placeholder="$t('warehouse.placeholderWarehouseType')">
+            <el-option
+              v-for="dict in dict.type.warehouse_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <!-- 仓库是否可用 -->
         <el-form-item :label="$t('warehouse.isCurrent')" prop="isCurrent">
@@ -308,6 +326,10 @@ export default {
         isCurrent: [
           // 校验---仓库是否可用选项是否为空
           { required: true, message: this.$t('warehouse.isCurrentIsNull'), trigger: "change" }
+        ],
+        warehouseKind: [
+          // 校验---仓库级别长度限制
+          { max: 2, message: "仓库级别不能超过2个字符", trigger: "blur" }
         ]
       },
 
@@ -346,7 +368,7 @@ export default {
         projectNo: null,
         warehouseName: null,
         address: null,
-        cDesc: null,
+        cdesc: null,
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null