diff --git a/admin/src/api/ckbillnumber.js b/admin/src/api/ckbillnumber.js
new file mode 100644
index 0000000..dbb497d
--- /dev/null
+++ b/admin/src/api/ckbillnumber.js
@@ -0,0 +1,70 @@
+
+import request from '@/utils/request'
+
+/**
+ * 新增ckbillnumber
+ * @param pram
+ */
+export function ckbillnumberCreateApi(data) {
+    return request({
+        url: `autogencode/ckbillnumber/save`,
+        method: 'POST',
+        data
+    })
+}
+
+/**
+ * ckbillnumber更新
+ * @param pram
+ */
+export function ckbillnumberUpdateApi(data) {
+    return request({
+        url: `autogencode/ckbillnumber/update`,
+        method: 'POST',
+        data
+    })
+}
+
+/**
+ * ckbillnumber详情
+ * @param pram
+ */
+export function ckbillnumberDetailApi(id) {
+    return request({
+        url: `autogencode/ckbillnumber/info/${id}`,
+        method: 'GET'
+    })
+}
+
+export function getBillNumber(billPrefix) {
+  return request({
+    url: 'autogencode/ckbillnumber/getBillNo/' + billPrefix,
+    method: 'get'
+  })
+}
+
+/**
+ * ckbillnumber批量删除
+ * @param ids
+ */
+export function ckbillnumberDeleteApi(ids) {
+    return request({
+        url: `autogencode/ckbillnumber/delete`,
+        method: 'POST',
+        data: ids
+    })
+}
+
+
+/**
+ * ckbillnumber列表
+ * @param pram
+ */
+export function ckbillnumberListApi(params) {
+    return request({
+        url: `autogencode/ckbillnumber/list`,
+        method: 'GET',
+        params
+    })
+}
+
diff --git a/admin/src/api/cmcust.js b/admin/src/api/cmcust.js
index f6bc494..c4c9f96 100644
--- a/admin/src/api/cmcust.js
+++ b/admin/src/api/cmcust.js
@@ -74,3 +74,16 @@ export function cmcustListApi(params) {
     })
 }
 
+/**
+ * cmcust列表
+ * @param pram
+ */
+export function cmcustListByAll(params) {
+  return request({
+    url: `autogencode/cmcust/listByAll`,
+    method: 'GET',
+    params
+  })
+}
+
+
diff --git a/admin/src/api/cmcustproduct.js b/admin/src/api/cmcustproduct.js
index ba0e5dd..5f305e3 100644
--- a/admin/src/api/cmcustproduct.js
+++ b/admin/src/api/cmcustproduct.js
@@ -62,6 +62,18 @@ export function cmcustproductListApi(params) {
     })
 }
 
+/**
+ * cmcustproduct列表
+ * @param pram
+ */
+export function cmcustproductListByAll(params) {
+  return request({
+    url: `autogencode/cmcustproduct/listByAll`,
+    method: 'GET',
+    params
+  })
+}
+
 /**
  * cmcustproduct批量上架
  * @param ids
diff --git a/admin/src/api/cmshelf.js b/admin/src/api/cmshelf.js
index 8aa5cc7..0bb4fb7 100644
--- a/admin/src/api/cmshelf.js
+++ b/admin/src/api/cmshelf.js
@@ -61,3 +61,15 @@ export function cmshelfListApi(params) {
     })
 }
 
+/**
+ * cmshelf列表
+ * @param pram
+ */
+export function cmshelfListByAll(params) {
+  return request({
+    url: `autogencode/cmshelf/listByAll`,
+    method: 'GET',
+    params
+  })
+}
+
diff --git a/admin/src/api/cmstoragelocation.js b/admin/src/api/cmstoragelocation.js
index 9d765a7..1d9b33f 100644
--- a/admin/src/api/cmstoragelocation.js
+++ b/admin/src/api/cmstoragelocation.js
@@ -61,3 +61,14 @@ export function cmstoragelocationListApi(params) {
     })
 }
 
+/**
+ * cmstoragelocation列表
+ * @param pram
+ */
+export function cmstoragelocationListByAll(params) {
+  return request({
+    url: `autogencode/cmstoragelocation/listByAll`,
+    method: 'GET',
+    params
+  })
+}
diff --git a/admin/src/components/BillNumberInput/index.vue b/admin/src/components/BillNumberInput/index.vue
index 60e93e2..de806bf 100644
--- a/admin/src/components/BillNumberInput/index.vue
+++ b/admin/src/components/BillNumberInput/index.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { getBillNumber } from "@/api/ckbill";
+import { getBillNumber } from "@/api/ckbillnumber";
 export default {
   name: 'BillNumberInput',
   props: {
@@ -46,9 +46,9 @@ export default {
       return new Promise((resolve, reject) => {
         getBillNumber(type || this.type).then(res => {
           this.loading = false;
-          if (res.data) {
-            this.$emit('input', res.data);
-            resolve(res.data);
+          if (res) {
+            this.$emit('input', res);
+            resolve(res);
           } else {
             reject();
           }
@@ -67,4 +67,4 @@ export default {
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue b/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue
index e95bb55..89dadc0 100644
--- a/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue
+++ b/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue
@@ -16,15 +16,15 @@
                 <el-form-item v-else prop="cargoId" class="margin-none">
                   <el-select v-model="scope.row.cargoId" filterable placeholder="请输入货物名称或商品序号" style="width: 100%" clearable
                              @change="setCargoDetail($event, scope.row)">
-                    <el-option v-for="item in cargoList" :key="item.gdsSeqno" :label="item.cargoName + ' (' + item.gdsSeqno + ')'" :value="item.id" >
-                      <span>{{ item.cargoName }} ({{ item.gdsSeqno }})</span>
+                    <el-option v-for="item in cargoList" :key="item.gdsSeqno" :label="item.goodsName + ' (' + item.goodsCode + ')'" :value="item.id" >
+                      <span>{{ item.goodsName }} ({{ item.goodsCode }})</span>
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">HS编号</template>
-                <div class="nomal-text">{{ scope.row.hsCode }}</div>
+                <div class="nomal-text">{{ scope.row.goodsCode }}</div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">仓库名称<rq></rq></template>
@@ -52,7 +52,7 @@
                 <el-form-item v-else prop="locationId" class="margin-none">
                   <el-select v-model="scope.row.locationId" filterable placeholder="请选择货位" style="width: 100%" clearable
                              @change="onLocationChange($event, scope.row)">
-                    <el-option v-for="item in locationList" :key="item.id" :label="item.locationName" :value="item.id" />
+                    <el-option v-for="item in locationList" :key="item.id" :label="item.storageLocationName" :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-descriptions-item>
@@ -82,7 +82,7 @@
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>
-                <template slot="label">第一计量单位<rq/></template>
+                <template slot="label">第一计量单位</template>
                 <div v-if="tableReadonly" class="nomal-text">
                   <dict-tag :options="dict.type.bm_measuring_unit" :value="scope.row.firstUnit"></dict-tag>
                 </div>
@@ -95,35 +95,35 @@
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>
-                <template slot="label">货物自然序号<rq></rq></template>
+                <template slot="label">货物自然序号</template>
                 <div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoNumber }}</div>
                 <el-form-item v-else prop="cargoNumber" class="margin-none">
                   <el-input v-model="scope.row.cargoNumber" placeholder="请输入货物自然序号" />
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>
-                <template slot="label">商品料号<rq></rq></template>
+                <template slot="label">商品料号</template>
                 <div v-if="tableReadonly" class="nomal-text">{{ scope.row.itemNumber }}</div>
                 <el-form-item v-else prop="itemNumber" class="margin-none">
                   <el-input v-model="scope.row.itemNumber" placeholder="请输入商品料号" />
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>
-                <template slot="label">电子账册项号<rq></rq></template>
+                <template slot="label">电子账册项号</template>
                 <div v-if="tableReadonly" class="nomal-text">{{ scope.row.bookNumber }}</div>
                 <el-form-item v-else prop="bookNumber" class="margin-none">
                   <el-input v-model="scope.row.bookNumber" placeholder="请输入电子账册项号" />
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>
-                <template slot="label">报关单号<rq></rq></template>
+                <template slot="label">报关单号</template>
                 <div v-if="tableReadonly" class="nomal-text">{{ scope.row.customsNo }}</div>
                 <el-form-item v-else prop="customsNo" class="margin-none">
                   <el-input v-model="scope.row.customsNo" placeholder="请输入报关单号" />
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>
-                <template slot="label">核注清单号<rq></rq></template>
+                <template slot="label">核注清单号</template>
                 <div v-if="tableReadonly" class="nomal-text">{{ scope.row.listNumber }}</div>
                 <el-form-item v-else prop="listNumber" class="margin-none">
                   <el-input v-model="scope.row.listNumber" placeholder="请输入核注清单号" />
@@ -185,8 +185,8 @@
                 <template slot="label">有效期至<rq></rq></template>
                 <div v-if="tableReadonly" class="nomal-text">{{ scope.row.expiryDate }}</div>
                 <el-form-item v-else prop="expiryDate" class="margin-none">
-                  <el-date-picker clearable v-model="scope.row.expiryDate" style="width: 100%" type="date"
-                    value-format="yyyy-MM-dd" placeholder="请选择有效期至">
+                  <el-date-picker clearable v-model="scope.row.expiryDate" style="width: 100%" type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择有效期至">
                   </el-date-picker>
                 </el-form-item>
               </el-descriptions-item>
@@ -271,11 +271,11 @@
 </template>
 
 <script>
-import { cmcustproductListApi as listCargo } from '@/api/cmcustproduct.js'
-import { cmcustListApi as listCust } from "@/api/cmcust";
+import { cmcustproductListByAll as listCargo } from '@/api/cmcustproduct.js'
+import { cmcustListByAll as listCust } from "@/api/cmcust";
 import { listWarehouse } from "@/api/cmwarehouse";
-import { cmshelfListApi as listShelf } from "@/api/cmshelf";
-import { cmlocationListApi as listLocation } from "@/api/cmstoragelocation";
+import { cmshelfListByAll as listShelf } from "@/api/cmshelf";
+import { cmstoragelocationListByAll as listLocation } from "@/api/cmstoragelocation";
 import { ckbillDetailApi as getCkbillInfo, putBill } from '@/api/ckbill';
 import { ckbillcargoDeleteApi as delCkcargo, recallPutBill } from '@/api/ckbillcargo';
 // import { listVessel } from "@/api/jxc/vessel";
@@ -303,18 +303,18 @@ export default {
         cargoValue: [
           { required: true, message: "货物价值不能为空", trigger: "blur" }
         ],
-        cargoNumber: [
-          { required: true, message: "货物自然序号不能为空", trigger: "blur" }
-        ],
-        expiryDate: [
-          { required: true, message: "货物过期时间不能为空", trigger: "blur" }
-        ],
-        itemNumber: [
-          { required: true, message: "商品料号不能为空", trigger: "blur" }
-        ],
-        bookNumber: [
-          { required: true, message: "电子账册项号不能为空", trigger: "blur" }
-        ],
+        // cargoNumber: [
+        //   { required: true, message: "货物自然序号不能为空", trigger: "blur" }
+        // ],
+        // expiryDate: [
+        //   { required: true, message: "货物过期时间不能为空", trigger: "blur" }
+        // ],
+        // itemNumber: [
+        //   { required: true, message: "商品料号不能为空", trigger: "blur" }
+        // ],
+        // bookNumber: [
+        //   { required: true, message: "电子账册项号不能为空", trigger: "blur" }
+        // ],
         // customsNo: [
         //   { required: true, message: "报关单号不能为空", trigger: "blur" }
         // ],
@@ -339,15 +339,15 @@ export default {
         cargoId: [
           { required: true, message: "货物不能为空", trigger: "change" }
         ],
-        cargoWt: [
-          { required: true, message: '货物重量不能为空', trigger: 'blur' }
-        ],
-        cargoNum: [
-          { required: true, message: '货物件数不能为空', trigger: 'blur' }
-        ],
-        cargoVol: [
-          { required: true, message: '货物体积不能为空', trigger: 'blur' }
-        ],
+        // cargoWt: [
+        //   { required: true, message: '货物重量不能为空', trigger: 'blur' }
+        // ],
+        // cargoNum: [
+        //   { required: true, message: '货物件数不能为空', trigger: 'blur' }
+        // ],
+        // cargoVol: [
+        //   { required: true, message: '货物体积不能为空', trigger: 'blur' }
+        // ],
         // cargoWt: [
         //   { validator: valueValid, trigger: "change" }
         // ],
@@ -558,6 +558,7 @@ export default {
           val.custId = this.form.custId;
           val.custName = this.form.custName;
           val.custCode = this.form.custCode;
+          val.inStockId = val.stockId; // 设置inStockId为stockId，确保后端能够正确获取到CmWarehouse中的id
         });
         const params = { ...this.form };
         // 1入库 2出库
@@ -672,7 +673,7 @@ export default {
     // 获取货物
     getCargoList() {
       listCargo({}).then(response => {
-        this.cargoList = response.data;
+        this.cargoList = response;
       }).catch(e => {
       });
     },
@@ -681,7 +682,7 @@ export default {
       this.cargoList.forEach(ele => {
         if (ele.id == cargoId) {
           form.cargoName = ele.cargoName;
-          form.hsCode = ele.hsCode;
+          form.goodsCode = ele.goodsCode;
           form.cargoSpec = ele.cargoSpec;
           form.originCountry = ele.originCountry;
         }
@@ -698,15 +699,16 @@ export default {
     },
     // 获取客户
     getCustList() {
-      listCust({custBelong:1}).then(response => {
-        this.custList = response.data;
+      // {custBelong:1}
+      listCust().then(response => {
+        this.custList = response;
       }).catch(e => {
       });
     },
     // 获取仓库列表
     getWarehouseList() {
       listWarehouse({}).then(response => {
-        this.warehouseList = response.data || [];
+        this.warehouseList = response || [];
       }).catch(e => {
         console.error('获取仓库列表失败:', e);
         this.warehouseList = [];
@@ -715,7 +717,7 @@ export default {
     // 获取货架列表
     getShelfList(warehouseId) {
       listShelf({ warehouseId }).then(response => {
-        this.shelfList = response.data || [];
+        this.shelfList = response || [];
       }).catch(e => {
         console.error('获取货架列表失败:', e);
         this.shelfList = [];
@@ -724,7 +726,7 @@ export default {
     // 获取货位列表
     getLocationList(shelfId) {
       listLocation({ shelfId }).then(response => {
-        this.locationList = response.data || [];
+        this.locationList = response || [];
       }).catch(e => {
         console.error('获取货位列表失败:', e);
         this.locationList = [];
@@ -742,8 +744,10 @@ export default {
       const warehouse = this.warehouseList.find(item => item.stockCode === stockCode);
       if (warehouse) {
         row.stockName = warehouse.stockName;
+        row.stockId = warehouse.id; // 设置仓库ID，确保后端能够找到对应的仓库对象
         this.getShelfList(warehouse.id);
       } else {
+        row.stockId = ''; // 清空仓库ID
         this.shelfList = [];
         this.locationList = [];
       }
@@ -771,7 +775,7 @@ export default {
         // 查找货位对象获取货位名称
         const location = this.locationList.find(item => item.id === locationId);
         if (location) {
-          row.locationName = location.locationName;
+          row.locationName = location.storageLocationName;
         }
       } else {
         row.locationName = '';
diff --git a/admin/src/views/ck/ckwarehouse/components/BillList/index.vue b/admin/src/views/ck/ckwarehouse/components/BillList/index.vue
index 9bdd73b..613cb0a 100644
--- a/admin/src/views/ck/ckwarehouse/components/BillList/index.vue
+++ b/admin/src/views/ck/ckwarehouse/components/BillList/index.vue
@@ -30,7 +30,7 @@
       </el-table-column>
     </el-table>
     <el-pagination class="margin-top10" style="float: right;" layout="prev, pager, next, jumper" :total="total" small
-      hide-on-single-page :current-page.sync="queryParams.pageNum" :page-size.sync="queryParams.pageSize"
+      :current-page.sync="queryParams.pageNum" :page-size.sync="queryParams.pageSize"
       @current-change="getList" />
   </div>
 </template>
@@ -90,7 +90,8 @@ export default {
         ...this.queryParams,
         ...this.params
       }).then(response => {
-        this.list = response.rows || [];
+
+        this.list = response.list || [];
         this.total = response.total;
         this.loading = false;
 
diff --git a/admin/src/views/ck/ckwarehouse/index.vue b/admin/src/views/ck/ckwarehouse/index.vue
index f221b35..a302e9b 100644
--- a/admin/src/views/ck/ckwarehouse/index.vue
+++ b/admin/src/views/ck/ckwarehouse/index.vue
@@ -132,7 +132,7 @@ import {
 import BillList from '@/views/ck/ckwarehouse/components/BillList';
 import BillEdit from '@/views/ck/ckwarehouse/components/BillEdit';
 import {  listWarehouse } from "@/api/cmwarehouse";
-import { ckbillListApi as delCkbill} from "@/api/ckbill";
+import { ckbillDeleteApi as delCkbill} from "@/api/ckbill";
 // import { listVessel } from "@/api/jxc/vessel";
 
 export default {
@@ -318,7 +318,7 @@ export default {
     getList() {
       this.loading = true;
       pageListCkcargo(this.queryParams).then(response => {
-        this.ckcargoList = response.rows;
+        this.ckcargoList = response.list;
         this.total = response.total;
         this.loading = false;
       }).catch(e => {
@@ -371,7 +371,8 @@ export default {
     },
     handleDel() {
       if (this.selectedBill.billStatus == '0') {
-        const ids = this.selectedBill.id || this.ids;
+        // 确保ids是一个数组
+        const ids = this.selectedBill.id ? [this.selectedBill.id] : this.ids;
         this.$modal.confirm('是否确认删除"' + this.selectedBill.billNumber+ '"的入库单据？').then(function() {
           return delCkbill(ids);
         }).then(() => {
@@ -387,7 +388,11 @@ export default {
       if (type === 'bill') {
         this.open = true;
         this.$nextTick(() => {
-          this.$refs.billEdit.open({ type: 1 });
+          if (this.$refs.billEdit) {
+            this.$refs.billEdit.open({ type: 1 });
+          } else {
+            console.error('BillEdit component not found');
+          }
         })
         return;
       }
@@ -399,14 +404,22 @@ export default {
         }).then(() => {
           this.open = true;
           this.$nextTick(() => {
-            this.$refs.billEdit.open({ type: 1 });
+            if (this.$refs.billEdit) {
+              this.$refs.billEdit.open({ type: 1 });
+            } else {
+              console.error('BillEdit component not found');
+            }
           })
         });
         return;
       }
       this.open = true;
       this.$nextTick(() => {
-        this.$refs.billEdit.open({ type: 1, data: this.selectedBill });
+        if (this.$refs.billEdit) {
+          this.$refs.billEdit.open({ type: 1, data: this.selectedBill });
+        } else {
+          console.error('BillEdit component not found');
+        }
       })
     },
     backBill() {
@@ -456,7 +469,11 @@ export default {
       this.title = "修改";
       this.open = true;
       this.$nextTick(() => {
-        this.$refs.billEdit.open({ type: 0, data: row });
+        if (this.$refs.billEdit) {
+          this.$refs.billEdit.open({ type: 0, data: row });
+        } else {
+          console.error('BillEdit component not found');
+        }
       })
     },
     showDetail(row) {
@@ -464,7 +481,15 @@ export default {
       this.title = "查看";
       this.open = true;
       this.$nextTick(() => {
-        this.$refs.billEdit.open({ type: 2, data: row.id ? row : this.modifyData });
+        console.log(row.id)
+        if (this.$refs.billEdit) {
+          // 确保row对象包含billId属性
+          const data = row.id ? row : this.modifyData;
+          console.log(data)
+          this.$refs.billEdit.open({ type: 2, data: data });
+        } else {
+          console.error('BillEdit component not found');
+        }
       })
     },
 
diff --git a/admin/src/views/cm/meeting/room/cmmeetingroom-add-and-update.vue b/admin/src/views/cm/meeting/room/cmmeetingroom-add-and-update.vue
index 9d3609c..bede99a 100644
--- a/admin/src/views/cm/meeting/room/cmmeetingroom-add-and-update.vue
+++ b/admin/src/views/cm/meeting/room/cmmeetingroom-add-and-update.vue
@@ -45,12 +45,30 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="座位布局类型" prop="seatLayout">
-            <el-input v-model="dataForm.seatLayout" placeholder="座位布局类型"></el-input>
+            <el-select v-model="dataForm.seatLayout" placeholder="请选择座位布局类型" :style="{ width: '100%' }">
+              <el-option v-if="!dict.type.seat_layout" label="无数据" value="" disabled/>
+              <el-option
+                v-else
+                v-for="dict in dict.type.seat_layout"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="配套设备" prop="equipmentConfig">
-            <el-input v-model="dataForm.equipmentConfig" placeholder="配套设备"></el-input>
+            <el-select v-model="dataForm.equipmentConfig" placeholder="请选择配套设备" :style="{ width: '100%' }" multiple>
+              <el-option v-if="!dict.type.equipment_config" label="无数据" value="" disabled/>
+              <el-option
+                v-else
+                v-for="dict in dict.type.equipment_config"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -62,25 +80,46 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="可预约时间段" prop="reserveTimeRange">
-            <el-input v-model="dataForm.reserveTimeRange" placeholder="可预约时间段"></el-input>
+            <el-time-picker
+              v-model="dataForm.reserveTimeRange"
+              is-range
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              value-format="HH:mm"
+              format="HH:mm"
+              style="width: 100%">
+            </el-time-picker>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="会议室状态" prop="roomStatus">
-            <el-input v-model="dataForm.roomStatus" placeholder="会议室状态"></el-input>
+            <el-select v-model="dataForm.roomStatus" placeholder="请选择会议室状态" :style="{ width: '100%' }">
+              <el-option v-if="!dict.type.room_status" label="无数据" value="" disabled/>
+              <el-option
+                v-else
+                v-for="dict in dict.type.room_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="文件id" prop="fileId">
-        <el-input v-model="dataForm.fileId" placeholder="文件id"></el-input>
+      <el-form-item label="会议室照片" prop="fileId">
+        <FileUploadVO
+          :value="roomFiles"
+          @input="updateRoomFiles"
+        ></FileUploadVO>
       </el-form-item>
       <el-form-item label="会议室描述" prop="description">
-        <el-input v-model="dataForm.description" placeholder="会议室描述"></el-input>
+        <el-input v-model="dataForm.description" placeholder="会议室描述"  type="textarea" :rows="3"></el-input>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+        <el-input v-model="dataForm.remark" placeholder="备注"  type="textarea" :rows="3"></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -92,11 +131,16 @@
 
 <script>
   import * as api from '@/api/cmmeetingroom.js'
+  import FileUploadVO from '@/components/FileUploadVO/index.vue'
   export default {
-    dicts: ['room_status','seat_layout'],
+    components: {
+      FileUploadVO
+    },
+    dicts: ['room_status','seat_layout','equipment_config'],
     data () {
       return {
         visible: false,
+        roomFiles: [], // 会议室文件列表
         dataForm: {
           id: 0,
           roomName: '' ,
@@ -106,13 +150,14 @@
           fixedSeats: '' ,
           movableSeats: '' ,
           seatLayout: '' ,
-          equipmentConfig: '' ,
+          equipmentConfig: [] ,
           chargeStandard: '' ,
-          reserveTimeRange: '' ,
+          reserveTimeRange: null ,
           fileId: '' ,
           roomStatus: '' ,
           description: '' ,
           remark: '' ,
+          files: []
         },
         dataRule: {
           roomName: [
@@ -161,6 +206,46 @@
       }
     },
     methods: {
+      // 更新会议室文件列表
+      updateRoomFiles(files) {
+        this.roomFiles = files
+        if (files && files.length > 0) {
+          this.dataForm.files = files.map(file => {
+            let attDir = file.attDir || file.attachFileUrl || ''
+            if (attDir.startsWith('/file/public/')) {
+              attDir = attDir.replace('/file/public/', '')
+            } else if (attDir.startsWith('/file/')) {
+              attDir = attDir.replace('/file/', '')
+            }
+
+            return {
+              attId: file.id || file.attId || '',
+              name: file.name || file.oldName || '',
+              attDir: attDir,
+              attSize: file.attSize || '',
+              attType: file.attType || '',
+              fileName: file.name || file.oldName || '',
+              filePath: attDir,
+              url: attDir,
+              createTime: null,
+              createdBy: null,
+              createTimeStr: null,
+              delFlag: '0',
+              updateBy: null,
+              updateTime: null,
+              i18nCode: '',
+              i18nLanguage: '',
+              originalFileName: file.name || file.oldName || '',
+              position: 0,
+              remark: file.remark || '',
+              sort: 0,
+              status: ''
+            }
+          })
+        } else {
+          this.dataForm.files = []
+        }
+      },
       init (id) { // 初始化表单验证规则
         this.dataForm.id = id || 0
         this.visible = true
@@ -169,7 +254,33 @@
           if (this.dataForm.id) {
             api.cmmeetingroomDetailApi(id).then(function(res) {
               this.dataForm = res;
+              if (this.dataForm.reserveTimeRange && typeof this.dataForm.reserveTimeRange === 'string') {
+                this.dataForm.reserveTimeRange = this.dataForm.reserveTimeRange.split('-')
+              }
+              // 将 equipmentConfig 从字符串转换为数组
+              if (this.dataForm.equipmentConfig && typeof this.dataForm.equipmentConfig === 'string') {
+                this.dataForm.equipmentConfig = this.dataForm.equipmentConfig.split('、')
+              }
+              // 将 roomStatus 转换为字符串，以便与字典值匹配
+              if (this.dataForm.roomStatus !== null && this.dataForm.roomStatus !== undefined) {
+                this.dataForm.roomStatus = this.dataForm.roomStatus.toString()
+              }
+              if (this.dataForm.files && this.dataForm.files.length > 0) {
+                this.roomFiles = this.dataForm.files.map((file, index) => ({
+                  attachFileUrl: file.attDir || file.filePath || file.url || '',
+                  attDir: file.attDir || file.filePath || file.url || '',
+                  name: file.name || file.fileName || '',
+                  oldName: file.name || file.fileName || '',
+                  attId: file.attId || '',
+                  uid: file.id || file.fileId || index + new Date().getTime()
+                }))
+              } else {
+                this.roomFiles = []
+              }
             }.bind(this))
+          } else {
+            this.roomFiles = []
+            this.dataForm.files = []
           }
         }.bind(this))
       },
@@ -177,14 +288,26 @@
       dataSubmit () {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            const submitData = { ...this.dataForm }
+            if (Array.isArray(submitData.reserveTimeRange) && submitData.reserveTimeRange.length === 2) {
+              submitData.reserveTimeRange = submitData.reserveTimeRange.join('-')
+            }
+            // 将 equipmentConfig 数组转换为用、分割的字符串
+            if (Array.isArray(submitData.equipmentConfig)) {
+              submitData.equipmentConfig = submitData.equipmentConfig.join('、')
+            }
+            // 将 roomStatus 转换为整数
+            if (submitData.roomStatus !== '') {
+              submitData.roomStatus = parseInt(submitData.roomStatus)
+            }
             if (this.dataForm.id) {
-              api.cmmeetingroomUpdateApi(this.dataForm).then(function(res) {
+              api.cmmeetingroomUpdateApi(submitData).then(function(res) {
                 this.$message.success('保存成功')
                 this.visible = false
                 this.$emit('refreshDataList')
               }.bind(this));
             } else {
-              api.cmmeetingroomCreateApi(this.dataForm).then(function(res) {
+              api.cmmeetingroomCreateApi(submitData).then(function(res) {
                 this.$message.success('新增成功')
                 this.visible = false
                 this.$emit('refreshDataList')
diff --git a/admin/src/views/cm/meeting/room/index.vue b/admin/src/views/cm/meeting/room/index.vue
index 667d695..05b0f36 100644
--- a/admin/src/views/cm/meeting/room/index.vue
+++ b/admin/src/views/cm/meeting/room/index.vue
@@ -8,15 +8,33 @@
         <el-input v-model="dataForm.roomLocation" placeholder="请输入会议室位置" clearable></el-input>
       </el-form-item>
       <el-form-item label="座位布局类型">
-        <el-input v-model="dataForm.seatLayout" placeholder="请输入座位布局类型" clearable></el-input>
+        <el-select v-model="dataForm.seatLayout" placeholder="请选择座位布局类型" clearable>
+          <el-option v-if="!dict.type.seat_layout" label="无数据" value="" disabled/>
+          <el-option
+            v-else
+            v-for="dict in dict.type.seat_layout"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="会议室状态">
-        <el-input v-model="dataForm.roomStatus" placeholder="请输入会议室状态" clearable></el-input>
+        <el-select v-model="dataForm.roomStatus" placeholder="请选择会议室状态" clearable>
+          <el-option v-if="!dict.type.room_status" label="无数据" value="" disabled/>
+          <el-option
+            v-else
+            v-for="dict in dict.type.room_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
         <el-button @click="resetForm()">重置</el-button>
-        <el-button v-hasPermi="['autogencode:cmmeetingroom:save']" type="primary" @click="addOrUpdateHandle()">新增数据</el-button>
+        <el-button v-hasPermi="['autogencode:cmmeetingroom:save']" type="primary" @click="addOrUpdateHandle()">新增会议室</el-button>
         <el-button v-hasPermi="['autogencode:cmmeetingroom:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>
     </el-form>
@@ -73,12 +91,19 @@
         header-align="center"
         align="center"
         label="座位布局类型">
+        <template slot-scope="scope">
+          <dict-tag v-if="dict.type.seat_layout && dict.type.seat_layout.length > 0" :options="dict.type.seat_layout" :value="scope.row.seatLayout"/>
+          <span v-else>{{ scope.row.seatLayout }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="equipmentConfig"
         header-align="center"
         align="center"
         label="配套设备">
+        <template slot-scope="scope">
+          {{ formatEquipmentConfig(scope.row.equipmentConfig) }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="chargeStandard"
@@ -97,17 +122,23 @@
         header-align="center"
         align="center"
         label="会议室状态">
+        <template slot-scope="scope">
+          <dict-tag v-if="dict.type.room_status && dict.type.room_status.length > 0" :options="dict.type.room_status" :value="scope.row.roomStatus ? scope.row.roomStatus.toString() : ''"/>
+          <span v-else>{{ scope.row.roomStatus }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="description"
         header-align="center"
         align="center"
+        show-overflow-tooltip
         label="会议室描述">
       </el-table-column>
       <el-table-column
         prop="remark"
         header-align="center"
         align="center"
+        show-overflow-tooltip
         label="备注">
       </el-table-column>
       <el-table-column
@@ -140,7 +171,7 @@
   import AddOrUpdate from './cmmeetingroom-add-and-update'
   import * as api from '@/api/cmmeetingroom.js'
   export default {
-    dicts: ['room_status','seat_layout'],
+    dicts: ['room_status','seat_layout','equipment_config'],
     data () {
       return {
         dataForm: {
@@ -180,6 +211,14 @@
       this.getDataList()
     },
     methods: {
+      formatEquipmentConfig(config) {
+        if (!config) return '-';
+        const arr = config.split('、').filter(i => i);
+        return arr.map(item => {
+          const dictItem = (this.dict.type.equipment_config || []).find(d => d.value === item);
+          return dictItem ? dictItem.label : item;
+        }).join('、');
+      },
       // 重置表单
       resetForm() {
         this.dataForm = {
diff --git a/admin/src/views/fm/dunning/record/fmdunningrecord-add-and-update.vue b/admin/src/views/fm/dunning/record/fmdunningrecord-add-and-update.vue
index 1ba0e8d..c3c3dee 100644
--- a/admin/src/views/fm/dunning/record/fmdunningrecord-add-and-update.vue
+++ b/admin/src/views/fm/dunning/record/fmdunningrecord-add-and-update.vue
@@ -22,7 +22,16 @@
       <el-input v-model="dataForm.userId" placeholder="催缴人"></el-input>
     </el-form-item>
     <el-form-item label="是否已读" prop="isRead">
-      <el-input v-model="dataForm.isRead" placeholder="是否已读"></el-input>
+      <el-select v-model="dataForm.isRead" placeholder="请选择是否已读" :style="{ width: '100%' }">
+        <el-option v-if="!dict.type.is_read" label="无数据" value="" disabled/>
+        <el-option
+          v-else
+          v-for="dict in dict.type.is_read"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+      </el-select>
     </el-form-item>
     <el-form-item label="备注" prop="remark">
       <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
@@ -38,41 +47,42 @@
 <script>
   import * as api from '@/api/fmdunningrecord.js'
   export default {
+    dicts: ['is_read'],
     data () {
       return {
         visible: false,
         dataForm: {
           id: 0,
-          chargeId: '' , 
-          dunningMethod: '' , 
-          dunningContent: '' , 
-          dunningTime: '' , 
-          userId: '' , 
-          isRead: '' , 
-          remark: '' , 
+          chargeId: '' ,
+          dunningMethod: '' ,
+          dunningContent: '' ,
+          dunningTime: '' ,
+          userId: '' ,
+          isRead: '' ,
+          remark: '' ,
         },
         dataRule: {
-          chargeId: [
-            { required: true, message: '费用id  为必填项', trigger: 'blur' }
-          ],
-          dunningMethod: [
-            { required: true, message: '催缴方式  为必填项', trigger: 'blur' }
-          ],
-          dunningContent: [
-            { required: true, message: '催缴内容  为必填项', trigger: 'blur' }
-          ],
-          dunningTime: [
-            { required: true, message: '催缴时间  为必填项', trigger: 'blur' }
-          ],
+          // chargeId: [
+          //   { required: true, message: '费用id  为必填项', trigger: 'blur' }
+          // ],
+          // dunningMethod: [
+          //   { required: true, message: '催缴方式  为必填项', trigger: 'blur' }
+          // ],
+          // dunningContent: [
+          //   { required: true, message: '催缴内容  为必填项', trigger: 'blur' }
+          // ],
+          // dunningTime: [
+          //   { required: true, message: '催缴时间  为必填项', trigger: 'blur' }
+          // ],
           userId: [
             { required: true, message: '催缴人  为必填项', trigger: 'blur' }
           ],
-          isRead: [
-            { required: true, message: '是否已读  为必填项', trigger: 'blur' }
-          ],
-          remark: [
-            { required: true, message: '备注  为必填项', trigger: 'blur' }
-          ],
+          // isRead: [
+          //   { required: true, message: '是否已读  为必填项', trigger: 'blur' }
+          // ],
+          // remark: [
+          //   { required: true, message: '备注  为必填项', trigger: 'blur' }
+          // ],
         }
       }
     },
diff --git a/admin/src/views/fm/dunning/record/index.vue b/admin/src/views/fm/dunning/record/index.vue
index e3340e1..aec3a08 100644
--- a/admin/src/views/fm/dunning/record/index.vue
+++ b/admin/src/views/fm/dunning/record/index.vue
@@ -1,31 +1,28 @@
 <template>
   <div class="divBox">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item label="费用id">
-        <el-input v-model="dataForm.chargeId" placeholder="请输入费用id" clearable></el-input>
-      </el-form-item>
       <el-form-item label="催缴方式">
         <el-input v-model="dataForm.dunningMethod" placeholder="请输入催缴方式" clearable></el-input>
       </el-form-item>
-      <el-form-item label="催缴内容">
-        <el-input v-model="dataForm.dunningContent" placeholder="请输入催缴内容" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="催缴时间">
-        <el-input v-model="dataForm.dunningTime" placeholder="请输入催缴时间" clearable></el-input>
-      </el-form-item>
       <el-form-item label="催缴人">
         <el-input v-model="dataForm.userId" placeholder="请输入催缴人" clearable></el-input>
       </el-form-item>
       <el-form-item label="是否已读">
-        <el-input v-model="dataForm.isRead" placeholder="请输入是否已读" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="备注">
-        <el-input v-model="dataForm.remark" placeholder="请输入备注" clearable></el-input>
+        <el-select v-model="dataForm.isRead" placeholder="请选择是否已读" style="width: 100%" clearable>
+          <el-option v-if="!dict.type.is_read" label="无数据" value="" disabled/>
+          <el-option
+            v-else
+            v-for="dict in dict.type.is_read"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
         <el-button @click="resetForm()">重置</el-button>
-        <el-button v-hasPermi="['autogencode:fmdunningrecord:save']" type="primary" @click="addOrUpdateHandle()">新增数据</el-button>
+        <el-button v-hasPermi="['autogencode:fmdunningrecord:save']" type="primary" @click="addOrUpdateHandle()">新增催缴记录</el-button>
         <el-button v-hasPermi="['autogencode:fmdunningrecord:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>
     </el-form>
@@ -41,12 +38,6 @@
         align="center"
         width="50">
       </el-table-column>
-      <el-table-column
-        prop="chargeId"
-        header-align="center"
-        align="center"
-        label="费用id">
-      </el-table-column>
       <el-table-column
         prop="dunningMethod"
         header-align="center"
@@ -76,6 +67,10 @@
         header-align="center"
         align="center"
         label="是否已读">
+        <template slot-scope="scope">
+          <dict-tag v-if="dict.type.is_read && dict.type.is_read.length > 0" :options="dict.type.is_read" :value="scope.row.isRead"/>
+          <span v-else>{{ scope.row.isRead }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="remark"
@@ -113,6 +108,7 @@
   import AddOrUpdate from './fmdunningrecord-add-and-update'
   import * as api from '@/api/fmdunningrecord.js'
   export default {
+    dicts: ['is_read'],
     data () {
       return {
         dataForm: {
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillCargoController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillCargoController.java
index 717ad57..258b7cd 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillCargoController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillCargoController.java
@@ -1,15 +1,23 @@
 package com.zbkj.modules.autogencode.controller;
 
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.zbkj.modules.autogencode.entity.*;
+import org.apache.commons.lang3.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
-import com.zbkj.modules.autogencode.entity.CkBill;
 import com.zbkj.modules.autogencode.service.CkBillService;
+import com.zbkj.modules.autogencode.service.CkBillCargoService;
+import com.zbkj.modules.autogencode.service.CkBillStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -19,13 +27,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zbkj.modules.autogencode.entity.CkBillCargo;
-import com.zbkj.modules.autogencode.service.CkBillCargoService;
-
-
-
-
 /**
  * 出入库单据明细 控制器
  */
@@ -38,6 +39,9 @@ public class CkBillCargoController {
     @Autowired
     private CkBillService ckBillService;
 
+    @Autowired
+    private CkBillStockService ckBillStockService;
+
     /**
      * 条件设置
      * 根据实体类字段自动生成查询条件
@@ -46,239 +50,239 @@ public class CkBillCargoController {
         if (request == null) {
             return;
         }
-        
+
         // 根据实体类字段自动生成查询条件
-            
+
         // 主键
         if (request.getId() != null) {
             queryWrapper.eq(CkBillCargo::getId, request.getId());
         }
-                    
+
         // 区分直接出入库，类型为1，其他出入库类型为0
         if (StrUtil.isNotBlank(request.getSourceType())) {
             queryWrapper.eq(CkBillCargo::getSourceType, request.getSourceType());
         }
-                    
+
         // 单据ID
         if (request.getBillId() != null) {
             queryWrapper.eq(CkBillCargo::getBillId, request.getBillId());
         }
-                    
+
         // 单据状态 0未提交，1提交 默认1，主要用于出入库页面
         if (StrUtil.isNotBlank(request.getBillStatus())) {
             queryWrapper.eq(CkBillCargo::getBillStatus, request.getBillStatus());
         }
-                    
+
         // 单据日期
         if (request.getBillDate() != null) {
             queryWrapper.eq(CkBillCargo::getBillDate, request.getBillDate());
         }
-                    
+
         // 单据编号
         if (StrUtil.isNotBlank(request.getBillNumber())) {
             queryWrapper.eq(CkBillCargo::getBillNumber, request.getBillNumber());
         }
-                    
+
         // 出入库类型
         if (StrUtil.isNotBlank(request.getInoutType())) {
             queryWrapper.eq(CkBillCargo::getInoutType, request.getInoutType());
         }
-                    
+
         // 船舶航次ID
         if (request.getVoyageId() != null) {
             queryWrapper.eq(CkBillCargo::getVoyageId, request.getVoyageId());
         }
-                    
+
         // 航次号
         if (StrUtil.isNotBlank(request.getVoyageNo())) {
             queryWrapper.eq(CkBillCargo::getVoyageNo, request.getVoyageNo());
         }
-                    
+
         // 船舶ID
         if (request.getVesselId() != null) {
             queryWrapper.eq(CkBillCargo::getVesselId, request.getVesselId());
         }
-                    
+
         // 船舶名称
         if (StrUtil.isNotBlank(request.getVesselName())) {
             queryWrapper.eq(CkBillCargo::getVesselName, request.getVesselName());
         }
-                    
+
         // 船舶货物ID
         if (request.getVesselCargoId() != null) {
             queryWrapper.eq(CkBillCargo::getVesselCargoId, request.getVesselCargoId());
         }
-                    
+
         // 货物ID
         if (request.getCargoId() != null) {
             queryWrapper.eq(CkBillCargo::getCargoId, request.getCargoId());
         }
-                    
+
         // 货物自然序号
         if (StrUtil.isNotBlank(request.getCargoNumber())) {
             queryWrapper.eq(CkBillCargo::getCargoNumber, request.getCargoNumber());
         }
-                    
+
         // 商品料号
         if (StrUtil.isNotBlank(request.getItemNumber())) {
             queryWrapper.eq(CkBillCargo::getItemNumber, request.getItemNumber());
         }
-                    
+
         // 电子账册项号
         if (StrUtil.isNotBlank(request.getBookNumber())) {
             queryWrapper.eq(CkBillCargo::getBookNumber, request.getBookNumber());
         }
-                    
+
         // HS编号
         if (StrUtil.isNotBlank(request.getHsCode())) {
             queryWrapper.eq(CkBillCargo::getHsCode, request.getHsCode());
         }
-                    
+
         // 货物名称
         if (StrUtil.isNotBlank(request.getCargoName())) {
             queryWrapper.eq(CkBillCargo::getCargoName, request.getCargoName());
         }
-                    
+
         // 提运单号
         if (StrUtil.isNotBlank(request.getBillNo())) {
             queryWrapper.eq(CkBillCargo::getBillNo, request.getBillNo());
         }
-                    
+
         // 规格类型品质
         if (StrUtil.isNotBlank(request.getCargoSpec())) {
             queryWrapper.eq(CkBillCargo::getCargoSpec, request.getCargoSpec());
         }
-                    
+
         // 原产国
         if (StrUtil.isNotBlank(request.getOriginCountry())) {
             queryWrapper.eq(CkBillCargo::getOriginCountry, request.getOriginCountry());
         }
-                    
+
         // 计量单位
         if (StrUtil.isNotBlank(request.getUnit())) {
             queryWrapper.eq(CkBillCargo::getUnit, request.getUnit());
         }
-                    
+
         // 第一计量单位
         if (StrUtil.isNotBlank(request.getFirstUnit())) {
             queryWrapper.eq(CkBillCargo::getFirstUnit, request.getFirstUnit());
         }
-                    
+
         // 单价
         if (request.getUnitPrice() != null) {
             queryWrapper.eq(CkBillCargo::getUnitPrice, request.getUnitPrice());
         }
-                    
+
         // 币制
         if (StrUtil.isNotBlank(request.getCurrType())) {
             queryWrapper.eq(CkBillCargo::getCurrType, request.getCurrType());
         }
-                    
+
         // 货主ID
         if (request.getCustId() != null) {
             queryWrapper.eq(CkBillCargo::getCustId, request.getCustId());
         }
-                    
+
         // 货主名称
         if (StrUtil.isNotBlank(request.getCustName())) {
             queryWrapper.eq(CkBillCargo::getCustName, request.getCustName());
         }
-                    
+
         // 业务性质
         if (StrUtil.isNotBlank(request.getOpType())) {
             queryWrapper.eq(CkBillCargo::getOpType, request.getOpType());
         }
-                    
+
         // 贸易性质
         if (StrUtil.isNotBlank(request.getTradType())) {
             queryWrapper.eq(CkBillCargo::getTradType, request.getTradType());
         }
-                    
+
         // 货物件数
         if (request.getCargoNum() != null) {
             queryWrapper.eq(CkBillCargo::getCargoNum, request.getCargoNum());
         }
-                    
+
         // 货物重量
         if (request.getCargoWt() != null) {
             queryWrapper.eq(CkBillCargo::getCargoWt, request.getCargoWt());
         }
-                    
+
         // 货物体积
         if (request.getCargoVol() != null) {
             queryWrapper.eq(CkBillCargo::getCargoVol, request.getCargoVol());
         }
-                    
+
         // 货物价值
         if (request.getCargoValue() != null) {
             queryWrapper.eq(CkBillCargo::getCargoValue, request.getCargoValue());
         }
-                    
+
         // 报关单号
         if (StrUtil.isNotBlank(request.getCustomsNo())) {
             queryWrapper.eq(CkBillCargo::getCustomsNo, request.getCustomsNo());
         }
-                    
+
         // 货物流向
         if (StrUtil.isNotBlank(request.getCargoFlow())) {
             queryWrapper.eq(CkBillCargo::getCargoFlow, request.getCargoFlow());
         }
-                    
+
         // 核注清单号
         if (StrUtil.isNotBlank(request.getListNumber())) {
             queryWrapper.eq(CkBillCargo::getListNumber, request.getListNumber());
         }
-                    
+
         // 有效期至
         if (request.getExpiryDate() != null) {
             queryWrapper.eq(CkBillCargo::getExpiryDate, request.getExpiryDate());
         }
-                    
+
         // 备注
         if (StrUtil.isNotBlank(request.getRemark())) {
             queryWrapper.eq(CkBillCargo::getRemark, request.getRemark());
         }
-                    
+
         // 删除标志（0代表存在 2代表删除）
         if (StrUtil.isNotBlank(request.getDelFlag())) {
             queryWrapper.eq(CkBillCargo::getDelFlag, request.getDelFlag());
         }
-                    
+
         // 创建部门
         if (request.getCreateDept() != null) {
             queryWrapper.eq(CkBillCargo::getCreateDept, request.getCreateDept());
         }
-                    
+
         // 创建人
         if (request.getCreateBy() != null) {
             queryWrapper.eq(CkBillCargo::getCreateBy, request.getCreateBy());
         }
-                    
+
         // 创建时间
         if (request.getCreateTime() != null) {
             queryWrapper.eq(CkBillCargo::getCreateTime, request.getCreateTime());
         }
-                    
+
         // 修改人
         if (request.getUpdateBy() != null) {
             queryWrapper.eq(CkBillCargo::getUpdateBy, request.getUpdateBy());
         }
-                    
+
         // 修改时间
         if (request.getUpdateTime() != null) {
             queryWrapper.eq(CkBillCargo::getUpdateTime, request.getUpdateTime());
         }
-                    
-        // 
+
+        //
         if (StrUtil.isNotBlank(request.getTenantId())) {
             queryWrapper.eq(CkBillCargo::getTenantId, request.getTenantId());
         }
-                    
+
         // 文件id
         if (StrUtil.isNotBlank(request.getFileId())) {
             queryWrapper.eq(CkBillCargo::getFileId, request.getFileId());
         }
-            
+
     }
 
 
@@ -291,14 +295,85 @@ public class CkBillCargoController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public CommonResult<CommonPage<CkBillCargo>>  getList(@Validated CkBillCargo request, @Validated PageParamRequest pageParamRequest) {
         LambdaQueryWrapper<CkBillCargo> queryWrapper = new LambdaQueryWrapper();
-        
+
         // 应用搜索条件
-        condition(queryWrapper, request);
-        
+        buildQueryWrapper(queryWrapper, request);
+
         CommonPage<CkBillCargo> page = CommonPage.restPage(ckBillCargoService.pageList(queryWrapper, pageParamRequest));
+        
+        // 查询所有的CkBillStock信息
+        List<CkBillStock> ckBillStockList = ckBillStockService.list();
+        
+        // 构建映射，key为billCargoId，value为对应的CkBillStock
+        Map<Long, CkBillStock> ckBillStockMap = new HashMap<>();
+        for (CkBillStock ckBillStock : ckBillStockList) {
+            ckBillStockMap.put(ckBillStock.getBillCargoId(), ckBillStock);
+        }
+        
+        // 为返回的数据添加仓库名称、货架名称和货位名称
+        for (CkBillCargo cargo : page.getList()) {
+            CkBillStock ckBillStock = ckBillStockMap.get(cargo.getId());
+            if (ckBillStock != null) {
+                cargo.setStockName(ckBillStock.getStockName());
+                cargo.setShelfName(ckBillStock.getShelfName());
+                cargo.setLocationName(ckBillStock.getLocationName());
+            }
+        }
+        
         return CommonResult.success(page);
     }
 
+    /**
+     * 构建查询条件
+     */
+    private void buildQueryWrapper(LambdaQueryWrapper<CkBillCargo> queryWrapper, CkBillCargo request) {
+        if (request == null) {
+            return;
+        }
+
+        if (Validator.isNotEmpty(request.getInoutType())) {
+            if ("3".equals(request.getInoutType())) {
+                // 查询转场数据
+                queryWrapper.inSql(CkBillCargo::getBillId, "select id from ck_bill where bill_type = '3'");
+            } else if ("4".equals(request.getInoutType())) {
+                // 查询混配数据
+                queryWrapper.inSql(CkBillCargo::getBillId, "select id from ck_bill where bill_type = '4'");
+            } else {
+                queryWrapper.eq(CkBillCargo::getInoutType, request.getInoutType());
+            }
+        }
+
+        // 应用基础搜索条件
+        condition(queryWrapper, request);
+
+        // 日期范围查询
+        if (request.getBeginDate() != null) {
+            queryWrapper.between(CkBillCargo::getBillDate, request.getBeginDate(), adjustEndDate(request.getEndDate()));
+        }
+        if (request.getBeginDateTwo() != null) {
+            queryWrapper.between(CkBillCargo::getExpiryDate, request.getBeginDateTwo(), adjustEndDate(request.getEndDateTwo()));
+        }
+
+        // 排序
+        queryWrapper.orderByDesc(CkBillCargo::getBillDate);
+    }
+    
+    /**
+     * 调整结束日期为当天结束时间
+     */
+    private Date adjustEndDate(Date endDate) {
+        if (endDate != null) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(endDate);
+            calendar.set(Calendar.HOUR_OF_DAY, 23);
+            calendar.set(Calendar.MINUTE, 59);
+            calendar.set(Calendar.SECOND, 59);
+            calendar.set(Calendar.MILLISECOND, 0);
+            return calendar.getTime();
+        }
+        return null;
+    }
+
     /**
      * 确认入库单据（列表页面确认）
      */
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillNumberController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillNumberController.java
new file mode 100644
index 0000000..d61c29d
--- /dev/null
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillNumberController.java
@@ -0,0 +1,176 @@
+package com.zbkj.modules.autogencode.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zbkj.common.request.PageParamRequest;
+import com.zbkj.common.response.CommonResult;
+import com.zbkj.common.page.CommonPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zbkj.modules.autogencode.entity.CkBillNumber;
+import com.zbkj.modules.autogencode.service.CkBillNumberService;
+
+
+
+
+/**
+ *  控制器
+ */
+@RestController
+@RequestMapping("api/autogencode/ckbillnumber")
+public class CkBillNumberController {
+    @Autowired
+    private CkBillNumberService ckBillNumberService;
+
+
+
+    /**
+     * 条件设置
+     * 根据实体类字段自动生成查询条件
+     */
+    private void condition(LambdaQueryWrapper<CkBillNumber> queryWrapper, CkBillNumber request) {
+        if (request == null) {
+            return;
+        }
+        
+        // 根据实体类字段自动生成查询条件
+            
+        // ID
+        if (request.getId() != null) {
+            queryWrapper.eq(CkBillNumber::getId, request.getId());
+        }
+                    
+        // 单据前缀
+        if (StrUtil.isNotBlank(request.getBillPrefix())) {
+            queryWrapper.eq(CkBillNumber::getBillPrefix, request.getBillPrefix());
+        }
+                    
+        // 单据日期
+        if (StrUtil.isNotBlank(request.getBillDate())) {
+            queryWrapper.eq(CkBillNumber::getBillDate, request.getBillDate());
+        }
+                    
+        // 单据流水号
+        if (request.getBillNumber() != null) {
+            queryWrapper.eq(CkBillNumber::getBillNumber, request.getBillNumber());
+        }
+                    
+        // 删除标志（0代表存在 2代表删除）
+        if (StrUtil.isNotBlank(request.getDelFlag())) {
+            queryWrapper.eq(CkBillNumber::getDelFlag, request.getDelFlag());
+        }
+                    
+        // 创建部门
+        if (request.getCreateDept() != null) {
+            queryWrapper.eq(CkBillNumber::getCreateDept, request.getCreateDept());
+        }
+                    
+        // 创建人
+        if (request.getCreateBy() != null) {
+            queryWrapper.eq(CkBillNumber::getCreateBy, request.getCreateBy());
+        }
+                    
+        // 创建时间
+        if (request.getCreateTime() != null) {
+            queryWrapper.eq(CkBillNumber::getCreateTime, request.getCreateTime());
+        }
+                    
+        // 修改人
+        if (request.getUpdateBy() != null) {
+            queryWrapper.eq(CkBillNumber::getUpdateBy, request.getUpdateBy());
+        }
+                    
+        // 修改时间
+        if (request.getUpdateTime() != null) {
+            queryWrapper.eq(CkBillNumber::getUpdateTime, request.getUpdateTime());
+        }
+                    
+        // 
+        if (StrUtil.isNotBlank(request.getTenantId())) {
+            queryWrapper.eq(CkBillNumber::getTenantId, request.getTenantId());
+        }
+            
+    }
+
+
+    /**
+     * 分页显示
+     * @param request 搜索条件
+     * @param pageParamRequest 分页参数
+     */
+    @ApiOperation(value = "分页列表")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public CommonResult<CommonPage<CkBillNumber>>  getList(@Validated CkBillNumber request, @Validated PageParamRequest pageParamRequest) {
+        LambdaQueryWrapper<CkBillNumber> queryWrapper = new LambdaQueryWrapper();
+        
+        // 应用搜索条件
+        condition(queryWrapper, request);
+        
+        CommonPage<CkBillNumber> page = CommonPage.restPage(ckBillNumberService.pageList(queryWrapper, pageParamRequest));
+        return CommonResult.success(page);
+    }
+
+    @ApiOperation("获取单据编号")
+    @GetMapping("/getBillNo/{billPrefix}")
+    public CommonResult<String> getBillNo(@PathVariable("billPrefix") String billPrefix) {
+        String billNumber = ckBillNumberService.getBillNumber(billPrefix);
+        return CommonResult.success(billNumber, "获取成功");
+    }
+
+
+
+    /**
+     * 详情数据
+     */
+    @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
+    public CommonResult<CkBillNumber> info(@PathVariable("id") Long id){
+		CkBillNumber ckBillNumber = ckBillNumberService.getById(id);
+
+        return CommonResult.success(ckBillNumber);
+    }
+
+    /**
+     * 新增数据
+     */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public CommonResult<String> save(@RequestBody CkBillNumber ckBillNumber){
+        if (ckBillNumberService.save(ckBillNumber)) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+    /**
+     * 修改数据
+     */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public CommonResult<String> update(@RequestBody CkBillNumber ckBillNumber){
+        if (ckBillNumberService.updateById(ckBillNumber)) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+    /**
+     * 删除:根据id集合
+     */
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public CommonResult<String> delete(@RequestBody Long[] ids){
+        if (ckBillNumberService.removeByIds(Arrays.asList(ids))) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+}
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustController.java
index 514684b..1b20086 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustController.java
@@ -8,9 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
-import com.zbkj.modules.autogencode.entity.CmCustItem;
-import com.zbkj.modules.autogencode.entity.CmCustQualify;
-import com.zbkj.modules.autogencode.entity.CmCustQualifyFile;
+import com.zbkj.modules.autogencode.entity.*;
 import com.zbkj.modules.autogencode.service.CmCustItemService;
 import com.zbkj.modules.autogencode.service.CmCustQualifyService;
 import com.zbkj.modules.autogencode.service.CmCustQualifyFileService;
@@ -22,7 +20,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 
 
-import com.zbkj.modules.autogencode.entity.CmCust;
 import com.zbkj.modules.autogencode.service.CmCustService;
 import com.zbkj.common.model.system.SystemAttachment;
 
@@ -195,6 +192,20 @@ public class CmCustController {
     }
 
 
+    /**
+     * 获取所有客户信息表
+     * @param request 搜索条件
+     */
+    @ApiOperation(value = "获取所有客户")
+    @RequestMapping(value = "/listByAll", method = RequestMethod.GET)
+    public CommonResult<List<CmCust>>  listByAll(CmCust request) {
+        LambdaQueryWrapper<CmCust> queryWrapper = new LambdaQueryWrapper();
+        // 应用搜索条件
+        condition(queryWrapper, request);
+        List<CmCust> cmCustList = cmCustService.list(queryWrapper);
+        return CommonResult.success(cmCustList);
+    }
+
     /**
      * 详情数据
      */
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustProductController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustProductController.java
index ea9fc93..df830b1 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustProductController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustProductController.java
@@ -14,6 +14,7 @@ import com.zbkj.common.request.StoreProductAttrAddRequest;
 import com.zbkj.common.request.StoreProductAttrValueAddRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.modules.autogencode.entity.CmCust;
 import com.zbkj.service.dao.StoreProductDao;
 import com.zbkj.service.service.StoreProductService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -254,6 +255,20 @@ public class CmCustProductController {
         return CommonResult.success(page);
     }
 
+    /**
+     * 获取所有商品信息表
+     * @param request 搜索条件
+     */
+    @ApiOperation(value = "获取所有商品")
+    @RequestMapping(value = "/listByAll", method = RequestMethod.GET)
+    public CommonResult<List<CmCustProduct>>  listByAll(CmCustProduct request) {
+        LambdaQueryWrapper<CmCustProduct> queryWrapper = new LambdaQueryWrapper();
+        // 应用搜索条件
+        condition(queryWrapper, request);
+        List<CmCustProduct> cmCustProductList = cmCustProductService.list(queryWrapper);
+        return CommonResult.success(cmCustProductList);
+    }
+
 
     /**
      * 详情数据
@@ -387,4 +402,3 @@ public class CmCustProductController {
     }
 
 }
-
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmMeetingRoomController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmMeetingRoomController.java
index f11f8c6..2a98e1c 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmMeetingRoomController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmMeetingRoomController.java
@@ -1,7 +1,9 @@
 package com.zbkj.modules.autogencode.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -20,6 +22,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.modules.autogencode.entity.CmMeetingRoom;
 import com.zbkj.modules.autogencode.service.CmMeetingRoomService;
+import com.zbkj.common.model.system.SystemAttachment;
+import com.zbkj.service.service.SystemAttachmentService;
 
 
 
@@ -33,6 +37,9 @@ public class CmMeetingRoomController {
     @Autowired
     private CmMeetingRoomService cmMeetingRoomService;
 
+    @Autowired
+    private SystemAttachmentService systemAttachmentService;
+
 
 
     /**
@@ -53,7 +60,7 @@ public class CmMeetingRoomController {
                     
         // 会议室名称
         if (StrUtil.isNotBlank(request.getRoomName())) {
-            queryWrapper.eq(CmMeetingRoom::getRoomName, request.getRoomName());
+            queryWrapper.like(CmMeetingRoom::getRoomName, request.getRoomName());
         }
                     
         // 会议室位置
@@ -184,14 +191,33 @@ public class CmMeetingRoomController {
     public CommonResult<CmMeetingRoom> info(@PathVariable("id") Long id){
 		CmMeetingRoom cmMeetingRoom = cmMeetingRoomService.getById(id);
 
+        // 设置文件信息
+        if (cmMeetingRoom != null) {
+            setFile(cmMeetingRoom);
+        }
+
         return CommonResult.success(cmMeetingRoom);
     }
 
+    private void setFile(CmMeetingRoom cmMeetingRoom) {
+        Long fileId = cmMeetingRoom.getFileId();
+        if (fileId != null) {
+            List<SystemAttachment> list = systemAttachmentService.list(new LambdaQueryWrapper<SystemAttachment>()
+                    .eq(SystemAttachment::getFileId, String.valueOf(fileId)));
+            cmMeetingRoom.setFiles(list);
+        }
+    }
+
     /**
      * 新增数据
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public CommonResult<String> save(@RequestBody CmMeetingRoom cmMeetingRoom){
+        // 处理文件保存
+        if (cmMeetingRoom.getFiles() != null) {
+            updateFile(cmMeetingRoom);
+        }
+        
         if (cmMeetingRoomService.save(cmMeetingRoom)) {
             return CommonResult.success();
         }
@@ -203,12 +229,29 @@ public class CmMeetingRoomController {
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public CommonResult<String> update(@RequestBody CmMeetingRoom cmMeetingRoom){
+        // 处理文件更新
+        if (cmMeetingRoom.getFiles() != null) {
+            updateFile(cmMeetingRoom);
+        }
+        
         if (cmMeetingRoomService.updateById(cmMeetingRoom)) {
             return CommonResult.success();
         }
         return CommonResult.failed();
     }
 
+    private void updateFile(CmMeetingRoom cmMeetingRoom) {
+        Long newId = System.currentTimeMillis() + new Random().nextInt(1000);
+        List<SystemAttachment> files = cmMeetingRoom.getFiles();
+        if (files != null) {
+            for (SystemAttachment attachment : files) {
+                attachment.setFileId(String.valueOf(newId));
+            }
+            systemAttachmentService.updateBatchById(files);
+            cmMeetingRoom.setFileId(newId);
+        }
+    }
+
     /**
      * 删除:根据id集合
      */
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmShelfController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmShelfController.java
index 2a5c11d..c1a49c9 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmShelfController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmShelfController.java
@@ -1,6 +1,7 @@
 package com.zbkj.modules.autogencode.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import cn.hutool.core.util.StrUtil;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.modules.autogencode.entity.CmWarehouse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -131,6 +133,20 @@ public class CmShelfController {
         return CommonResult.success(page);
     }
 
+    /**
+     * 获取所有货架信息表
+     * @param request 搜索条件
+     */
+    @ApiOperation(value = "获取所有货架")
+    @RequestMapping(value = "/listByAll", method = RequestMethod.GET)
+    public CommonResult<List<CmShelf>>  listByAll(CmShelf request) {
+        LambdaQueryWrapper<CmShelf> queryWrapper = new LambdaQueryWrapper();
+        // 应用搜索条件
+        condition(queryWrapper, request);
+        List<CmShelf> cmShelfList = cmShelfService.list(queryWrapper);
+        return CommonResult.success(cmShelfList);
+    }
+
 
     /**
      * 详情数据
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmStorageLocationController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmStorageLocationController.java
index 523068d..4b25d69 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmStorageLocationController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmStorageLocationController.java
@@ -1,6 +1,7 @@
 package com.zbkj.modules.autogencode.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import cn.hutool.core.util.StrUtil;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.modules.autogencode.entity.CmShelf;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -126,6 +128,21 @@ public class CmStorageLocationController {
         return CommonResult.success(page);
     }
 
+    /**
+     * 获取所有货位信息表
+     * @param request 搜索条件
+     */
+    @ApiOperation(value = "获取所有货位")
+    @RequestMapping(value = "/listByAll", method = RequestMethod.GET)
+    public CommonResult<List<CmStorageLocation>>  listByAll(CmStorageLocation request) {
+        LambdaQueryWrapper<CmStorageLocation> queryWrapper = new LambdaQueryWrapper();
+        // 应用搜索条件
+        condition(queryWrapper, request);
+        List<CmStorageLocation> cmStorageLocationList = cmStorageLocationService.list(queryWrapper);
+        return CommonResult.success(cmStorageLocationList);
+    }
+
+
 
     /**
      * 详情数据
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/FmDunningRecordController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/FmDunningRecordController.java
index 9bb7314..86c0dc9 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/FmDunningRecordController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/FmDunningRecordController.java
@@ -186,3 +186,8 @@ public class FmDunningRecordController {
     }
 
 }
+
+
+
+//
+
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/CkBillNumberDao.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/CkBillNumberDao.java
new file mode 100644
index 0000000..c07871b
--- /dev/null
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/dao/CkBillNumberDao.java
@@ -0,0 +1,13 @@
+package com.zbkj.modules.autogencode.dao;
+
+import com.zbkj.modules.autogencode.entity.CkBillNumber;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *  DAO 映射层
+ */
+@Mapper
+public interface CkBillNumberDao extends BaseMapper<CkBillNumber> {
+
+}
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillCargo.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillCargo.java
index 364002d..a5df8d5 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillCargo.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillCargo.java
@@ -277,6 +277,21 @@ public class CkBillCargo implements Serializable {
 	@ApiModelProperty(value = "入库库场代码")
 	@TableField(exist = false)
 	private String stockCode;
+
+	/**
+	 * 货架ID
+	 */
+	@ApiModelProperty(value = "货架ID")
+	@TableField(exist = false)
+	private Long shelfId;
+
+	/**
+	 * 货位ID
+	 */
+	@ApiModelProperty(value = "货位ID")
+	@TableField(exist = false)
+	private Long locationId;
+
 	/** 库场name */
 
 	@TableField(exist = false)
@@ -292,6 +307,16 @@ public class CkBillCargo implements Serializable {
 	@ApiModelProperty(value = "库场name")
 	@TableField(exist = false)
 	private String stockName;
+
+	/** 货架名称 */
+	@ApiModelProperty(value = "货架名称")
+	@TableField(exist = false)
+	private String shelfName;
+
+	/** 货位名称 */
+	@ApiModelProperty(value = "货位名称")
+	@TableField(exist = false)
+	private String locationName;
 	/** 出库库场ID */
 	@ApiModelProperty(value = "出库库场ID")
 	@TableField(exist = false)
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillNumber.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillNumber.java
new file mode 100644
index 0000000..302b13a
--- /dev/null
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CkBillNumber.java
@@ -0,0 +1,74 @@
+package com.zbkj.modules.autogencode.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+
+	import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+@Data
+@TableName("ck_bill_number")
+public class CkBillNumber implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+		 * ID
+	 */
+	@ApiModelProperty(value = "ID")
+		@TableId
+	private Long id;
+	/**
+		 * 单据前缀
+	 */
+	@ApiModelProperty(value = "单据前缀")
+	private String billPrefix;
+	/**
+		 * 单据日期
+	 */
+	@ApiModelProperty(value = "单据日期")
+	private String billDate;
+	/**
+		 * 单据流水号
+	 */
+	@ApiModelProperty(value = "单据流水号")
+	private Long billNumber;
+	/**
+		 * 删除标志（0代表存在 2代表删除）
+	 */
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+	private String delFlag;
+	/**
+		 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+		 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createBy;
+	/**
+		 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+		 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private Long updateBy;
+	/**
+		 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+		 * 
+	 */
+	@ApiModelProperty(value = "")
+	private String tenantId;
+
+}
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CmMeetingRoom.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CmMeetingRoom.java
index a643a1d..66bf253 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CmMeetingRoom.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/CmMeetingRoom.java
@@ -1,11 +1,14 @@
 package com.zbkj.modules.autogencode.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.zbkj.common.model.system.SystemAttachment;
 import io.swagger.annotations.ApiModelProperty;
 
 	import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 import lombok.Data;
 
 
@@ -125,5 +128,11 @@ public class CmMeetingRoom implements Serializable {
 	 */
 	@ApiModelProperty(value = "租户ID")
 	private String tenantId;
+	/**
+		 * 文件列表
+	 */
+	@ApiModelProperty(value = "文件列表")
+	@TableField(exist = false)
+	private List<SystemAttachment> files;
 
 }
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CkBillNumberService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CkBillNumberService.java
new file mode 100644
index 0000000..0030429
--- /dev/null
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CkBillNumberService.java
@@ -0,0 +1,27 @@
+package com.zbkj.modules.autogencode.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zbkj.modules.autogencode.entity.CkBillNumber;
+import com.zbkj.common.request.PageParamRequest;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  业务接口
+ * +----------------------------------------------------------------------
+ */
+public interface CkBillNumberService extends IService<CkBillNumber> {
+
+            /**
+            * CkBillNumber 列表查询
+        * @param pageParamRequest 分页参数对象
+        * @return
+        */
+    List<CkBillNumber> pageList(LambdaQueryWrapper<CkBillNumber> queryWrapper, PageParamRequest pageParamRequest);
+
+    String getBillNumber(String billPrefix);
+}
+
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CkBillService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CkBillService.java
index 04f1f40..823f83a 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CkBillService.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/CkBillService.java
@@ -36,5 +36,6 @@ public interface CkBillService extends IService<CkBill> {
      * @return
      */
     public CommonResult<String> putCargo(CkBill ckBill);
+
 }
 
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CkBillNumberServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CkBillNumberServiceImpl.java
new file mode 100644
index 0000000..05e0904
--- /dev/null
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CkBillNumberServiceImpl.java
@@ -0,0 +1,70 @@
+package com.zbkj.modules.autogencode.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zbkj.common.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import com.zbkj.modules.autogencode.dao.CkBillNumberDao;
+import com.zbkj.modules.autogencode.entity.CkBillNumber;
+import com.zbkj.modules.autogencode.service.CkBillNumberService;
+import com.zbkj.common.page.CommonPage;
+import com.zbkj.common.request.PageParamRequest;
+
+import javax.annotation.Resource;
+import java.util.Map;
+import java.util.Arrays;
+import java.util.List;
+
+
+@Service("ckBillNumberService")
+public class CkBillNumberServiceImpl extends ServiceImpl<CkBillNumberDao, CkBillNumber> implements CkBillNumberService {
+
+
+    @Resource
+    private CkBillNumberDao dao;
+
+    @Resource
+    private CkBillNumberService ckBillNumberService;
+    /**
+     * 带分页参数的列表查询实现
+     */
+    @Override
+    public List<CkBillNumber> pageList(LambdaQueryWrapper<CkBillNumber> queryWrapper, PageParamRequest pageParamRequest) {
+
+        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
+
+        return dao.selectList(queryWrapper);
+    }
+
+    @Override
+    public String getBillNumber(String billPrefix) {
+        String billNo = "";
+        if (StringUtils.isBlank(billPrefix)) {
+            billPrefix = "DD";
+        }
+        LambdaQueryWrapper<CkBillNumber> query = new LambdaQueryWrapper<>();
+        query.eq(CkBillNumber::getBillPrefix, billPrefix);
+        String billDate = DateUtils.dateTimeNow("yyyyMMdd");
+        query.eq(CkBillNumber::getBillDate, billDate);
+        List<CkBillNumber> lsBill = ckBillNumberService.list(query);
+        CkBillNumber billNumber = new CkBillNumber();
+        if (lsBill != null && lsBill.size() > 0) {
+            billNumber = lsBill.get(0);
+            billNumber.setBillNumber(billNumber.getBillNumber() + 1);
+        } else {
+            billNumber.setBillDate(billDate);
+            billNumber.setBillPrefix(billPrefix);
+            billNumber.setBillNumber(1L);
+        }
+        ckBillNumberService.saveOrUpdate(billNumber);
+        billNo = billPrefix + billDate + String.format("%04d", billNumber.getBillNumber());
+        return billNo;
+    }
+    
+
+}
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CkBillServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CkBillServiceImpl.java
index 63f99a0..1482912 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CkBillServiceImpl.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/CkBillServiceImpl.java
@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.modules.autogencode.entity.*;
 import com.zbkj.modules.autogencode.service.*;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -50,6 +52,15 @@ public class CkBillServiceImpl extends ServiceImpl<CkBillDao, CkBill> implements
 
     @Resource
     private CmCustService cmCustService;
+    
+    @Resource
+    private CmWarehouseService cmWarehouseService;
+    
+    @Resource
+    private CmShelfService cmShelfService;
+    
+    @Resource
+    private CmStorageLocationService cmStorageLocationService;
     /**
      * 带分页参数的列表查询实现
      */
@@ -179,10 +190,10 @@ public class CkBillServiceImpl extends ServiceImpl<CkBillDao, CkBill> implements
                     CkCargoStock inCargoStock = new CkCargoStock();
                     BeanUtils.copyProperties(ckBillCargo,inCargoStock,"id");
                     inCargoStock.setStockDate(ckBillCargo.getBillDate());
-                    CmStock cmStock = cmStockService.getById(ckBillStock.getStockId());
-                    inCargoStock.setStockId(cmStock.getId());
-                    inCargoStock.setStockCode(cmStock.getStockCode());
-                    inCargoStock.setStockName(cmStock.getStockName());
+                    CmWarehouse cmWarehouse = cmWarehouseService.getById(ckBillStock.getStockId());
+                    inCargoStock.setStockId(cmWarehouse.getId());
+                    inCargoStock.setStockCode(cmWarehouse.getStockCode());
+                    inCargoStock.setStockName(cmWarehouse.getStockName());
                     inCargoStock.setCargoNum(ckBillStock.getCargoNum());
                     inCargoStock.setCargoWt(ckBillStock.getCargoWt());
                     inCargoStock.setCargoVol(ckBillStock.getCargoVol());
@@ -268,7 +279,14 @@ public class CkBillServiceImpl extends ServiceImpl<CkBillDao, CkBill> implements
             ckBillCargo.setVesselId(ckBill.getVesselId());
             ckBillCargo.setVesselName(ckBill.getVesselName());
             ckBillCargo.setVoyageNo(ckBill.getVoyageNo());
-            CmStock cmStock = cmStockService.getById(ckBillCargo.getInStockId());
+
+
+
+            CmWarehouse cmWarehouse = cmWarehouseService.getById(ckBillCargo.getInStockId());
+            CmShelf cmShelf = cmShelfService.getById(ckBillCargo.getShelfId());
+            CmStorageLocation cmStorageLocation = cmStorageLocationService.getById(ckBillCargo.getLocationId());
+
+
             CkBillStock ckBillStock;
             if(ckBillCargo.getId()!=null){
                 ckBillStock = ckBillStockService.getOne(new LambdaQueryWrapper<CkBillStock>().eq(CkBillStock::getBillCargoId,ckBillCargo.getId()));
@@ -277,9 +295,21 @@ public class CkBillServiceImpl extends ServiceImpl<CkBillDao, CkBill> implements
             }
             ckBillCargoService.saveOrUpdate(ckBillCargo);
             ckBillStock.setInoutType("1");
-            ckBillStock.setStockId(cmStock.getId());
-            ckBillStock.setStockName(cmStock.getStockName());
-            ckBillStock.setStockCode(cmStock.getStockCode());
+            ckBillStock.setStockId(cmWarehouse.getId());
+            ckBillStock.setStockName(cmWarehouse.getStockName());
+            ckBillStock.setStockCode(cmWarehouse.getStockCode());
+            
+            // 设置货架信息
+            if(cmShelf != null){
+                ckBillStock.setShelfId(cmShelf.getId());
+                ckBillStock.setShelfName(cmShelf.getShelfName());
+            }
+            
+            // 设置货位信息
+            if(cmStorageLocation != null){
+                ckBillStock.setLocationId(cmStorageLocation.getId());
+                ckBillStock.setLocationName(cmStorageLocation.getStorageLocationName());
+            }
             ckBillStock.setBillNumber(ckBillCargo.getBillNumber());
             ckBillStock.setCargoNum(ckBillCargo.getCargoNum());
             ckBillStock.setCargoWt(ckBillCargo.getCargoWt());
@@ -323,9 +353,9 @@ public class CkBillServiceImpl extends ServiceImpl<CkBillDao, CkBill> implements
         CkStockChange ckStockChange = new CkStockChange();
         BeanUtils.copyProperties(ckBillCargo,ckStockChange,"id");
         ckStockChange.setChangeType(ckBillCargo.getInoutType());
-        CmStock cmStock = cmStockService.getById(ckBillStock.getStockId());
-        ckStockChange.setStockId(cmStock.getId());
-        ckStockChange.setStockName(cmStock.getStockName());
+        CmWarehouse cmWarehouse = cmWarehouseService.getById(ckBillStock.getStockId());
+        ckStockChange.setStockId(cmWarehouse.getId());
+        ckStockChange.setStockName(cmWarehouse.getStockName());
         ckStockChange.setBeforeNum(countStock.getCargoNum());
         ckStockChange.setBeforeWt(countStock.getCargoWt());
         ckStockChange.setBeforeVol(countStock.getCargoVol());
diff --git a/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/CkBillNumberDao.xml b/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/CkBillNumberDao.xml
new file mode 100644
index 0000000..e9c304e
--- /dev/null
+++ b/crmeb/crmeb-admin/src/main/resources/mapper/autogencode/CkBillNumberDao.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.zbkj.modules.autogencode.dao.CkBillNumberDao">
+
+	<!-- 根据包名 模块名 以及类名 生成Mapper XML 配置文件 -->
+    <resultMap type="com.zbkj.modules.autogencode.entity.CkBillNumber" id="ckBillNumberMap">
+        <result property="id" column="id"/>
+        <result property="billPrefix" column="bill_prefix"/>
+        <result property="billDate" column="bill_date"/>
+        <result property="billNumber" column="bill_number"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createDept" column="create_dept"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="tenantId" column="tenant_id"/>
+    </resultMap>
+
+
+</mapper>
diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/DateUtils.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/DateUtils.java
new file mode 100644
index 0000000..458de04
--- /dev/null
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/DateUtils.java
@@ -0,0 +1,204 @@
+package com.zbkj.common.utils;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.util.Date;
+
+/**
+ * 时间工具类
+ *
+ * @author bs
+ */
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils
+{
+    public static String YYYY = "yyyy";
+
+    public static String YYYY_MM = "yyyy-MM";
+
+    public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+    private static String[] parsePatterns = {
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+    /**
+     * 获取当前Date型日期
+     *
+     * @return Date() 当前日期
+     */
+    public static Date getNowDate()
+    {
+        return new Date();
+    }
+
+    /**
+     * 获取当前日期, 默认格式为yyyy-MM-dd
+     *
+     * @return String
+     */
+    public static String getDate()
+    {
+        return dateTimeNow(YYYY_MM_DD);
+    }
+
+    public static final String getTime()
+    {
+        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    public static final String dateTimeNow()
+    {
+        return dateTimeNow(YYYYMMDDHHMMSS);
+    }
+
+    public static final String dateTimeNow(final String format)
+    {
+        return parseDateToStr(format, new Date());
+    }
+
+    public static final String dateTime(final Date date)
+    {
+        return parseDateToStr(YYYY_MM_DD, date);
+    }
+
+    public static final String parseDateToStr(final String format, final Date date)
+    {
+        return new SimpleDateFormat(format).format(date);
+    }
+
+    public static final Date dateTime(final String format, final String ts)
+    {
+        try
+        {
+            return new SimpleDateFormat(format).parse(ts);
+        }
+        catch (ParseException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 日期路径 即年/月/日 如2018/08/08
+     */
+    public static final String datePath()
+    {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyy/MM/dd");
+    }
+
+    /**
+     * 日期路径 即年/月/日 如20180808
+     */
+    public static final String dateTime()
+    {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyyMMdd");
+    }
+
+    /**
+     * 日期型字符串转化为日期 格式
+     */
+    public static Date parseDate(Object str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        try
+        {
+            return parseDate(str.toString(), parsePatterns);
+        }
+        catch (ParseException e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * 获取服务器启动时间
+     */
+    public static Date getServerStartDate()
+    {
+        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+        return new Date(time);
+    }
+
+    /**
+     * 计算相差天数
+     */
+    public static int differentDaysByMillisecond(Date date1, Date date2)
+    {
+        return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+    }
+
+    /**
+     * 计算时间差
+     *
+     * @param endDate 最后时间
+     * @param startTime 开始时间
+     * @return 时间差（天/小时/分钟）
+     */
+    public static String timeDistance(Date endDate, Date startTime)
+    {
+        long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = endDate.getTime() - startTime.getTime();
+        // 计算差多少天
+        long day = diff / nd;
+        // 计算差多少小时
+        long hour = diff % nd / nh;
+        // 计算差多少分钟
+        long min = diff % nd % nh / nm;
+        // 计算差多少秒//输出结果
+        // long sec = diff % nd % nh % nm / ns;
+        return day + "天" + hour + "小时" + min + "分钟";
+    }
+
+    public static String getTimeDesc(long time) {
+        //long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+        long ns = 1000;
+
+        //long day = time / nd;
+        // 计算差多少小时
+        long hour = time / nh;
+        // 计算差多少分钟
+        long min = time % nh / nm;
+        // 计算差多少秒//输出结果
+        long sec = time % nh % nm / ns;
+        return hour + ":" + min + ":" + sec;
+    }
+
+    /**
+     * 增加 LocalDateTime ==> Date
+     */
+    public static Date toDate(LocalDateTime temporalAccessor)
+    {
+        ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+
+    /**
+     * 增加 LocalDate ==> Date
+     */
+    public static Date toDate(LocalDate temporalAccessor)
+    {
+        LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
+        ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+}