From 5ff73face224eec6196d809b447597c3ec7a0b0a Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 23 Jan 2024 15:16:52 +0800
Subject: [PATCH 01/64] =?UTF-8?q?=E4=BB=93=E5=82=A8=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/heli/warehouse/WarehouseForm.vue    | 74 +++++++++++++------
 1 file changed, 50 insertions(+), 24 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
index fabfb8eb..01d841b1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
@@ -1,6 +1,12 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="108px" v-loading="formLoading">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="108px"
+      v-loading="formLoading"
+    >
       <el-form-item label="仓库编号" prop="whNo">
         <el-input v-model="formData.whNo" disabled class="!w-500px" />
       </el-form-item>
@@ -9,10 +15,25 @@
       </el-form-item>
       <el-form-item label="联系人" prop="contact">
         <!-- <el-input v-model="formData.contact" placeholder="请输入联系人" class="!w-500px" /> -->
-        <el-select v-model="formData.contact" placeholder="请输入联系人" :remote-method="remoteUserSearch" remote-show-suffix
-          remote clearable reserve-keyword filterable :loading="userSelectLoading" class="!w-500px" @change="handleContact">
-          <el-option v-for="item in userSelectList" :key="item.id" :label="item.username + ' ' + item.nickname"
-            :value="item.id" />
+        <el-select
+          v-model="formData.contact"
+          placeholder="请输入联系人"
+          :remote-method="remoteUserSearch"
+          remote-show-suffix
+          remote
+          clearable
+          reserve-keyword
+          filterable
+          :loading="userSelectLoading"
+          class="!w-500px"
+          @change="handleContact"
+        >
+          <el-option
+            v-for="item in userSelectList"
+            :key="item.id"
+            :label="item.username + ' ' + item.nickname"
+            :value="item.id"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="联系电话" prop="telephone">
@@ -20,7 +41,11 @@
       </el-form-item>
       <el-form-item label="状态" prop="whStatus">
         <el-radio-group v-model="formData.whStatus">
-          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)" :key="dict.value" :label="dict.value">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
@@ -35,8 +60,8 @@
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as WarehouseApi from '@/api/heli/warehouse'
-import * as UserApi from "@/api/system/user";
-import { fromPairs } from 'lodash-es';
+import * as UserApi from '@/api/system/user'
+import { fromPairs } from 'lodash-es'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -45,32 +70,34 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
+const formData: any = ref({
   id: undefined,
   whNo: undefined,
   whName: undefined,
   contact: undefined,
   telephone: undefined,
-  whStatus: 1,
+  whStatus: 1
 })
 const formRules = reactive({
-  whName: [{ required: true, message: '仓库名称，唯一不能为空', trigger: 'blur' }],
+  whName: [{ required: true, message: '仓库名称，唯一不能为空', trigger: 'blur' }]
   // whStatus: [{ required: true, message: '状态,1 表示正常，2 表示禁用不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const userSelectList = ref<UserApi.UserVO[]>([])
-const userSelectLoading = ref(false);
+const userSelectLoading = ref(false)
 const remoteUserSearch = (query: string) => {
   if (query) {
     userSelectLoading.value = true
     setTimeout(() => {
       userSelectLoading.value = false
       userSelectList.value = userList.value.filter((item) => {
-        return item.nickname.toLowerCase().includes(query.toLowerCase()) || item.username.toLowerCase().includes(query.toLowerCase())
+        return (
+          item.nickname.toLowerCase().includes(query.toLowerCase()) ||
+          item.username.toLowerCase().includes(query.toLowerCase())
+        )
       })
-     
     }, 200)
   } else {
     userSelectList.value = userList.value
@@ -78,13 +105,11 @@ const remoteUserSearch = (query: string) => {
 }
 /** 搜索按钮操作 */
 const handleContact = (uid) => {
-  
   var mobileUser = userList.value.find((item) => {
-        return item.id === uid
-      })
+    return item.id === uid
+  })
 
   formData.value.telephone = mobileUser?.mobile
-
 }
 
 /** 打开弹窗 */
@@ -98,22 +123,23 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await WarehouseApi.getWarehouse(id)
-
       formData.value.contact = Number(formData.value.contact)
+      if (formData.value.contact == 0) {
+        formData.value.contact = undefined
+      }
     } finally {
       formLoading.value = false
     }
-
   }
   // 获得用户列表
   let userParams = {
     pageNo: 1,
     pageSize: 10,
-    status: "0"
+    status: '0'
   }
   const data = await UserApi.getUserPage(userParams)
-  userList.value = data.list;
-  userSelectList.value = data.list;
+  userList.value = data.list
+  userSelectList.value = data.list
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -149,7 +175,7 @@ const resetForm = () => {
     whName: undefined,
     contact: undefined,
     telephone: undefined,
-    whStatus: 1,
+    whStatus: 1
   }
   formRef.value?.resetFields()
 }

From 35f26f57ac1cabf05421e18efbe846707394afbd Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 23 Jan 2024 15:31:48 +0800
Subject: [PATCH 02/64] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=20=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E6=B5=AE=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss  |  33 +-
 .../src/views/heli/storage/StorageForm.vue    |  28 +-
 .../src/views/heli/storage/StorageOut.vue     | 778 +++++++++---------
 3 files changed, 436 insertions(+), 403 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index 5b766755..04a31c34 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -17,7 +17,8 @@
 }
 
 .hl-card {
-  margin: 0px;
+  position: relative;
+  padding-bottom: 100px;
   border-radius: 10px !important;
   .el-card__header {
     background-color: #f7f8fa;
@@ -34,6 +35,23 @@
       font-size: 20px !important;
     }
   }
+
+  .hl-card-scrollable-content {
+    width: 100%;
+    box-sizing: border-box;
+    max-height: calc(100vh - 300px); overflow-y: auto;
+  }
+  .hl-footer {
+    width: 96%;
+    background-color: #fff;
+    position: absolute !important;
+    left: 50%;
+    height: 100px;
+    line-height: 100px;
+    transform: translateX(-51%);
+    bottom: 0px;
+    z-index: 1000;
+  }
 }
 .borderxx {
   border: none !important;
@@ -48,7 +66,7 @@
 .hl-table thead {
   color: #1d2129;
 }
-.hl-table_header{
+.hl-table_header {
   color: red;
 }
 .hl-table thead th.el-table__cell {
@@ -88,7 +106,7 @@
   border: none !important;
 
   .el-card__header {
-    padding: 16px 0px;
+    padding-bottom: 16px ;
     background-color: inherit;
 
     .hl-card-info-icona {
@@ -106,14 +124,13 @@
 
   .el-card__body {
     padding: 15px 0px;
-
     .el-row {
       margin: 10px;
     }
   }
 }
 .hl-incard {
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   padding: 0 20px;
 }
 
@@ -121,9 +138,6 @@
   margin: 10px 0px 10px 0px !important;
 }
 
-.hl-footer {
-  margin: 30px 0;
-}
 .abstatus {
   position: absolute;
   right: 80px;
@@ -145,7 +159,6 @@
   }
 }
 
-
 /* ---el-table滚动条公共样式--- */
 .el-scrollbar {
   // 横向滚动条
@@ -168,4 +181,4 @@
     // background-color: rgba(136, 219, 255, 1);
     box-shadow: 0 0 6px rgba(0, 0, 0, 0.15);
   }
-}
\ No newline at end of file
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index ad5b8802..b4c723bf 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -4,6 +4,7 @@
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
+    <div class="hl-card-scrollable-content" >
     <el-form
       ref="formRef"
       :model="formData"
@@ -133,7 +134,7 @@
                 v-loading="subFormLoading"
                 label-width="0"
               >
-                <el-table :data="formData.matItemDOList" class="hl-table" >
+                <el-table :data="formData.matItemDOList" class="hl-table">
                   <el-table-column prop="cid" label="序号" min-width="80" align="center" fixed />
                   <el-table-column prop="matId" min-width="140" align="center">
                     <template #header> <span class="hl-table_header">*</span> 物料编码 </template>
@@ -275,7 +276,7 @@
                       <el-input v-model="scope.row.projectNo" />
                     </template>
                   </el-table-column>
-                  <el-table-column prop="description" label="备注" align="center" min-width="180" >
+                  <el-table-column prop="description" label="备注" align="center" min-width="180">
                     <template #default="scope">
                       <el-input v-model="scope.row.description" />
                     </template>
@@ -420,6 +421,7 @@
         </el-row>
       </el-card>
     </el-form>
+    </div>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
       <el-button
@@ -517,10 +519,9 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
-
   // 校验表单
   await formRef.value.validate()
-  if(formData.value.matItemDOList.length === 0){
+  if (formData.value.matItemDOList.length === 0) {
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -576,10 +577,9 @@ const handleStatus = async (num) => {
     isShowBtnOther.value = false
     isShowBtnDelete.value = false
   }
-  query.type= 'update'
+  query.type = 'update'
   query.id = formData.value.id
   reload()
-
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -642,7 +642,7 @@ var commonResult = ''
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
-const saveFormData = async () =>{
+const saveFormData = async () => {
   // 提交请求
   formLoading.value = true
   try {
@@ -671,7 +671,6 @@ const saveFormData = async () =>{
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
-
   } finally {
     formLoading.value = false
   }
@@ -679,7 +678,7 @@ const saveFormData = async () =>{
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  if(formData.value.matItemDOList.length === 0){
+  if (formData.value.matItemDOList.length === 0) {
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -693,11 +692,11 @@ const submitForm = async () => {
   await saveFormData()
 
   // 成功后刷新
-  query.type= 'update'
+  query.type = 'update'
   query.id = storageid.value
   formData.value.id = storageid.value
   //页面重新加载
-  reload();
+  reload()
 }
 
 var matCount = 1
@@ -866,7 +865,6 @@ onMounted(async () => {
       isShowBtnDelete.value = false
     }
 
-
     //获得库区列表
     const queryParamsRg = reactive({
       pageNo: 1,
@@ -930,10 +928,14 @@ onMounted(async () => {
   //用户信息
   userList.value = await UserApi.getSimpleUserList()
 })
+
+
 </script>
-<style>
+<style setup lang="scss">
 a {
   color: #409eff;
   text-decoration: none;
 }
+
+
 </style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 80439a0e..81a46ac8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -4,256 +4,272 @@
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-      v-bind:disabled="isShowBtnOther"
-    >
-      <!--  基础信息   -->
-      <el-card class="hl-card-info">
-        <template #header>
-          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
-        </template>
-        <el-row>
-          <el-col :span="8">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="name" label="出库单号">
-                  <el-input v-model="formData.stockNo" disabled placeholder="系统自动生成" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="stockInType" label="出库类型">
-                  <el-select v-model="formData.stockInType" clearable style="width: 100%">
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-col>
-          <el-col :span="8">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="industry" label="单据状态">
-                  <el-select
-                    v-model="formData.status"
-                    placeholder="下拉选择"
-                    clearable
-                    class="!w-700px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="headerNo" label="上游单号">
-                  <el-input v-model="formData.headerNo" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-col>
-          <el-col :span="8">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="单据日期" prop="createTime">
-                  {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="whId" label="出库仓库" required>
-                  <el-select
-                    v-model="formData.whId"
-                    placeholder="下拉选择"
-                    clearable
-                    class="!w-400px"
-                    @change="handleWh"
-                    v-bind:disabled="btnWhClickable"
+    <div class="hl-card-scrollable-content">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+        v-loading="formLoading"
+        v-bind:disabled="isShowBtnOther"
+      >
+        <!--  基础信息   -->
+        <el-card class="hl-card-info">
+          <template #header>
+            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
+          </template>
+          <el-row>
+            <el-col :span="8">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item prop="name" label="出库单号">
+                    <el-input v-model="formData.stockNo" disabled placeholder="系统自动生成" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item prop="stockInType" label="出库类型">
+                    <el-select v-model="formData.stockInType" clearable style="width: 100%">
+                      <el-option
+                        v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE)"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+            <el-col :span="8">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item prop="industry" label="单据状态">
+                    <el-select
+                      v-model="formData.status"
+                      placeholder="下拉选择"
+                      clearable
+                      class="!w-700px"
+                      disabled
+                    >
+                      <el-option
+                        v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item prop="headerNo" label="上游单号">
+                    <el-input v-model="formData.headerNo" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+            <el-col :span="8">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="单据日期" prop="createTime">
+                    {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item prop="whId" label="出库仓库" required>
+                    <el-select
+                      v-model="formData.whId"
+                      placeholder="下拉选择"
+                      clearable
+                      class="!w-400px"
+                      @change="handleWh"
+                      v-bind:disabled="btnWhClickable"
+                    >
+                      <el-option
+                        v-for="dict in warehouseList"
+                        :key="dict.id"
+                        :label="dict.whName"
+                        :value="dict.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="description">
+                <el-input
+                  type="textarea"
+                  v-model="formData.description"
+                  show-word-limit
+                  maxlength="200"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+        <!--  物料信息   -->
+        <el-card class="hl-card-info">
+          <template #header>
+            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物料信息</span>
+          </template>
+          <el-row>
+            <el-col>
+              <el-card class="hl-incard">
+                <el-col>
+                  <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
+                    >新增</el-button
                   >
-                    <el-option
-                      v-for="dict in warehouseList"
-                      :key="dict.id"
-                      :label="dict.whName"
-                      :value="dict.id"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="description">
-              <el-input
-                type="textarea"
-                v-model="formData.description"
-                show-word-limit
-                maxlength="200"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-card>
-      <!--  物料信息   -->
-      <el-card class="hl-card-info">
-        <template #header>
-          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物料信息</span>
-        </template>
-        <el-row>
-          <el-col>
-            <el-card class="hl-incard">
-              <el-col>
-                <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
-                  >新增</el-button
+                </el-col>
+                <el-form
+                  ref="matSubFormRef"
+                  :model="formData.matItemDOList"
+                  :rules="subFormRules"
+                  v-loading="subFormLoading"
+                  label-width="0"
                 >
-              </el-col>
-              <el-form
-                ref="matSubFormRef"
-                :model="formData.matItemDOList"
-                :rules="subFormRules"
-                v-loading="subFormLoading"
-                label-width="0"
-              >
-                <el-table :data="formData.matItemDOList" class="hl-table">
-                  <el-table-column prop="cid" label="序号" :width="80" />
-                  <el-table-column prop="matId" min-width="140" align="center">
-                    <template #header> <span class="hl-table_header">*</span>物料名称 </template>
-                    <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.matId`"
-                        :rules="subFormRules.matId"
-                        class="mb-0px!"
-                      >
-                        <el-select
-                          v-model="scope.row.matId"
-                          placeholder="物料名称"
-                          :remote-method="remoteMatCodeSearch"
-                          remote-show-suffix
-                          remote
-                          clearable
-                          reserve-keyword
-                          filterable
-                          :loading="matSelectLoading"
-                          @change="(val) => handleMatCode(scope, val)"
-                          class="!w-180px"
+                  <el-table :data="formData.matItemDOList" class="hl-table">
+                    <el-table-column prop="cid" label="序号" :width="80" />
+                    <el-table-column prop="matId" min-width="140" align="center">
+                      <template #header> <span class="hl-table_header">*</span>物料名称 </template>
+                      <template #default="scope">
+                        <el-form-item
+                          :prop="`${scope.$index}.matId`"
+                          :rules="subFormRules.matId"
+                          class="mb-0px!"
                         >
-                          <el-option
-                            v-for="item in matList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
-                  <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
-                    <template #default="scope">
-                      <dict-tag
-                        :type="DICT_TYPE.HELI_MATERIAL_TYPE"
-                        :value="scope.row.matType"
-                        v-if="scope.row.matType ? true : false"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
+                          <el-select
+                            v-model="scope.row.matId"
+                            placeholder="物料名称"
+                            :remote-method="remoteMatCodeSearch"
+                            remote-show-suffix
+                            remote
+                            clearable
+                            reserve-keyword
+                            filterable
+                            :loading="matSelectLoading"
+                            @change="(val) => handleMatCode(scope, val)"
+                            class="!w-180px"
+                          >
+                            <el-option
+                              v-for="item in matList"
+                              :key="item.id"
+                              :label="item.name"
+                              :value="item.id"
+                            />
+                          </el-select>
+                        </el-form-item>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      prop="matCode"
+                      label="物料编码"
+                      min-width="120"
+                      align="center"
+                    />
+                    <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
+                      <template #default="scope">
+                        <dict-tag
+                          :type="DICT_TYPE.HELI_MATERIAL_TYPE"
+                          :value="scope.row.matType"
+                          v-if="scope.row.matType ? true : false"
+                        />
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      prop="matSpec"
+                      label="规格/型号"
+                      min-width="120"
+                      align="center"
+                    />
 
-                  <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
-                    <template #default="scope">
-                      <dict-tag
-                        :type="DICT_TYPE.HELI_MATERIAL_UNIT"
-                        :value="scope.row.matUnit"
-                        v-if="scope.row.matUnit ? true : false"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="rgId" min-width="120" align="center">
-                    <template #header> <span class="hl-table_header">*</span>出库库区 </template>
-                    <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.rgId`"
-                        :rules="subFormRules.rgId"
-                        class="mb-0px!"
-                      >
-                        <el-select
-                          v-model="scope.row.rgId"
-                          placeholder=""
-                          style="width: 100%"
-                          @change="handleRg(scope)"
-                          disabled=""
+                    <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
+                      <template #default="scope">
+                        <dict-tag
+                          :type="DICT_TYPE.HELI_MATERIAL_UNIT"
+                          :value="scope.row.matUnit"
+                          v-if="scope.row.matUnit ? true : false"
+                        />
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="rgId" min-width="120" align="center">
+                      <template #header> <span class="hl-table_header">*</span>出库库区 </template>
+                      <template #default="scope">
+                        <el-form-item
+                          :prop="`${scope.$index}.rgId`"
+                          :rules="subFormRules.rgId"
+                          class="mb-0px!"
                         >
-                          <el-option
-                            v-for="dict in rgList"
-                            :key="dict.id"
-                            :label="dict.rgName"
-                            :value="dict.id"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="pnId" min-width="140" align="center">
-                       <template #header> <span class="hl-table_header">*</span>出库库位 </template>
-                    <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.pnId`"
-                        :rules="subFormRules.pnId"
-                        class="mb-0px!"
-                      >
-                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
-                          <el-option
-                            v-for="dict in scope.row.pnlist"
-                            :key="dict.id"
-                            :label="dict.pnName"
-                            :value="dict.id"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="matRest" label="库存数量" min-width="120" align="center" />
-                  <el-table-column prop="storageOkQty" min-width="120" align="center">
-                    <template #header> <span class="hl-table_header">*</span>出库数量</template>
-                    <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.storageOkQty`"
-                        :rules="subFormRules.storageOkQty"
-                        class="mb-0px!"
-                      >
-                        <el-input v-model="scope.row.storageOkQty" />
-                      </el-form-item>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
-                  <el-table-column prop="description" min-width="180" label="备注" align="center">
-                    <template #default="scope">
-                      <el-input v-model="scope.row.description" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" align="center" width="240">
-                    <template #default="scope">
-                      <!-- <el-button v-if="!scope.row.editable" type="primary" size="small" link
+                          <el-select
+                            v-model="scope.row.rgId"
+                            placeholder=""
+                            style="width: 100%"
+                            @change="handleRg(scope)"
+                            disabled=""
+                          >
+                            <el-option
+                              v-for="dict in rgList"
+                              :key="dict.id"
+                              :label="dict.rgName"
+                              :value="dict.id"
+                            />
+                          </el-select>
+                        </el-form-item>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="pnId" min-width="140" align="center">
+                      <template #header> <span class="hl-table_header">*</span>出库库位 </template>
+                      <template #default="scope">
+                        <el-form-item
+                          :prop="`${scope.$index}.pnId`"
+                          :rules="subFormRules.pnId"
+                          class="mb-0px!"
+                        >
+                          <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
+                            <el-option
+                              v-for="dict in scope.row.pnlist"
+                              :key="dict.id"
+                              :label="dict.pnName"
+                              :value="dict.id"
+                            />
+                          </el-select>
+                        </el-form-item>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      prop="matRest"
+                      label="库存数量"
+                      min-width="120"
+                      align="center"
+                    />
+                    <el-table-column prop="storageOkQty" min-width="120" align="center">
+                      <template #header> <span class="hl-table_header">*</span>出库数量</template>
+                      <template #default="scope">
+                        <el-form-item
+                          :prop="`${scope.$index}.storageOkQty`"
+                          :rules="subFormRules.storageOkQty"
+                          class="mb-0px!"
+                        >
+                          <el-input v-model="scope.row.storageOkQty" />
+                        </el-form-item>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
+                    <el-table-column prop="description" min-width="180" label="备注" align="center">
+                      <template #default="scope">
+                        <el-input v-model="scope.row.description" />
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" align="center" width="240">
+                      <template #default="scope">
+                        <!-- <el-button v-if="!scope.row.editable" type="primary" size="small" link
                         @click="handleEdit(scope.$index)">
                         编辑
                       </el-button>
@@ -262,136 +278,137 @@
                       </el-button>
 
                       <el-button link type="primary" @click="handlefuke(scope.$index, scope.row)">复制</el-button> -->
+                        <el-button
+                          link
+                          type="danger"
+                          size="small"
+                          @click.prevent="handleDelete2(scope.$index)"
+                          v-if="isShowBtnDelete"
+                        >
+                          删除
+                        </el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-card>
+        <!--  附件信息   -->
+        <el-card class="hl-card-info">
+          <template #header>
+            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
+          </template>
+          <el-row>
+            <el-col>
+              <el-card class="hl-incard">
+                <el-col>
+                  <el-upload
+                    ref="matUploadRef"
+                    :file-list="matUploadFiles"
+                    multiple
+                    :limit="10"
+                    :action="uploadUrl"
+                    :headers="{
+                      Authorization: 'Bearer ' + getAccessToken(),
+                      'tenant-id': getTenantId()
+                    }"
+                    name="files"
+                    :show-file-list="false"
+                    :auto-upload="false"
+                    :data="matUploadData"
+                    :on-change="matUploadChange"
+                    class="upload-file-uploader"
+                  >
+                    <el-button type="primary"> <Icon icon="ep:upload-filled" />上传 </el-button>
+                  </el-upload>
+                </el-col>
+                <el-table :data="formData.attachments" class="hl-table">
+                  <el-table-column prop="name" label="文件名称" align="center">
+                    <!-- <template #default="scope">
+                    <a :href="scope.row.url" target="_blank" style="color: #409eff">{{ scope.row.name }} </a>
+                  </template> -->
+                  </el-table-column>
+
+                  <el-table-column
+                    prop="createTime"
+                    align="center"
+                    label="上传日期"
+                    :formatter="dateFormatter"
+                  />
+
+                  <el-table-column label="操作" align="center">
+                    <template #default="scope">
                       <el-button
                         link
                         type="danger"
                         size="small"
-                        @click.prevent="handleDelete2(scope.$index)"
                         v-if="isShowBtnDelete"
+                        @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
                       >
                         删除
                       </el-button>
+                      <el-button
+                        link
+                        type="primary"
+                        size="small"
+                        @click="downloadAttachment(scope.row.name, scope.row.url)"
+                      >
+                        下载
+                      </el-button>
                     </template>
                   </el-table-column>
                 </el-table>
-              </el-form>
-            </el-card>
-          </el-col>
-        </el-row>
-      </el-card>
-      <!--  附件信息   -->
-      <el-card class="hl-card-info">
-        <template #header>
-          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
-        </template>
-        <el-row>
-          <el-col>
-            <el-card class="hl-incard">
-              <el-col>
-                <el-upload
-                  ref="matUploadRef"
-                  :file-list="matUploadFiles"
-                  multiple
-                  :limit="10"
-                  :action="uploadUrl"
-                  :headers="{
-                    Authorization: 'Bearer ' + getAccessToken(),
-                    'tenant-id': getTenantId()
-                  }"
-                  name="files"
-                  :show-file-list="false"
-                  :auto-upload="false"
-                  :data="matUploadData"
-                  :on-change="matUploadChange"
-                  class="upload-file-uploader"
-                >
-                  <el-button type="primary"> <Icon icon="ep:upload-filled" />上传 </el-button>
-                </el-upload>
-              </el-col>
-              <el-table :data="formData.attachments" class="hl-table">
-                <el-table-column prop="name" label="文件名称" align="center">
-                  <!-- <template #default="scope">
-                    <a :href="scope.row.url" target="_blank" style="color: #409eff">{{ scope.row.name }} </a>
-                  </template> -->
-                </el-table-column>
-
-                <el-table-column
-                  prop="createTime"
-                  align="center"
-                  label="上传日期"
-                  :formatter="dateFormatter"
-                />
-
-                <el-table-column label="操作" align="center">
-                  <template #default="scope">
-                    <el-button
-                      link
-                      type="danger"
-                      size="small"
-                      v-if="isShowBtnDelete"
-                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
-                    >
-                      删除
-                    </el-button>
-                    <el-button
-                      link
-                      type="primary"
-                      size="small"
-                      @click="downloadAttachment(scope.row.name, scope.row.url)"
-                    >
-                      下载
-                    </el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-card>
-          </el-col>
-        </el-row>
-      </el-card>
-      <!--  系统信息   -->
-      <el-card class="hl-card-info">
-        <template #header>
-          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
-        </template>
-
-        <el-row justify="center">
-          <el-col :span="8">
-            <el-form-item prop="creator" label="创建人">
-              {{ userList.find((user) => user.id == formData.creator)?.nickname }}
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="createTime" label="创建时间">
-              {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row justify="center">
-          <el-col :span="8">
-            <el-form-item prop="outbound" label="出库人">
-              {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="outboundTime" label="出库时间">
-              {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row justify="center">
-          <el-col :span="8">
-            <el-form-item prop="cancel" label="作废人">
-              {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="cancelTime" label="作废时间">
-              {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-card>
-    </el-form>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-card>
+        <!--  系统信息   -->
+        <el-card class="hl-card-info">
+          <template #header>
+            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
+          </template>
+
+          <el-row justify="center">
+            <el-col :span="8">
+              <el-form-item prop="creator" label="创建人">
+                {{ userList.find((user) => user.id == formData.creator)?.nickname }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="createTime" label="创建时间">
+                {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row justify="center">
+            <el-col :span="8">
+              <el-form-item prop="outbound" label="出库人">
+                {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="outboundTime" label="出库时间">
+                {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row justify="center">
+            <el-col :span="8">
+              <el-form-item prop="cancel" label="作废人">
+                {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="cancelTime" label="作废时间">
+                {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-form>
+    </div>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
       <el-button
@@ -489,10 +506,9 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
-
   // 校验表单
   await formRef.value.validate()
-  if(formData.value.matItemDOList.length === 0){
+  if (formData.value.matItemDOList.length === 0) {
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -547,7 +563,7 @@ const handleStatus = async (num) => {
     isShowBtnDelete.value = false
   }
   query.id = storageid.value
-  query.type= 'update'
+  query.type = 'update'
   reload()
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
@@ -611,7 +627,7 @@ var commonResult = ''
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
-const saveFormData = async () =>{
+const saveFormData = async () => {
   //获取最新库存信息
   const matCurrentData = await StorageMatApi.getStorageMatList()
   var hasRestNum = true
@@ -660,9 +676,6 @@ const saveFormData = async () =>{
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
-
-    
-   
   } finally {
     formLoading.value = false
   }
@@ -670,7 +683,7 @@ const saveFormData = async () =>{
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  if(formData.value.matItemDOList.length === 0){
+  if (formData.value.matItemDOList.length === 0) {
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -684,7 +697,7 @@ const submitForm = async () => {
   await saveFormData()
   // 成功后刷新
   query.id = storageid.value
-  query.type= 'update'
+  query.type = 'update'
   reload()
 }
 
@@ -712,7 +725,6 @@ const onAddItem = () => {
     }
     matCount = matCount + 1
 
-
     formData.value.matItemDOList.push(newData)
   } else {
     message.alertWarning('请选择出库仓库')
@@ -748,11 +760,14 @@ const handleWh = async (wid) => {
   let matParams = {
     pageNo: 1,
     pageSize: 99,
-    status: "1"
+    status: '1'
   }
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined)
+  matList.value = dataMat.list.filter(
+    (item) =>
+      matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
+  )
 
   formData.value.matItemDOList = []
   // formData.value.matItemDOList.forEach(item => {
@@ -792,7 +807,12 @@ const remoteMatCodeSearch = async (name) => {
 
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined)
+  matList.value = dataMat.list.filter(
+    (item) =>
+      matLastRemoteData.find(
+        (fish) => fish.matId === item.id && fish.whId == formData.value.whId
+      ) !== undefined
+  )
   matSelectLoading.value = false
 }
 
@@ -840,7 +860,7 @@ const handleMatCode = async (scope, matid) => {
 const isShowBtnGroup = ref(true)
 const isShowBtnCancel = ref(false)
 const isShowBtnOther = ref(false)
-const isShowBtnDelete  = ref(true)
+const isShowBtnDelete = ref(true)
 const btnWhClickable = ref(false)
 const matLastData = ref([])
 /** 初始化 **/
@@ -862,8 +882,6 @@ onMounted(async () => {
   dialogTitle.value = t('action.' + query.type)
   dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
 
- 
-
   //-------------------仓库全数据
   const data = await WarehouseApi.getWarehouseSimpList()
   warehouseList.value = data

From ec7b88664240896cc1fb4303446c9f81e20a3e33 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 23 Jan 2024 16:16:28 +0800
Subject: [PATCH 03/64] =?UTF-8?q?=E5=9B=9E=E9=80=80=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss  |  33 +-
 .../src/views/heli/storage/StorageForm.vue    |  28 +-
 .../src/views/heli/storage/StorageOut.vue     | 778 +++++++++---------
 3 files changed, 403 insertions(+), 436 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index 04a31c34..5b766755 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -17,8 +17,7 @@
 }
 
 .hl-card {
-  position: relative;
-  padding-bottom: 100px;
+  margin: 0px;
   border-radius: 10px !important;
   .el-card__header {
     background-color: #f7f8fa;
@@ -35,23 +34,6 @@
       font-size: 20px !important;
     }
   }
-
-  .hl-card-scrollable-content {
-    width: 100%;
-    box-sizing: border-box;
-    max-height: calc(100vh - 300px); overflow-y: auto;
-  }
-  .hl-footer {
-    width: 96%;
-    background-color: #fff;
-    position: absolute !important;
-    left: 50%;
-    height: 100px;
-    line-height: 100px;
-    transform: translateX(-51%);
-    bottom: 0px;
-    z-index: 1000;
-  }
 }
 .borderxx {
   border: none !important;
@@ -66,7 +48,7 @@
 .hl-table thead {
   color: #1d2129;
 }
-.hl-table_header {
+.hl-table_header{
   color: red;
 }
 .hl-table thead th.el-table__cell {
@@ -106,7 +88,7 @@
   border: none !important;
 
   .el-card__header {
-    padding-bottom: 16px ;
+    padding: 16px 0px;
     background-color: inherit;
 
     .hl-card-info-icona {
@@ -124,13 +106,14 @@
 
   .el-card__body {
     padding: 15px 0px;
+
     .el-row {
       margin: 10px;
     }
   }
 }
 .hl-incard {
-  margin-bottom: 10px;
+  margin-bottom: 20px;
   padding: 0 20px;
 }
 
@@ -138,6 +121,9 @@
   margin: 10px 0px 10px 0px !important;
 }
 
+.hl-footer {
+  margin: 30px 0;
+}
 .abstatus {
   position: absolute;
   right: 80px;
@@ -159,6 +145,7 @@
   }
 }
 
+
 /* ---el-table滚动条公共样式--- */
 .el-scrollbar {
   // 横向滚动条
@@ -181,4 +168,4 @@
     // background-color: rgba(136, 219, 255, 1);
     box-shadow: 0 0 6px rgba(0, 0, 0, 0.15);
   }
-}
+}
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index b4c723bf..ad5b8802 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -4,7 +4,6 @@
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
-    <div class="hl-card-scrollable-content" >
     <el-form
       ref="formRef"
       :model="formData"
@@ -134,7 +133,7 @@
                 v-loading="subFormLoading"
                 label-width="0"
               >
-                <el-table :data="formData.matItemDOList" class="hl-table">
+                <el-table :data="formData.matItemDOList" class="hl-table" >
                   <el-table-column prop="cid" label="序号" min-width="80" align="center" fixed />
                   <el-table-column prop="matId" min-width="140" align="center">
                     <template #header> <span class="hl-table_header">*</span> 物料编码 </template>
@@ -276,7 +275,7 @@
                       <el-input v-model="scope.row.projectNo" />
                     </template>
                   </el-table-column>
-                  <el-table-column prop="description" label="备注" align="center" min-width="180">
+                  <el-table-column prop="description" label="备注" align="center" min-width="180" >
                     <template #default="scope">
                       <el-input v-model="scope.row.description" />
                     </template>
@@ -421,7 +420,6 @@
         </el-row>
       </el-card>
     </el-form>
-    </div>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
       <el-button
@@ -519,9 +517,10 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
+
   // 校验表单
   await formRef.value.validate()
-  if (formData.value.matItemDOList.length === 0) {
+  if(formData.value.matItemDOList.length === 0){
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -577,9 +576,10 @@ const handleStatus = async (num) => {
     isShowBtnOther.value = false
     isShowBtnDelete.value = false
   }
-  query.type = 'update'
+  query.type= 'update'
   query.id = formData.value.id
   reload()
+
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -642,7 +642,7 @@ var commonResult = ''
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
-const saveFormData = async () => {
+const saveFormData = async () =>{
   // 提交请求
   formLoading.value = true
   try {
@@ -671,6 +671,7 @@ const saveFormData = async () => {
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
+
   } finally {
     formLoading.value = false
   }
@@ -678,7 +679,7 @@ const saveFormData = async () => {
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  if (formData.value.matItemDOList.length === 0) {
+  if(formData.value.matItemDOList.length === 0){
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -692,11 +693,11 @@ const submitForm = async () => {
   await saveFormData()
 
   // 成功后刷新
-  query.type = 'update'
+  query.type= 'update'
   query.id = storageid.value
   formData.value.id = storageid.value
   //页面重新加载
-  reload()
+  reload();
 }
 
 var matCount = 1
@@ -865,6 +866,7 @@ onMounted(async () => {
       isShowBtnDelete.value = false
     }
 
+
     //获得库区列表
     const queryParamsRg = reactive({
       pageNo: 1,
@@ -928,14 +930,10 @@ onMounted(async () => {
   //用户信息
   userList.value = await UserApi.getSimpleUserList()
 })
-
-
 </script>
-<style setup lang="scss">
+<style>
 a {
   color: #409eff;
   text-decoration: none;
 }
-
-
 </style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 81a46ac8..80439a0e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -4,272 +4,256 @@
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
-    <div class="hl-card-scrollable-content">
-      <el-form
-        ref="formRef"
-        :model="formData"
-        :rules="formRules"
-        label-width="100px"
-        v-loading="formLoading"
-        v-bind:disabled="isShowBtnOther"
-      >
-        <!--  基础信息   -->
-        <el-card class="hl-card-info">
-          <template #header>
-            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
-          </template>
-          <el-row>
-            <el-col :span="8">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item prop="name" label="出库单号">
-                    <el-input v-model="formData.stockNo" disabled placeholder="系统自动生成" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item prop="stockInType" label="出库类型">
-                    <el-select v-model="formData.stockInType" clearable style="width: 100%">
-                      <el-option
-                        v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE)"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-col>
-            <el-col :span="8">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item prop="industry" label="单据状态">
-                    <el-select
-                      v-model="formData.status"
-                      placeholder="下拉选择"
-                      clearable
-                      class="!w-700px"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item prop="headerNo" label="上游单号">
-                    <el-input v-model="formData.headerNo" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-col>
-            <el-col :span="8">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="单据日期" prop="createTime">
-                    {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item prop="whId" label="出库仓库" required>
-                    <el-select
-                      v-model="formData.whId"
-                      placeholder="下拉选择"
-                      clearable
-                      class="!w-400px"
-                      @change="handleWh"
-                      v-bind:disabled="btnWhClickable"
-                    >
-                      <el-option
-                        v-for="dict in warehouseList"
-                        :key="dict.id"
-                        :label="dict.whName"
-                        :value="dict.id"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="description">
-                <el-input
-                  type="textarea"
-                  v-model="formData.description"
-                  show-word-limit
-                  maxlength="200"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-card>
-        <!--  物料信息   -->
-        <el-card class="hl-card-info">
-          <template #header>
-            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物料信息</span>
-          </template>
-          <el-row>
-            <el-col>
-              <el-card class="hl-incard">
-                <el-col>
-                  <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
-                    >新增</el-button
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+      v-bind:disabled="isShowBtnOther"
+    >
+      <!--  基础信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
+        </template>
+        <el-row>
+          <el-col :span="8">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="name" label="出库单号">
+                  <el-input v-model="formData.stockNo" disabled placeholder="系统自动生成" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="stockInType" label="出库类型">
+                  <el-select v-model="formData.stockInType" clearable style="width: 100%">
+                    <el-option
+                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE)"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="industry" label="单据状态">
+                  <el-select
+                    v-model="formData.status"
+                    placeholder="下拉选择"
+                    clearable
+                    class="!w-700px"
+                    disabled
                   >
-                </el-col>
-                <el-form
-                  ref="matSubFormRef"
-                  :model="formData.matItemDOList"
-                  :rules="subFormRules"
-                  v-loading="subFormLoading"
-                  label-width="0"
-                >
-                  <el-table :data="formData.matItemDOList" class="hl-table">
-                    <el-table-column prop="cid" label="序号" :width="80" />
-                    <el-table-column prop="matId" min-width="140" align="center">
-                      <template #header> <span class="hl-table_header">*</span>物料名称 </template>
-                      <template #default="scope">
-                        <el-form-item
-                          :prop="`${scope.$index}.matId`"
-                          :rules="subFormRules.matId"
-                          class="mb-0px!"
-                        >
-                          <el-select
-                            v-model="scope.row.matId"
-                            placeholder="物料名称"
-                            :remote-method="remoteMatCodeSearch"
-                            remote-show-suffix
-                            remote
-                            clearable
-                            reserve-keyword
-                            filterable
-                            :loading="matSelectLoading"
-                            @change="(val) => handleMatCode(scope, val)"
-                            class="!w-180px"
-                          >
-                            <el-option
-                              v-for="item in matList"
-                              :key="item.id"
-                              :label="item.name"
-                              :value="item.id"
-                            />
-                          </el-select>
-                        </el-form-item>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                      prop="matCode"
-                      label="物料编码"
-                      min-width="120"
-                      align="center"
+                    <el-option
+                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
                     />
-                    <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
-                      <template #default="scope">
-                        <dict-tag
-                          :type="DICT_TYPE.HELI_MATERIAL_TYPE"
-                          :value="scope.row.matType"
-                          v-if="scope.row.matType ? true : false"
-                        />
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                      prop="matSpec"
-                      label="规格/型号"
-                      min-width="120"
-                      align="center"
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="headerNo" label="上游单号">
+                  <el-input v-model="formData.headerNo" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="单据日期" prop="createTime">
+                  {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="whId" label="出库仓库" required>
+                  <el-select
+                    v-model="formData.whId"
+                    placeholder="下拉选择"
+                    clearable
+                    class="!w-400px"
+                    @change="handleWh"
+                    v-bind:disabled="btnWhClickable"
+                  >
+                    <el-option
+                      v-for="dict in warehouseList"
+                      :key="dict.id"
+                      :label="dict.whName"
+                      :value="dict.id"
                     />
-
-                    <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
-                      <template #default="scope">
-                        <dict-tag
-                          :type="DICT_TYPE.HELI_MATERIAL_UNIT"
-                          :value="scope.row.matUnit"
-                          v-if="scope.row.matUnit ? true : false"
-                        />
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="rgId" min-width="120" align="center">
-                      <template #header> <span class="hl-table_header">*</span>出库库区 </template>
-                      <template #default="scope">
-                        <el-form-item
-                          :prop="`${scope.$index}.rgId`"
-                          :rules="subFormRules.rgId"
-                          class="mb-0px!"
-                        >
-                          <el-select
-                            v-model="scope.row.rgId"
-                            placeholder=""
-                            style="width: 100%"
-                            @change="handleRg(scope)"
-                            disabled=""
-                          >
-                            <el-option
-                              v-for="dict in rgList"
-                              :key="dict.id"
-                              :label="dict.rgName"
-                              :value="dict.id"
-                            />
-                          </el-select>
-                        </el-form-item>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="pnId" min-width="140" align="center">
-                      <template #header> <span class="hl-table_header">*</span>出库库位 </template>
-                      <template #default="scope">
-                        <el-form-item
-                          :prop="`${scope.$index}.pnId`"
-                          :rules="subFormRules.pnId"
-                          class="mb-0px!"
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="description">
+              <el-input
+                type="textarea"
+                v-model="formData.description"
+                show-word-limit
+                maxlength="200"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <!--  物料信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物料信息</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-col>
+                <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
+                  >新增</el-button
+                >
+              </el-col>
+              <el-form
+                ref="matSubFormRef"
+                :model="formData.matItemDOList"
+                :rules="subFormRules"
+                v-loading="subFormLoading"
+                label-width="0"
+              >
+                <el-table :data="formData.matItemDOList" class="hl-table">
+                  <el-table-column prop="cid" label="序号" :width="80" />
+                  <el-table-column prop="matId" min-width="140" align="center">
+                    <template #header> <span class="hl-table_header">*</span>物料名称 </template>
+                    <template #default="scope">
+                      <el-form-item
+                        :prop="`${scope.$index}.matId`"
+                        :rules="subFormRules.matId"
+                        class="mb-0px!"
+                      >
+                        <el-select
+                          v-model="scope.row.matId"
+                          placeholder="物料名称"
+                          :remote-method="remoteMatCodeSearch"
+                          remote-show-suffix
+                          remote
+                          clearable
+                          reserve-keyword
+                          filterable
+                          :loading="matSelectLoading"
+                          @change="(val) => handleMatCode(scope, val)"
+                          class="!w-180px"
                         >
-                          <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
-                            <el-option
-                              v-for="dict in scope.row.pnlist"
-                              :key="dict.id"
-                              :label="dict.pnName"
-                              :value="dict.id"
-                            />
-                          </el-select>
-                        </el-form-item>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                      prop="matRest"
-                      label="库存数量"
-                      min-width="120"
-                      align="center"
-                    />
-                    <el-table-column prop="storageOkQty" min-width="120" align="center">
-                      <template #header> <span class="hl-table_header">*</span>出库数量</template>
-                      <template #default="scope">
-                        <el-form-item
-                          :prop="`${scope.$index}.storageOkQty`"
-                          :rules="subFormRules.storageOkQty"
-                          class="mb-0px!"
+                          <el-option
+                            v-for="item in matList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
+                  <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
+                    <template #default="scope">
+                      <dict-tag
+                        :type="DICT_TYPE.HELI_MATERIAL_TYPE"
+                        :value="scope.row.matType"
+                        v-if="scope.row.matType ? true : false"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
+
+                  <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
+                    <template #default="scope">
+                      <dict-tag
+                        :type="DICT_TYPE.HELI_MATERIAL_UNIT"
+                        :value="scope.row.matUnit"
+                        v-if="scope.row.matUnit ? true : false"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="rgId" min-width="120" align="center">
+                    <template #header> <span class="hl-table_header">*</span>出库库区 </template>
+                    <template #default="scope">
+                      <el-form-item
+                        :prop="`${scope.$index}.rgId`"
+                        :rules="subFormRules.rgId"
+                        class="mb-0px!"
+                      >
+                        <el-select
+                          v-model="scope.row.rgId"
+                          placeholder=""
+                          style="width: 100%"
+                          @change="handleRg(scope)"
+                          disabled=""
                         >
-                          <el-input v-model="scope.row.storageOkQty" />
-                        </el-form-item>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
-                    <el-table-column prop="description" min-width="180" label="备注" align="center">
-                      <template #default="scope">
-                        <el-input v-model="scope.row.description" />
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="操作" align="center" width="240">
-                      <template #default="scope">
-                        <!-- <el-button v-if="!scope.row.editable" type="primary" size="small" link
+                          <el-option
+                            v-for="dict in rgList"
+                            :key="dict.id"
+                            :label="dict.rgName"
+                            :value="dict.id"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="pnId" min-width="140" align="center">
+                       <template #header> <span class="hl-table_header">*</span>出库库位 </template>
+                    <template #default="scope">
+                      <el-form-item
+                        :prop="`${scope.$index}.pnId`"
+                        :rules="subFormRules.pnId"
+                        class="mb-0px!"
+                      >
+                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
+                          <el-option
+                            v-for="dict in scope.row.pnlist"
+                            :key="dict.id"
+                            :label="dict.pnName"
+                            :value="dict.id"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="matRest" label="库存数量" min-width="120" align="center" />
+                  <el-table-column prop="storageOkQty" min-width="120" align="center">
+                    <template #header> <span class="hl-table_header">*</span>出库数量</template>
+                    <template #default="scope">
+                      <el-form-item
+                        :prop="`${scope.$index}.storageOkQty`"
+                        :rules="subFormRules.storageOkQty"
+                        class="mb-0px!"
+                      >
+                        <el-input v-model="scope.row.storageOkQty" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
+                  <el-table-column prop="description" min-width="180" label="备注" align="center">
+                    <template #default="scope">
+                      <el-input v-model="scope.row.description" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" align="center" width="240">
+                    <template #default="scope">
+                      <!-- <el-button v-if="!scope.row.editable" type="primary" size="small" link
                         @click="handleEdit(scope.$index)">
                         编辑
                       </el-button>
@@ -278,137 +262,136 @@
                       </el-button>
 
                       <el-button link type="primary" @click="handlefuke(scope.$index, scope.row)">复制</el-button> -->
-                        <el-button
-                          link
-                          type="danger"
-                          size="small"
-                          @click.prevent="handleDelete2(scope.$index)"
-                          v-if="isShowBtnDelete"
-                        >
-                          删除
-                        </el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </el-form>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-card>
-        <!--  附件信息   -->
-        <el-card class="hl-card-info">
-          <template #header>
-            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
-          </template>
-          <el-row>
-            <el-col>
-              <el-card class="hl-incard">
-                <el-col>
-                  <el-upload
-                    ref="matUploadRef"
-                    :file-list="matUploadFiles"
-                    multiple
-                    :limit="10"
-                    :action="uploadUrl"
-                    :headers="{
-                      Authorization: 'Bearer ' + getAccessToken(),
-                      'tenant-id': getTenantId()
-                    }"
-                    name="files"
-                    :show-file-list="false"
-                    :auto-upload="false"
-                    :data="matUploadData"
-                    :on-change="matUploadChange"
-                    class="upload-file-uploader"
-                  >
-                    <el-button type="primary"> <Icon icon="ep:upload-filled" />上传 </el-button>
-                  </el-upload>
-                </el-col>
-                <el-table :data="formData.attachments" class="hl-table">
-                  <el-table-column prop="name" label="文件名称" align="center">
-                    <!-- <template #default="scope">
-                    <a :href="scope.row.url" target="_blank" style="color: #409eff">{{ scope.row.name }} </a>
-                  </template> -->
-                  </el-table-column>
-
-                  <el-table-column
-                    prop="createTime"
-                    align="center"
-                    label="上传日期"
-                    :formatter="dateFormatter"
-                  />
-
-                  <el-table-column label="操作" align="center">
-                    <template #default="scope">
                       <el-button
                         link
                         type="danger"
                         size="small"
+                        @click.prevent="handleDelete2(scope.$index)"
                         v-if="isShowBtnDelete"
-                        @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
                       >
                         删除
                       </el-button>
-                      <el-button
-                        link
-                        type="primary"
-                        size="small"
-                        @click="downloadAttachment(scope.row.name, scope.row.url)"
-                      >
-                        下载
-                      </el-button>
                     </template>
                   </el-table-column>
                 </el-table>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-card>
-        <!--  系统信息   -->
-        <el-card class="hl-card-info">
-          <template #header>
-            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
-          </template>
-
-          <el-row justify="center">
-            <el-col :span="8">
-              <el-form-item prop="creator" label="创建人">
-                {{ userList.find((user) => user.id == formData.creator)?.nickname }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="createTime" label="创建时间">
-                {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row justify="center">
-            <el-col :span="8">
-              <el-form-item prop="outbound" label="出库人">
-                {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="outboundTime" label="出库时间">
-                {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row justify="center">
-            <el-col :span="8">
-              <el-form-item prop="cancel" label="作废人">
-                {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="cancelTime" label="作废时间">
-                {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-card>
-      </el-form>
-    </div>
+              </el-form>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+      <!--  附件信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-col>
+                <el-upload
+                  ref="matUploadRef"
+                  :file-list="matUploadFiles"
+                  multiple
+                  :limit="10"
+                  :action="uploadUrl"
+                  :headers="{
+                    Authorization: 'Bearer ' + getAccessToken(),
+                    'tenant-id': getTenantId()
+                  }"
+                  name="files"
+                  :show-file-list="false"
+                  :auto-upload="false"
+                  :data="matUploadData"
+                  :on-change="matUploadChange"
+                  class="upload-file-uploader"
+                >
+                  <el-button type="primary"> <Icon icon="ep:upload-filled" />上传 </el-button>
+                </el-upload>
+              </el-col>
+              <el-table :data="formData.attachments" class="hl-table">
+                <el-table-column prop="name" label="文件名称" align="center">
+                  <!-- <template #default="scope">
+                    <a :href="scope.row.url" target="_blank" style="color: #409eff">{{ scope.row.name }} </a>
+                  </template> -->
+                </el-table-column>
+
+                <el-table-column
+                  prop="createTime"
+                  align="center"
+                  label="上传日期"
+                  :formatter="dateFormatter"
+                />
+
+                <el-table-column label="操作" align="center">
+                  <template #default="scope">
+                    <el-button
+                      link
+                      type="danger"
+                      size="small"
+                      v-if="isShowBtnDelete"
+                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
+                    >
+                      删除
+                    </el-button>
+                    <el-button
+                      link
+                      type="primary"
+                      size="small"
+                      @click="downloadAttachment(scope.row.name, scope.row.url)"
+                    >
+                      下载
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+      <!--  系统信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
+        </template>
+
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="creator" label="创建人">
+              {{ userList.find((user) => user.id == formData.creator)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="createTime" label="创建时间">
+              {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="outbound" label="出库人">
+              {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="outboundTime" label="出库时间">
+              {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="cancel" label="作废人">
+              {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="cancelTime" label="作废时间">
+              {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-form>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
       <el-button
@@ -506,9 +489,10 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
+
   // 校验表单
   await formRef.value.validate()
-  if (formData.value.matItemDOList.length === 0) {
+  if(formData.value.matItemDOList.length === 0){
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -563,7 +547,7 @@ const handleStatus = async (num) => {
     isShowBtnDelete.value = false
   }
   query.id = storageid.value
-  query.type = 'update'
+  query.type= 'update'
   reload()
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
@@ -627,7 +611,7 @@ var commonResult = ''
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
-const saveFormData = async () => {
+const saveFormData = async () =>{
   //获取最新库存信息
   const matCurrentData = await StorageMatApi.getStorageMatList()
   var hasRestNum = true
@@ -676,6 +660,9 @@ const saveFormData = async () => {
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
+
+    
+   
   } finally {
     formLoading.value = false
   }
@@ -683,7 +670,7 @@ const saveFormData = async () => {
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  if (formData.value.matItemDOList.length === 0) {
+  if(formData.value.matItemDOList.length === 0){
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -697,7 +684,7 @@ const submitForm = async () => {
   await saveFormData()
   // 成功后刷新
   query.id = storageid.value
-  query.type = 'update'
+  query.type= 'update'
   reload()
 }
 
@@ -725,6 +712,7 @@ const onAddItem = () => {
     }
     matCount = matCount + 1
 
+
     formData.value.matItemDOList.push(newData)
   } else {
     message.alertWarning('请选择出库仓库')
@@ -760,14 +748,11 @@ const handleWh = async (wid) => {
   let matParams = {
     pageNo: 1,
     pageSize: 99,
-    status: '1'
+    status: "1"
   }
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter(
-    (item) =>
-      matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
-  )
+  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined)
 
   formData.value.matItemDOList = []
   // formData.value.matItemDOList.forEach(item => {
@@ -807,12 +792,7 @@ const remoteMatCodeSearch = async (name) => {
 
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter(
-    (item) =>
-      matLastRemoteData.find(
-        (fish) => fish.matId === item.id && fish.whId == formData.value.whId
-      ) !== undefined
-  )
+  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined)
   matSelectLoading.value = false
 }
 
@@ -860,7 +840,7 @@ const handleMatCode = async (scope, matid) => {
 const isShowBtnGroup = ref(true)
 const isShowBtnCancel = ref(false)
 const isShowBtnOther = ref(false)
-const isShowBtnDelete = ref(true)
+const isShowBtnDelete  = ref(true)
 const btnWhClickable = ref(false)
 const matLastData = ref([])
 /** 初始化 **/
@@ -882,6 +862,8 @@ onMounted(async () => {
   dialogTitle.value = t('action.' + query.type)
   dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
 
+ 
+
   //-------------------仓库全数据
   const data = await WarehouseApi.getWarehouseSimpList()
   warehouseList.value = data

From 8f6798a14adb35399a409237ae28836f3ab1a05f Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Tue, 23 Jan 2024 16:21:48 +0800
Subject: [PATCH 04/64] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?DB=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

业务岗位，用户基础数据DB脚本
---
 sql/v1.1.0/2.data.sql | 142 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)

diff --git a/sql/v1.1.0/2.data.sql b/sql/v1.1.0/2.data.sql
index e7b37ed6..b55f06c7 100644
--- a/sql/v1.1.0/2.data.sql
+++ b/sql/v1.1.0/2.data.sql
@@ -47,3 +47,145 @@ INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`,
 INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (9, '审核', '9', 'system_operate_type', 0, '', '', '', '1', '2024-01-16 12:41:33', '1', '2024-01-16 12:41:33', b'0');
 INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (8, '送审', '8', 'system_operate_type', 0, '', '', '', '1', '2024-01-16 12:41:23', '1', '2024-01-16 12:41:23', b'0');
 INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (7, '保存', '7', 'system_operate_type', 0, '', '', '', '1', '2024-01-16 12:41:10', '1', '2024-01-16 12:41:10', b'0');
+
+
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('A01','董事长','1','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('A02','总经理','2','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('A03','副总经理','3','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('B01','技术部经理','4','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('B02','市场部副经理','5','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('B03','采购部经理','6','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('B04','生产厂长','7','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('B05','人事','8','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('B06','检验部部长','9','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('B07','主任','10','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('B08','厂长助理','11','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C01','工程师','12','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C02','会计','13','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C03','出纳','14','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C04','采购员','15','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C05','检验','16','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C06','钻床工','17','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C07','钳工','18','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C08','机修','19','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C09','司机','20','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C10','操机','21','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C11','钳工学徒','22','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C12','技术员','23','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C13','市场部','24','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C14','车床工','25','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C15','编程','26','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C16','文员','27','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C17','门卫','28','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C18','焊工','29','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C19','电火花','30','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C20','仓管','31','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C21','食堂','32','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C22','铣床','33','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C23','普工','34','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C24','抛光','35','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C25','保洁','36','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C26','叉车工','37','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C27','数控车工','38','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C28','铣床工','39','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C29','下料','40','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
+
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('001','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄成兴',null,null,'董事长',null,'18857107999',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('002','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄成立',null,null,'总经理',null,'18857170099',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('003','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈先明',null,null,'采购部经理',null,'13588889316',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('005','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','章国茂',null,null,'生产厂长',null,'13588889315',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('006','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','车伟领',null,null,'人事',null,'15157187787',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('007','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄爱静',null,null,'总经理助理',null,'13588889317',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('008','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈 荣',null,null,'副总经理',null,'13952885593',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('009','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柴仁爱',null,null,'市场部副经理',null,'13600513338',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('010','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘性红',null,null,'工程师',null,'15268563668',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('012','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈凤才',null,null,'工程师',null,'13757191402',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('013','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','喻楚南',null,null,'会计',null,'13606621860',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('014','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柴雪亚',null,null,'出纳',null,'13616509234',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('015','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孔  琴',null,null,'',null,'15158831188',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('016','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','高长兴',null,null,'工程师',null,'13968321010',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('017','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘为朋',null,null,'钻床工',null,'13024272921',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('018','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','武雪梅',null,null,'工程师',null,'13666613595',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('019','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','周小峰',null,null,'采购部外协',null,'13732222124',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('020','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴国位',null,null,'钳工',null,'18814821148',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('021','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴彦贵',null,null,'钳工',null,'13282162568',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('022','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吕 孟',null,null,'钳工',null,'13586818712',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('023','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张宝成',null,null,'检验',null,'15901792684',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('024','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','周和应',null,null,'工程师',null,'15088453738',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('025','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈建明',null,null,'机修',null,'15168327183',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('026','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张晨栋',null,null,'司机',null,'18757176581',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('027','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈永建',null,null,'厂长助理',null,'15158091225',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('028','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄凯凯',null,null,'工程师',null,'13968380897',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('029','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王 赛',null,null,'操机',null,'18268160853',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('030','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王元付',null,null,'钳工学徒',null,'15606517909',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('031','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','何沛锦',null,null,'技术员',null,'15287294335',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('032','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张晨杰',null,null,'技术员',null,'18758209857',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('033','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张学勇',null,null,'钳工',null,'18758092800',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('036','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈智谦',null,null,'市场部',null,'17805812347',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('038','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙国兵',null,null,'市场部',null,'15058238156',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('039','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','江晓燕',null,null,'市场部',null,'15057676322',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('040','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陶金山',null,null,'技术员',null,'13855349504',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('041','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','胡德志',null,null,'检验部部长',null,'15888861743',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('042','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐永湖',null,null,'钻床工',null,'19557160609',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('043','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐 衡',null,null,'钳工学徒',null,'13240245765',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('044','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄书楷',null,null,'钳工学徒',null,'15779924461',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('045','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','石远东',null,null,'操机',null,'15572100610',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('047','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴娜',null,null,'技术科文员',null,'18870703040',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('048','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王云高',null,null,'工程师',null,'18258838920',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('049','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','项李广',null,null,'操机',null,'13606543842',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('050','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','游光富',null,null,'钳工学徒',null,'18090038685',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('051','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','沈湧烈',null,null,'门卫',null,'13957130761',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('052','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柳卫宝',null,null,'检验',null,'13958170229',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('053','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐贤国',null,null,'车床工',null,'18768140101',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('054','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','严钊钊',null,null,'编程',null,'13957588310',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('055','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','朱巧玲',null,null,'办公室主任',null,'13968194824',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('056','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','费 翔',null,null,'司机',null,'18329140448',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('057','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张月芬',null,null,'工程师',null,'15257865653',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('058','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','郁金金',null,null,'技术员',null,'15988188195',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('059','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙建辰',null,null,'焊工',null,'15824158667',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('060','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄芳波',null,null,'工程师',null,'15589596002',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('061','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','冯海滨',null,null,'钳工',null,'15088459553',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('063','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈战峰',null,null,'焊工',null,'16696245630',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('064','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','崔猛猛',null,null,'检验',null,'18094121421',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('065','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张文峰',null,null,'钳工',null,'17701511427',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('066','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','施凯欣',null,null,'市场部',null,'13732249985',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('067','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','赵贤辉',null,null,'CNC主管',null,'13355965855',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('068','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','赵子子',null,null,'电火花',null,'15394299682',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('069','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙 芬',null,null,'仓管',null,'13588274157',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('070','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','叶玉红',null,null,'操机',null,'18757173074',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('071','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王春明',null,null,'钻床工',null,'13666618324',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('072','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','何利刚',null,null,'钳工',null,'15869145584',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('073','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','冉家成',null,null,'操机',null,'15186661245',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('074','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈明建',null,null,'编程',null,'13968392506',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('075','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄友军',null,null,'操机',null,'18665595406',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('076','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','白洪辉',null,null,'食堂',null,'15158022121',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('077','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','梅国连',null,null,'铣床',null,'13968080694',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('078','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','万 红',null,null,'普工',null,'13588484315',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('079','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陶缘芳',null,null,'采购部',null,'13958042827',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('080','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈国金',null,null,'钳工',null,'13506681964',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('081','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','邓锦童 ',null,null,'车床工',null,'15924111212',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('083','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','方四红',null,null,'车床工',null,'17505714848',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('084','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张忠成',null,null,'钻床工',null,'15268102259',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('085','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈丰波',null,null,'技术员',null,'13685757130',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('086','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','高文彬',null,null,'钳工',null,'18667936417',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('087','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈春来',null,null,'门卫',null,'13067784377',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('088','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','腾 红',null,null,'钳工学徒',null,'17371242510',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('089','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','章 旭',null,null,'',null,'15924118272',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('090','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','江 林',null,null,'抛光',null,'15012917214',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('091','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','邓 磊',null,null,'电火花',null,'19161601186',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('092','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','牟和玲',null,null,'操机',null,'15888147846',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('093','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈如美',null,null,'保洁',null,'13757193015',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('094','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘登玉',null,null,'食堂',null,'13758197522',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('095','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','罗瑞平',null,null,'钻床工',null,'19979088544',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('096','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','韩 山',null,null,'钳工',null,'17335962901',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('097','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','李 艺',null,null,'钻床工',null,'15015828987',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('098','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','胡国良',null,null,'检验',null,'13606526253',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('099','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄珍青',null,null,'办公室助理',null,'18358118018',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('103','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王帅',null,null,'操机',null,'15261204433',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('104','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','詹中远',null,null,'叉车工',null,'15893768017',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('105','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','代永岗',null,null,'数控车工',null,'18432722893',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('107','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴玉根',null,null,'铣床工',null,'13777351386',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('111','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','许顺华',null,null,'下料',null,'13606518319',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+
+
+update `system_users` set post_ids=(select CONCAT('[', id, ']') from system_post where name=post_ids)
\ No newline at end of file

From afd098b333a8b8841d064a2359e56bac985a9c3e Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Tue, 23 Jan 2024 16:33:55 +0800
Subject: [PATCH 05/64] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?DB=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

业务岗位，用户基础数据DB脚本
---
 sql/v1.1.0/2.data.sql | 192 +++++++++++++++++++++---------------------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/sql/v1.1.0/2.data.sql b/sql/v1.1.0/2.data.sql
index b55f06c7..e93c5d94 100644
--- a/sql/v1.1.0/2.data.sql
+++ b/sql/v1.1.0/2.data.sql
@@ -90,102 +90,102 @@ insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`cre
 insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C28','铣床工','39','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
 insert into `system_post` (`code`,`name`,`sort`,`status`,`remark`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('C29','下料','40','0','','2','2024-01-23 15:31:42',null,'2024-01-23 15:31:42',0,'2');
 
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('001','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄成兴',null,null,'董事长',null,'18857107999',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('002','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄成立',null,null,'总经理',null,'18857170099',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('003','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈先明',null,null,'采购部经理',null,'13588889316',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('005','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','章国茂',null,null,'生产厂长',null,'13588889315',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('006','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','车伟领',null,null,'人事',null,'15157187787',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('007','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄爱静',null,null,'总经理助理',null,'13588889317',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('008','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈 荣',null,null,'副总经理',null,'13952885593',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('009','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柴仁爱',null,null,'市场部副经理',null,'13600513338',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('010','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘性红',null,null,'工程师',null,'15268563668',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('012','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈凤才',null,null,'工程师',null,'13757191402',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('013','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','喻楚南',null,null,'会计',null,'13606621860',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('014','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柴雪亚',null,null,'出纳',null,'13616509234',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('015','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孔  琴',null,null,'',null,'15158831188',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('016','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','高长兴',null,null,'工程师',null,'13968321010',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('017','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘为朋',null,null,'钻床工',null,'13024272921',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('018','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','武雪梅',null,null,'工程师',null,'13666613595',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('019','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','周小峰',null,null,'采购部外协',null,'13732222124',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('020','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴国位',null,null,'钳工',null,'18814821148',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('021','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴彦贵',null,null,'钳工',null,'13282162568',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('022','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吕 孟',null,null,'钳工',null,'13586818712',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('023','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张宝成',null,null,'检验',null,'15901792684',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('024','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','周和应',null,null,'工程师',null,'15088453738',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('025','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈建明',null,null,'机修',null,'15168327183',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('026','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张晨栋',null,null,'司机',null,'18757176581',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('027','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈永建',null,null,'厂长助理',null,'15158091225',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('028','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄凯凯',null,null,'工程师',null,'13968380897',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('029','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王 赛',null,null,'操机',null,'18268160853',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('030','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王元付',null,null,'钳工学徒',null,'15606517909',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('031','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','何沛锦',null,null,'技术员',null,'15287294335',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('032','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张晨杰',null,null,'技术员',null,'18758209857',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('033','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张学勇',null,null,'钳工',null,'18758092800',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('036','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈智谦',null,null,'市场部',null,'17805812347',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('038','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙国兵',null,null,'市场部',null,'15058238156',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('039','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','江晓燕',null,null,'市场部',null,'15057676322',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('040','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陶金山',null,null,'技术员',null,'13855349504',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('041','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','胡德志',null,null,'检验部部长',null,'15888861743',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('042','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐永湖',null,null,'钻床工',null,'19557160609',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('043','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐 衡',null,null,'钳工学徒',null,'13240245765',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('044','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄书楷',null,null,'钳工学徒',null,'15779924461',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('045','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','石远东',null,null,'操机',null,'15572100610',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('047','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴娜',null,null,'技术科文员',null,'18870703040',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('048','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王云高',null,null,'工程师',null,'18258838920',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('049','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','项李广',null,null,'操机',null,'13606543842',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('050','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','游光富',null,null,'钳工学徒',null,'18090038685',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('051','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','沈湧烈',null,null,'门卫',null,'13957130761',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('052','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柳卫宝',null,null,'检验',null,'13958170229',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('053','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐贤国',null,null,'车床工',null,'18768140101',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('054','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','严钊钊',null,null,'编程',null,'13957588310',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('055','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','朱巧玲',null,null,'办公室主任',null,'13968194824',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('056','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','费 翔',null,null,'司机',null,'18329140448',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('057','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张月芬',null,null,'工程师',null,'15257865653',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('058','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','郁金金',null,null,'技术员',null,'15988188195',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('059','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙建辰',null,null,'焊工',null,'15824158667',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('060','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄芳波',null,null,'工程师',null,'15589596002',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('061','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','冯海滨',null,null,'钳工',null,'15088459553',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('063','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈战峰',null,null,'焊工',null,'16696245630',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('064','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','崔猛猛',null,null,'检验',null,'18094121421',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('065','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张文峰',null,null,'钳工',null,'17701511427',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('066','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','施凯欣',null,null,'市场部',null,'13732249985',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('067','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','赵贤辉',null,null,'CNC主管',null,'13355965855',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('068','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','赵子子',null,null,'电火花',null,'15394299682',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('069','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙 芬',null,null,'仓管',null,'13588274157',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('070','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','叶玉红',null,null,'操机',null,'18757173074',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('071','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王春明',null,null,'钻床工',null,'13666618324',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('072','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','何利刚',null,null,'钳工',null,'15869145584',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('073','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','冉家成',null,null,'操机',null,'15186661245',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('074','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈明建',null,null,'编程',null,'13968392506',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('075','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄友军',null,null,'操机',null,'18665595406',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('076','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','白洪辉',null,null,'食堂',null,'15158022121',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('077','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','梅国连',null,null,'铣床',null,'13968080694',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('078','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','万 红',null,null,'普工',null,'13588484315',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('079','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陶缘芳',null,null,'采购部',null,'13958042827',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('080','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈国金',null,null,'钳工',null,'13506681964',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('081','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','邓锦童 ',null,null,'车床工',null,'15924111212',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('083','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','方四红',null,null,'车床工',null,'17505714848',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('084','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张忠成',null,null,'钻床工',null,'15268102259',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('085','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈丰波',null,null,'技术员',null,'13685757130',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('086','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','高文彬',null,null,'钳工',null,'18667936417',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('087','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈春来',null,null,'门卫',null,'13067784377',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('088','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','腾 红',null,null,'钳工学徒',null,'17371242510',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('089','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','章 旭',null,null,'',null,'15924118272',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('090','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','江 林',null,null,'抛光',null,'15012917214',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('091','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','邓 磊',null,null,'电火花',null,'19161601186',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('092','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','牟和玲',null,null,'操机',null,'15888147846',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('093','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈如美',null,null,'保洁',null,'13757193015',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('094','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘登玉',null,null,'食堂',null,'13758197522',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('095','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','罗瑞平',null,null,'钻床工',null,'19979088544',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('096','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','韩 山',null,null,'钳工',null,'17335962901',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('097','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','李 艺',null,null,'钻床工',null,'15015828987',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('098','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','胡国良',null,null,'检验',null,'13606526253',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('099','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄珍青',null,null,'办公室助理',null,'18358118018',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('103','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王帅',null,null,'操机',null,'15261204433',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('104','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','詹中远',null,null,'叉车工',null,'15893768017',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('105','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','代永岗',null,null,'数控车工',null,'18432722893',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('107','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴玉根',null,null,'铣床工',null,'13777351386',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
-insert into `system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('111','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','许顺华',null,null,'下料',null,'13606518319',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('001','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄成兴',null,null,'董事长',null,'18857107999',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('002','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄成立',null,null,'总经理',null,'18857170099',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('003','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈先明',null,null,'采购部经理',null,'13588889316',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('005','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','章国茂',null,null,'生产厂长',null,'13588889315',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('006','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','车伟领',null,null,'人事',null,'15157187787',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('007','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄爱静',null,null,'总经理助理',null,'13588889317',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('008','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈荣',null,null,'副总经理',null,'13952885593',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('009','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柴仁爱',null,null,'市场部副经理',null,'13600513338',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('010','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘性红',null,null,'工程师',null,'15268563668',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('012','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈凤才',null,null,'工程师',null,'13757191402',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('013','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','喻楚南',null,null,'会计',null,'13606621860',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('014','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柴雪亚',null,null,'出纳',null,'13616509234',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('015','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孔琴',null,null,'',null,'15158831188',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('016','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','高长兴',null,null,'工程师',null,'13968321010',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('017','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘为朋',null,null,'钻床工',null,'13024272921',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('018','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','武雪梅',null,null,'工程师',null,'13666613595',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('019','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','周小峰',null,null,'采购部外协',null,'13732222124',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('020','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴国位',null,null,'钳工',null,'18814821148',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('021','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴彦贵',null,null,'钳工',null,'13282162568',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('022','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吕孟',null,null,'钳工',null,'13586818712',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('023','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张宝成',null,null,'检验',null,'15901792684',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('024','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','周和应',null,null,'工程师',null,'15088453738',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('025','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈建明',null,null,'机修',null,'15168327183',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('026','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张晨栋',null,null,'司机',null,'18757176581',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('027','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈永建',null,null,'厂长助理',null,'15158091225',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('028','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄凯凯',null,null,'工程师',null,'13968380897',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('029','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王赛',null,null,'操机',null,'18268160853',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('030','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王元付',null,null,'钳工学徒',null,'15606517909',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('031','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','何沛锦',null,null,'技术员',null,'15287294335',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('032','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张晨杰',null,null,'技术员',null,'18758209857',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('033','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张学勇',null,null,'钳工',null,'18758092800',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('036','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈智谦',null,null,'市场部',null,'17805812347',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('038','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙国兵',null,null,'市场部',null,'15058238156',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('039','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','江晓燕',null,null,'市场部',null,'15057676322',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('040','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陶金山',null,null,'技术员',null,'13855349504',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('041','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','胡德志',null,null,'检验部部长',null,'15888861743',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('042','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐永湖',null,null,'钻床工',null,'19557160609',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('043','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐衡',null,null,'钳工学徒',null,'13240245765',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('044','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄书楷',null,null,'钳工学徒',null,'15779924461',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('045','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','石远东',null,null,'操机',null,'15572100610',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('047','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴娜',null,null,'技术科文员',null,'18870703040',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('048','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王云高',null,null,'工程师',null,'18258838920',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('049','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','项李广',null,null,'操机',null,'13606543842',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('050','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','游光富',null,null,'钳工学徒',null,'18090038685',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('051','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','沈湧烈',null,null,'门卫',null,'13957130761',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('052','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','柳卫宝',null,null,'检验',null,'13958170229',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('053','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','唐贤国',null,null,'车床工',null,'18768140101',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('054','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','严钊钊',null,null,'编程',null,'13957588310',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('055','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','朱巧玲',null,null,'办公室主任',null,'13968194824',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('056','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','费翔',null,null,'司机',null,'18329140448',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('057','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张月芬',null,null,'工程师',null,'15257865653',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('058','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','郁金金',null,null,'技术员',null,'15988188195',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('059','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙建辰',null,null,'焊工',null,'15824158667',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('060','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄芳波',null,null,'工程师',null,'15589596002',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('061','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','冯海滨',null,null,'钳工',null,'15088459553',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('063','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈战峰',null,null,'焊工',null,'16696245630',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('064','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','崔猛猛',null,null,'检验',null,'18094121421',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('065','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张文峰',null,null,'钳工',null,'17701511427',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('066','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','施凯欣',null,null,'市场部',null,'13732249985',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('067','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','赵贤辉',null,null,'CNC主管',null,'13355965855',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('068','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','赵子子',null,null,'电火花',null,'15394299682',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('069','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','孙芬',null,null,'仓管',null,'13588274157',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('070','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','叶玉红',null,null,'操机',null,'18757173074',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('071','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王春明',null,null,'钻床工',null,'13666618324',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('072','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','何利刚',null,null,'钳工',null,'15869145584',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('073','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','冉家成',null,null,'操机',null,'15186661245',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('074','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈明建',null,null,'编程',null,'13968392506',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('075','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄友军',null,null,'操机',null,'18665595406',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('076','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','白洪辉',null,null,'食堂',null,'15158022121',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('077','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','梅国连',null,null,'铣床',null,'13968080694',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('078','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','万红',null,null,'普工',null,'13588484315',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('079','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陶缘芳',null,null,'采购部',null,'13958042827',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('080','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈国金',null,null,'钳工',null,'13506681964',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('081','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','邓锦童',null,null,'车床工',null,'15924111212',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('083','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','方四红',null,null,'车床工',null,'17505714848',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('084','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','张忠成',null,null,'钻床工',null,'15268102259',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('085','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈丰波',null,null,'技术员',null,'13685757130',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('086','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','高文彬',null,null,'钳工',null,'18667936417',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('087','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈春来',null,null,'门卫',null,'13067784377',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('088','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','腾红',null,null,'钳工学徒',null,'17371242510',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('089','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','章旭',null,null,'',null,'15924118272',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('090','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','江林',null,null,'抛光',null,'15012917214',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('091','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','邓磊',null,null,'电火花',null,'19161601186',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('092','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','牟和玲',null,null,'操机',null,'15888147846',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('093','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','陈如美',null,null,'保洁',null,'13757193015',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('094','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','刘登玉',null,null,'食堂',null,'13758197522',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('095','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','罗瑞平',null,null,'钻床工',null,'19979088544',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('096','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','韩山',null,null,'钳工',null,'17335962901',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('097','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','李艺',null,null,'钻床工',null,'15015828987',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('098','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','胡国良',null,null,'检验',null,'13606526253',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('099','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','黄珍青',null,null,'办公室助理',null,'18358118018',0,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('103','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','王帅',null,null,'操机',null,'15261204433',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('104','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','詹中远',null,null,'叉车工',null,'15893768017',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('105','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','代永岗',null,null,'数控车工',null,'18432722893',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('107','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','吴玉根',null,null,'铣床工',null,'13777351386',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
+insert into`system_users` (`username`,`password`,`nickname`,`remark`,`dept_id`,`post_ids`,`email`,`mobile`,`sex`,`avatar`,`status`,`login_ip`,`login_date`,`creator`,`create_time`,`updater`,`update_time`,`deleted`,`tenant_id`) values ('111','$2a$04$uqtRtLd/e7D5AUYMaum1ju1.wN7ab4ZyAJfGSd4mdP1rc1Tc/8NNG','许顺华',null,null,'下料',null,'13606518319',1,'',0,null,null,2,'2024-01-23 00:00:00',null,'2024-01-23 00:00:00',0,2);
 
 
 update `system_users` set post_ids=(select CONCAT('[', id, ']') from system_post where name=post_ids)
\ No newline at end of file

From 6713134c52dce8b818fa63d12c730855c2d406c4 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Tue, 23 Jan 2024 16:55:25 +0800
Subject: [PATCH 06/64] =?UTF-8?q?=E3=80=90=E7=99=BB=E5=BD=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E3=80=81=E6=94=AF=E6=8C=81=E4=BB=BB=E6=84=8F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/auth/vo/AuthLoginReqVO.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
index 92f14851..a5d92266 100644
--- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
+++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
@@ -21,10 +21,10 @@ import javax.validation.constraints.Pattern;
 @Builder
 public class AuthLoginReqVO {
 
-    @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "mesyuanma")
-    @NotEmpty(message = "登录账号不能为空")
-    @Length(min = 4, max = 16, message = "账号长度为 4-16 位")
-    @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
+    @Schema(description = "工号", requiredMode = Schema.RequiredMode.REQUIRED, example = "mesyuanma")
+    @NotEmpty(message = "工号不能为空")
+    /*@Length(min = 4, max = 16, message = "账号长度为 4-16 位")
+    @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")*/
     private String username;
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
@@ -66,4 +66,4 @@ public class AuthLoginReqVO {
         return socialType == null || StrUtil.isNotEmpty(socialState);
     }
 
-}
\ No newline at end of file
+}

From 088b06cfb4ce4d60afeaab3651b52891970e1afa Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Tue, 23 Jan 2024 17:00:20 +0800
Subject: [PATCH 07/64] =?UTF-8?q?=E3=80=90=E8=81=8C=E5=B7=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=91=E7=BB=9F=E4=B8=80=E5=B7=A5=E5=8F=B7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/admin/auth/vo/AuthLoginReqVO.java       | 4 ++--
 .../system/controller/admin/user/vo/user/UserSaveReqVO.java   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
index a5d92266..f08f11ca 100644
--- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
+++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
@@ -23,8 +23,8 @@ public class AuthLoginReqVO {
 
     @Schema(description = "工号", requiredMode = Schema.RequiredMode.REQUIRED, example = "mesyuanma")
     @NotEmpty(message = "工号不能为空")
-    /*@Length(min = 4, max = 16, message = "账号长度为 4-16 位")
-    @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")*/
+    @Length(min = 1, max = 16, message = "工号长度不能超过 16 个字符")
+    /*@Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")*/
     private String username;
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
index 80a1edf2..f2138a2e 100644
--- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
+++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
@@ -21,8 +21,7 @@ public class UserSaveReqVO {
 
     @Schema(description = "工号", requiredMode = Schema.RequiredMode.REQUIRED, example = "mes")
     @NotBlank(message = "工号不能为空")
-    @Pattern(regexp = "^[a-zA-Z0-9]{1,30}$", message = "工号由 数字、字母 组成")
-    @Size(max = 30, message = "工号长度不能超过 30 个字符")
+    @Size(max = 16, message = "工号长度不能超过 16 个字符")
     private String username;
 
     @Schema(description = "姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")

From 2739046775a19d5aa750048c7d80f713fc7c50c1 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 25 Jan 2024 09:20:39 +0800
Subject: [PATCH 08/64] =?UTF-8?q?=E3=80=90=E6=A1=86=E6=9E=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=E3=80=91=E5=AF=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BCcssClass=20=E4=BB=85=E4=BD=9C=E4=B8=BAclass=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/DictTag/src/DictTag.vue                 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/components/DictTag/src/DictTag.vue b/mes-ui/mes-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
index db37f714..82f33fa3 100644
--- a/mes-ui/mes-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
@@ -41,13 +41,8 @@ export default defineComponent({
       // 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题
       return (
         <ElTag
-          style={dictData.value?.cssClass ? 'color: #fff' : ''}
+          class={dictData.value?.cssClass ? dictData.value?.cssClass : ''}
           type={dictData.value?.colorType}
-          color={
-            dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)
-              ? dictData.value?.cssClass
-              : ''
-          }
           disableTransitions={true}
         >
           {dictData.value?.label}

From 7cf8e2406072f288791b9518023c920a69f64699 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 25 Jan 2024 09:57:25 +0800
Subject: [PATCH 09/64] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A8=E5=90=8D=EF=BC=8C=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E7=90=86=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/projectorder/ProjectOrderController.java  |  2 +-
 .../projectorder/vo/ProjectOrderSaveReqVO.java      |  2 +-
 .../dal/dataobject/projectorder/ProjectOrderDO.java |  4 ++--
 .../dataobject/projectorder/ProjectOrderSubDO.java  |  6 +++---
 .../mysql/projectorder/ProjectOrderSubMapper.java   |  9 +++------
 .../service/projectorder/ProjectOrderService.java   | 13 +++++++------
 .../projectorder/ProjectOrderServiceImpl.java       |  2 +-
 sql/v1.1.1/1.structure.sql                          |  5 +++++
 sql/v1.1.1/2.data.sql                               |  0
 9 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 sql/v1.1.1/1.structure.sql
 create mode 100644 sql/v1.1.1/2.data.sql

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java
index 0b502e34..9af1fd17 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java
@@ -12,7 +12,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.Project
 import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderRespVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderSaveReqVO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectordersub.ProjectOrderSubDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
 import com.chanko.yunxi.mes.module.heli.service.projectorder.ProjectOrderService;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java
index 3431f4bf..8efea052 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java
@@ -1,6 +1,6 @@
 package com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo;
 
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectordersub.ProjectOrderSubDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
index d8e3599e..a7bdd709 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
@@ -19,8 +19,8 @@ import java.util.Set;
  *
  * @author 管理员
  */
-@TableName("project_order")
-@KeySequence("project_order_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("project_sale_order")
+@KeySequence("project_sale_order_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
index 2eced4e7..c1f5645b 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
@@ -1,4 +1,4 @@
-package com.chanko.yunxi.mes.module.heli.dal.dataobject.projectordersub;
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder;
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -14,8 +14,8 @@ import java.util.Set;
  *
  * @author 管理员
  */
-@TableName("project_order_sub")
-@KeySequence("project_order_sub_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("project_sale_order_sub")
+@KeySequence("project_sale_order_sub_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
index 2e23093f..9d309ec2 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
@@ -1,16 +1,13 @@
 package com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder;
 
-import java.util.*;
-
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectordersub.ProjectOrderSubDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 项目订单子项目 Mapper
  *
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java
index 5d53d67c..7830eeaf 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java
@@ -1,12 +1,13 @@
 package com.chanko.yunxi.mes.module.heli.service.projectorder;
 
-import java.util.*;
-import javax.validation.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectordersub.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderPageReqVO;
+import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderSaveReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 项目订单 Service 接口
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
index be3fe589..2d010bcf 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
@@ -8,7 +8,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.Project
 import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderSaveReqVO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectordersub.ProjectOrderSubDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderSubMapper;
diff --git a/sql/v1.1.1/1.structure.sql b/sql/v1.1.1/1.structure.sql
new file mode 100644
index 00000000..42d77aeb
--- /dev/null
+++ b/sql/v1.1.1/1.structure.sql
@@ -0,0 +1,5 @@
+ALTER TABLE project_order RENAME project_sale_order;
+ALTER TABLE project_sale_order COMMENT '项目销售订单表';
+
+ALTER TABLE project_order_sub RENAME project_sale_order_sub;
+ALTER TABLE project_sale_order_sub COMMENT '项目销售订单子项表';
diff --git a/sql/v1.1.1/2.data.sql b/sql/v1.1.1/2.data.sql
new file mode 100644
index 00000000..e69de29b

From 8bf4b73a90e6eb51474a368874d50d48a7c2326b Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Thu, 25 Jan 2024 10:41:00 +0800
Subject: [PATCH 10/64] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=20?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=8A=B6=E6=80=81=20tag=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss | 78 +++++++++++++++++++-
 1 file changed, 76 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index 5b766755..67a3ed39 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -48,7 +48,7 @@
 .hl-table thead {
   color: #1d2129;
 }
-.hl-table_header{
+.hl-table_header {
   color: red;
 }
 .hl-table thead th.el-table__cell {
@@ -145,7 +145,6 @@
   }
 }
 
-
 /* ---el-table滚动条公共样式--- */
 .el-scrollbar {
   // 横向滚动条
@@ -168,4 +167,79 @@
     // background-color: rgba(136, 219, 255, 1);
     box-shadow: 0 0 6px rgba(0, 0, 0, 0.15);
   }
+}
+
+//已送审
+.iapproval {
+  border: 1px solid #0d0d26;
+  background-color: #e8e8e8;
+  color: #0d0d26;
+}
+//已保存
+.iconserve {
+  border: 1px solid #52a7ff;
+  background-color: #eef6ff;
+  color: #52a7ff;
+}
+
+//已审核
+.iaudit {
+  border: 1px solid #19a998;
+  background-color: #ebf5f4;
+  color: #19a998;
+}
+//已启动
+.istart {
+  border: 1px solid #326ad2;
+  background-color: #e9effa;
+  color: #326ad2;
+}
+//已打回
+.iBack {
+  border: 1px solid #e51e1e;
+  background-color: #fff9f9;
+  color: #e51e1e;
+}
+
+//已变更
+.ialteration {
+  border: 1px solid #F39800;
+  background-color: #F7F3ED;
+  color: #F39800;
+}
+//已提交
+.isubmit {
+  border: 1px solid #356899;
+  background-color: #ECF0F4;
+  color: #356899;
+}
+//已作废
+.icancellation {
+  border: 1px solid #95969D;
+  background-color: #EBEBEB;
+  color: #95969D;
+}
+//已终止
+.ibreakup {
+  border: 1px solid #0D0D26;
+  background-color: #E8E8E8;
+  color: #0D0D26;
+}
+
+//全部发货
+.allshipments{
+  color: #3AC33D;
+  background-color:transparent;
+  border: none;
+}
+//未发货
+.noshipments{
+  color: #4589FF;
+  background-color:transparent;
+  border: none;
+}
+.partshipments{
+  color: #19A998;
+  background-color:transparent;
+  border: none;
 }
\ No newline at end of file

From d1a4bd1de4cb3a7b420b9bca2c6af8f532cb9d7b Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Thu, 25 Jan 2024 10:51:29 +0800
Subject: [PATCH 11/64] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/projectorder/detail.vue                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 335a1d34..ff52bbc8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -197,7 +197,7 @@
                     :disabled="detailDisabled"
                   />
                   <span
-                    style="position: absolute; right: -45px"
+                    style="position: absolute;left:0;top:30px"
                     v-if="formData.projectStartTime && formData.projectEndTime"
                     >{{
                       ' 共计' +
@@ -386,11 +386,11 @@
             </el-row>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row style="margin-top:-10px;margin-left:15px">
           <el-col :span="12">
             <el-form-item label="检验要求" prop="qualityRequirement">
               <el-input
-                class="!w-710px"
+                class="!w-700px"
                 :disabled="detailDisabled"
                 type="textarea"
                 v-model="formData.qualityRequirement"
@@ -404,7 +404,7 @@
           <el-col :span="12">
             <el-form-item label="备注" prop="remark" :disabled="detailDisabled">
               <el-input
-                class="!w-710px"
+                class="!w-700px"
                 :disabled="detailDisabled"
                 type="textarea"
                 v-model="formData.remark"

From b799e6854d2cb319c14c65c46e52aca1f279c029 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Thu, 25 Jan 2024 10:54:39 +0800
Subject: [PATCH 12/64] =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=20=E8=A1=A8=E6=A0=BCcard=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index 67a3ed39..9395a945 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -113,6 +113,7 @@
   }
 }
 .hl-incard {
+  box-shadow: none !important;
   margin-bottom: 20px;
   padding: 0 20px;
 }

From 9e24c192ccf2f9e594eb9893228373f0436ed7fb Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Thu, 25 Jan 2024 11:08:17 +0800
Subject: [PATCH 13/64] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index ff52bbc8..7587bf65 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -1355,9 +1355,9 @@ a {
   margin-right: 20px;
 }
 
-.hl-card .alter-class {
+/* .hl-card .alter-class {
   position: relative;
   border: solid 1px orange;
   outline: solid 1px orange;
-}
+} */
 </style>

From 344512513398c50558fa4531c1c7150702d4fc89 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Thu, 25 Jan 2024 12:50:35 +0800
Subject: [PATCH 14/64] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/imgs/status/status2.png        | Bin 0 -> 16408 bytes
 .../src/assets/imgs/status/statusg.png        | Bin 0 -> 14968 bytes
 .../src/assets/imgs/status/statuszf.png       | Bin 0 -> 16329 bytes
 .../src/views/heli/storage/StorageForm.vue    |  27 +++++-----
 .../src/views/heli/storage/StorageOut.vue     |  49 +++++++++++-------
 5 files changed, 44 insertions(+), 32 deletions(-)
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status2.png
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statusg.png
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statuszf.png

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status2.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ffc622d24ee9fe5ea808dcfeb0857ce517aa243
GIT binary patch
literal 16408
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
L8R1GnJ>UNaIgDlQ

literal 0
HcmV?d00001

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statusg.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statusg.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6b05287af20c22482ffb21cbf6b94cef755c2d2
GIT binary patch
literal 14968
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%0AgLggxZCPUM@gmS@Cl3=@Z`E_)p%ZtzKnGy(Z
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
Xy|jFZs0ehALMh6s$uxd6i}-&4GVF?l

literal 0
HcmV?d00001

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statuszf.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statuszf.png
new file mode 100644
index 0000000000000000000000000000000000000000..97c324a287fd0d125754834b2d3105b8ab5ed28e
GIT binary patch
literal 16329
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
NwVbMKm9#nR{{V?K&iDWT

literal 0
HcmV?d00001

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index ad5b8802..0ad19f5d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -1,9 +1,14 @@
 <template>
   <!-- 入库 -->
-  <el-card class="hl-card">
+  <el-card class="hl-card" style="position: relative">
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
+    <div class="abstatus">
+      <img src="/src/assets/imgs/status/status2.png" v-if="formData.status == 2" alt="" />
+      <img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
+      <span v-else></span>
+    </div>
     <el-form
       ref="formRef"
       :model="formData"
@@ -133,7 +138,7 @@
                 v-loading="subFormLoading"
                 label-width="0"
               >
-                <el-table :data="formData.matItemDOList" class="hl-table" >
+                <el-table :data="formData.matItemDOList" class="hl-table">
                   <el-table-column prop="cid" label="序号" min-width="80" align="center" fixed />
                   <el-table-column prop="matId" min-width="140" align="center">
                     <template #header> <span class="hl-table_header">*</span> 物料编码 </template>
@@ -275,7 +280,7 @@
                       <el-input v-model="scope.row.projectNo" />
                     </template>
                   </el-table-column>
-                  <el-table-column prop="description" label="备注" align="center" min-width="180" >
+                  <el-table-column prop="description" label="备注" align="center" min-width="180">
                     <template #default="scope">
                       <el-input v-model="scope.row.description" />
                     </template>
@@ -517,10 +522,9 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
-
   // 校验表单
   await formRef.value.validate()
-  if(formData.value.matItemDOList.length === 0){
+  if (formData.value.matItemDOList.length === 0) {
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -576,10 +580,9 @@ const handleStatus = async (num) => {
     isShowBtnOther.value = false
     isShowBtnDelete.value = false
   }
-  query.type= 'update'
+  query.type = 'update'
   query.id = formData.value.id
   reload()
-
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -642,7 +645,7 @@ var commonResult = ''
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
-const saveFormData = async () =>{
+const saveFormData = async () => {
   // 提交请求
   formLoading.value = true
   try {
@@ -671,7 +674,6 @@ const saveFormData = async () =>{
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
-
   } finally {
     formLoading.value = false
   }
@@ -679,7 +681,7 @@ const saveFormData = async () =>{
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  if(formData.value.matItemDOList.length === 0){
+  if (formData.value.matItemDOList.length === 0) {
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -693,11 +695,11 @@ const submitForm = async () => {
   await saveFormData()
 
   // 成功后刷新
-  query.type= 'update'
+  query.type = 'update'
   query.id = storageid.value
   formData.value.id = storageid.value
   //页面重新加载
-  reload();
+  reload()
 }
 
 var matCount = 1
@@ -866,7 +868,6 @@ onMounted(async () => {
       isShowBtnDelete.value = false
     }
 
-
     //获得库区列表
     const queryParamsRg = reactive({
       pageNo: 1,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 80439a0e..3b8340de 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -1,9 +1,14 @@
 <template>
   <!-- 出库 -->
-  <el-card class="hl-card">
+  <el-card class="hl-card" style="position: relative">
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
+    <div class="abstatus">
+      <img src="/src/assets/imgs/status/status2.png" v-if="formData.status == 2" alt="" />
+      <img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
+      <span v-else></span>
+    </div>
     <el-form
       ref="formRef"
       :model="formData"
@@ -177,7 +182,12 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
+                  <el-table-column
+                    prop="matSpec"
+                    label="规格/型号"
+                    min-width="120"
+                    align="center"
+                  />
 
                   <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
                     <template #default="scope">
@@ -214,7 +224,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="pnId" min-width="140" align="center">
-                       <template #header> <span class="hl-table_header">*</span>出库库位 </template>
+                    <template #header> <span class="hl-table_header">*</span>出库库位 </template>
                     <template #default="scope">
                       <el-form-item
                         :prop="`${scope.$index}.pnId`"
@@ -489,10 +499,9 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
-
   // 校验表单
   await formRef.value.validate()
-  if(formData.value.matItemDOList.length === 0){
+  if (formData.value.matItemDOList.length === 0) {
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -547,7 +556,7 @@ const handleStatus = async (num) => {
     isShowBtnDelete.value = false
   }
   query.id = storageid.value
-  query.type= 'update'
+  query.type = 'update'
   reload()
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
@@ -611,7 +620,7 @@ var commonResult = ''
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
-const saveFormData = async () =>{
+const saveFormData = async () => {
   //获取最新库存信息
   const matCurrentData = await StorageMatApi.getStorageMatList()
   var hasRestNum = true
@@ -660,9 +669,6 @@ const saveFormData = async () =>{
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
-
-    
-   
   } finally {
     formLoading.value = false
   }
@@ -670,7 +676,7 @@ const saveFormData = async () =>{
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  if(formData.value.matItemDOList.length === 0){
+  if (formData.value.matItemDOList.length === 0) {
     message.alertWarning('请添加物料信息!')
     return
   }
@@ -684,7 +690,7 @@ const submitForm = async () => {
   await saveFormData()
   // 成功后刷新
   query.id = storageid.value
-  query.type= 'update'
+  query.type = 'update'
   reload()
 }
 
@@ -712,7 +718,6 @@ const onAddItem = () => {
     }
     matCount = matCount + 1
 
-
     formData.value.matItemDOList.push(newData)
   } else {
     message.alertWarning('请选择出库仓库')
@@ -748,11 +753,14 @@ const handleWh = async (wid) => {
   let matParams = {
     pageNo: 1,
     pageSize: 99,
-    status: "1"
+    status: '1'
   }
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined)
+  matList.value = dataMat.list.filter(
+    (item) =>
+      matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
+  )
 
   formData.value.matItemDOList = []
   // formData.value.matItemDOList.forEach(item => {
@@ -792,7 +800,12 @@ const remoteMatCodeSearch = async (name) => {
 
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined)
+  matList.value = dataMat.list.filter(
+    (item) =>
+      matLastRemoteData.find(
+        (fish) => fish.matId === item.id && fish.whId == formData.value.whId
+      ) !== undefined
+  )
   matSelectLoading.value = false
 }
 
@@ -840,7 +853,7 @@ const handleMatCode = async (scope, matid) => {
 const isShowBtnGroup = ref(true)
 const isShowBtnCancel = ref(false)
 const isShowBtnOther = ref(false)
-const isShowBtnDelete  = ref(true)
+const isShowBtnDelete = ref(true)
 const btnWhClickable = ref(false)
 const matLastData = ref([])
 /** 初始化 **/
@@ -862,8 +875,6 @@ onMounted(async () => {
   dialogTitle.value = t('action.' + query.type)
   dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
 
- 
-
   //-------------------仓库全数据
   const data = await WarehouseApi.getWarehouseSimpList()
   warehouseList.value = data

From dfafb5dbffee413a37980a90c7810e5713604a3a Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 25 Jan 2024 12:50:38 +0800
Subject: [PATCH 15/64] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=20=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=9C=AA=E5=AE=8C=E6=88=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes-ui-admin-vue3/src/views/heli/projectorder/index.vue  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
index 3cb62508..08013c84 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
@@ -248,9 +248,10 @@
                       <el-dropdown-item v-if="scope.row.hasAlter" command="viewArchive"
                         >查看归档日志</el-dropdown-item
                       >
-                      <el-dropdown-item v-if="scope.row.orderStatus == 32" command="delivery"
+<!--  临时隐藏，分阶段上线                    -->
+<!--                      <el-dropdown-item v-if="scope.row.orderStatus == 32" command="delivery"
                         >去发货</el-dropdown-item
-                      >
+                      >-->
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>

From 3d2b2f9abd014a89de25800d745b7b2758ad417f Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Thu, 25 Jan 2024 14:08:33 +0800
Subject: [PATCH 16/64] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss  |  44 +--
 .../src/views/heli/projectorder/detail.vue    | 362 +++++++++---------
 2 files changed, 206 insertions(+), 200 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index 9395a945..de533acf 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -105,10 +105,10 @@
   }
 
   .el-card__body {
-    padding: 15px 0px;
+    padding: 10px 0px;
 
     .el-row {
-      margin: 10px;
+      margin: 5px 0;
     }
   }
 }
@@ -204,43 +204,43 @@
 
 //已变更
 .ialteration {
-  border: 1px solid #F39800;
-  background-color: #F7F3ED;
-  color: #F39800;
+  border: 1px solid #f39800;
+  background-color: #f7f3ed;
+  color: #f39800;
 }
 //已提交
 .isubmit {
   border: 1px solid #356899;
-  background-color: #ECF0F4;
+  background-color: #ecf0f4;
   color: #356899;
 }
 //已作废
 .icancellation {
-  border: 1px solid #95969D;
-  background-color: #EBEBEB;
-  color: #95969D;
+  border: 1px solid #95969d;
+  background-color: #ebebeb;
+  color: #95969d;
 }
 //已终止
 .ibreakup {
-  border: 1px solid #0D0D26;
-  background-color: #E8E8E8;
-  color: #0D0D26;
+  border: 1px solid #0d0d26;
+  background-color: #e8e8e8;
+  color: #0d0d26;
 }
 
 //全部发货
-.allshipments{
-  color: #3AC33D;
-  background-color:transparent;
+.allshipments {
+  color: #3ac33d;
+  background-color: transparent;
   border: none;
 }
 //未发货
-.noshipments{
-  color: #4589FF;
-  background-color:transparent;
+.noshipments {
+  color: #4589ff;
+  background-color: transparent;
   border: none;
 }
-.partshipments{
-  color: #19A998;
-  background-color:transparent;
+.partshipments {
+  color: #19a998;
+  background-color: transparent;
   border: none;
-}
\ No newline at end of file
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 7587bf65..a77c36fd 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -50,81 +50,164 @@
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
         </template>
         <el-row>
-          <el-col :span="6">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="项目编号" prop="code">
-                  <el-input
-                    v-if="query.active != 'detailArchive'"
-                    disabled
-                    v-model="formData.code"
-                    class="!w-250px"
-                    placeholder="系统自动生成"
-                  />
-                  <el-input
-                    v-else
-                    disabled
-                    v-model="formData.snapshotCode"
-                    class="!w-250px"
-                    placeholder="系统自动生成"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="提出部门" prop="businessDeptId">
-                  <el-tree-select
-                    class="!w-250px"
-                    v-model="formData.businessDeptId"
-                    :data="deptList"
-                    :props="defaultProps"
-                    check-strictly
-                    node-key="id"
-                    clearable
-                    placeholder="请选择提出部门"
-                    :disabled="alterDisabled || detailDisabled"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
+          <el-col :span="12">
             <el-row>
-              <el-col :span="24">
-                <el-form-item label="所属业务线" prop="businessLine">
-                  <el-select
-                    class="!w-250px"
-                    v-model="formData.businessLine"
-                    placeholder="请选择所属业务线"
-                    :disabled="alterDisabled || detailDisabled"
-                  >
-                    <el-option
-                      v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BUSINESS_LINE)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
+              <el-col :span="12">
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目编号" prop="code">
+                      <el-input
+                        v-if="query.active != 'detailArchive'"
+                        disabled
+                        v-model="formData.code"
+                        class="!w-250px"
+                        placeholder="系统自动生成"
+                      />
+                      <el-input
+                        v-else
+                        disabled
+                        v-model="formData.snapshotCode"
+                        class="!w-250px"
+                        placeholder="系统自动生成"
+                      />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="提出部门" prop="businessDeptId">
+                      <el-tree-select
+                        class="!w-250px"
+                        v-model="formData.businessDeptId"
+                        :data="deptList"
+                        :props="defaultProps"
+                        check-strictly
+                        node-key="id"
+                        clearable
+                        placeholder="请选择提出部门"
+                        :disabled="alterDisabled || detailDisabled"
+                      />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="模具名称" prop="mouldName">
+                      <el-input
+                        class="!w-250px"
+                        :disabled="alterDisabled || detailDisabled"
+                        v-model="formData.mouldName"
+                        placeholder="请输入模具名称"
+                      />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目开始日期" prop="projectStartTime">
+                      <el-date-picker
+                        class="!w-250px"
+                        v-model="formData.projectStartTime"
+                        type="date"
+                        value-format="x"
+                        placeholder="选择项目开始日期"
+                        :disabled="alterDisabled || detailDisabled"
+                      />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="项目开始日期" prop="projectStartTime">
-                  <el-date-picker
-                    v-model="formData.projectStartTime"
-                    type="date"
-                    value-format="x"
-                    placeholder="选择项目开始日期"
-                    :disabled="alterDisabled || detailDisabled"
-                  />
-                </el-form-item>
+              <el-col :span="12">
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="单据日期" prop="orderTime">
+                      {{
+                        query.active != 'detailArchive'
+                          ? formatDate(formData.orderTime, 'YYYY-MM-DD')
+                          : formatDate(formData.snapshotOrderTime, 'YYYY-MM-DD')
+                      }}
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="业务员" prop="businessMan">
+                      <el-select
+                        class="!w-250px"
+                        v-model="formData.businessMan"
+                        placeholder="请输入负责人"
+                        :remote-method="remoteUserSearch"
+                        remote-show-suffix
+                        remote
+                        clearable
+                        reserve-keyword
+                        filterable
+                        :loading="userSelectLoading"
+                        :disabled="alterDisabled || detailDisabled"
+                      >
+                        <el-option
+                          v-for="item in userSelectList"
+                          :key="item.id"
+                          :label="item.username + ' ' + item.nickname"
+                          :value="item.id"
+                        />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="所属业务线" prop="businessLine">
+                      <el-select
+                        class="!w-250px"
+                        v-model="formData.businessLine"
+                        placeholder="请选择所属业务线"
+                        :disabled="alterDisabled || detailDisabled"
+                      >
+                        <el-option
+                          v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BUSINESS_LINE)"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目结束日期" prop="projectEndTime">
+                      <el-date-picker
+                        class="!w-250px"
+                        :class="{ 'alter-class': fieldHasAlter('projectEndTime') }"
+                        v-model="formData.projectEndTime"
+                        type="date"
+                        value-format="x"
+                        placeholder="选择项目结束日期"
+                        :disabled="detailDisabled"
+                      />
+                      <span
+                        style="position: absolute; left: 0; top: 30px"
+                        v-if="formData.projectStartTime && formData.projectEndTime"
+                        >{{
+                          ' 共计' +
+                          betweenDay(
+                            new Date(formData.projectStartTime),
+                            new Date(formData.projectEndTime)
+                          ) +
+                          '天'
+                        }}</span
+                      >
+                    </el-form-item>
+                  </el-col>
+                </el-row>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item label="可引用的原有技术" prop="referenceTechnology">
                   <el-input
-                    class="!w-250px"
+                    class="!w-703px"
                     :disabled="detailDisabled"
                     v-model="formData.referenceTechnology"
                     placeholder="请输入可引用的原有技术"
@@ -134,38 +217,35 @@
               </el-col>
             </el-row>
           </el-col>
+
           <el-col :span="6">
             <el-row>
               <el-col :span="24">
-                <el-form-item label="单据日期" prop="orderTime">
-                  {{
-                    query.active != 'detailArchive'
-                      ? formatDate(formData.orderTime, 'YYYY-MM-DD')
-                      : formatDate(formData.snapshotOrderTime, 'YYYY-MM-DD')
-                  }}
+                <el-form-item label="单据状态" prop="orderStatus">
+                  {{ getDictLabel(DICT_TYPE.HELI_PROJECT_ORDER_STATUS, formData.orderStatus) }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="业务员" prop="businessMan">
+                <el-form-item label="客户名称" prop="customerId">
                   <el-select
                     class="!w-250px"
-                    v-model="formData.businessMan"
-                    placeholder="请输入负责人"
-                    :remote-method="remoteUserSearch"
+                    v-model="formData.customerId"
+                    placeholder="请输入客户名称"
+                    :remote-method="remoteCustomerSearch"
                     remote-show-suffix
                     remote
                     clearable
                     reserve-keyword
                     filterable
-                    :loading="userSelectLoading"
+                    :loading="customerSelectLoading"
                     :disabled="alterDisabled || detailDisabled"
                   >
                     <el-option
-                      v-for="item in userSelectList"
+                      v-for="item in customerSelectList"
                       :key="item.id"
-                      :label="item.username + ' ' + item.nickname"
+                      :label="item.name"
                       :value="item.id"
                     />
                   </el-select>
@@ -174,73 +254,19 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="模具图号" prop="blueprintNo">
-                  <el-input
-                    class="!w-250px"
-                    :disabled="alterDisabled || detailDisabled"
-                    v-model="formData.blueprintNo"
-                    placeholder="请输入模具图号"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="项目结束日期" prop="projectEndTime">
-                  <el-date-picker
-                    class="!w-250px"
-                    :class="{ 'alter-class': fieldHasAlter('projectEndTime') }"
-                    v-model="formData.projectEndTime"
-                    type="date"
-                    value-format="x"
-                    placeholder="选择项目结束日期"
-                    :disabled="detailDisabled"
-                  />
-                  <span
-                    style="position: absolute;left:0;top:30px"
-                    v-if="formData.projectStartTime && formData.projectEndTime"
-                    >{{
-                      ' 共计' +
-                      betweenDay(
-                        new Date(formData.projectStartTime),
-                        new Date(formData.projectEndTime)
-                      ) +
-                      '天'
-                    }}</span
-                  >
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-col>
-          <el-col :span="6">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="单据状态" prop="orderStatus">
-                  {{ getDictLabel(DICT_TYPE.HELI_PROJECT_ORDER_STATUS, formData.orderStatus) }}
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="客户名称" prop="customerId">
+                <el-form-item label="性质" prop="property">
                   <el-select
                     class="!w-250px"
-                    v-model="formData.customerId"
-                    placeholder="请输入客户名称"
-                    :remote-method="remoteCustomerSearch"
-                    remote-show-suffix
-                    remote
-                    clearable
-                    reserve-keyword
-                    filterable
-                    :loading="customerSelectLoading"
-                    :disabled="alterDisabled || detailDisabled"
+                    :class="{ 'alter-class': fieldHasAlter('property') }"
+                    :disabled="detailDisabled"
+                    v-model="formData.property"
+                    placeholder="请选择性质"
                   >
                     <el-option
-                      v-for="item in customerSelectList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
+                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PROPERTY)"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
                     />
                   </el-select>
                 </el-form-item>
@@ -284,21 +310,6 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="是否已变更" prop="hasAlter">
-                  <el-radio-group v-model="formData.hasAlter" disabled>
-                    <el-radio
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
-                      :key="dict.value"
-                      :label="dict.value"
-                    >
-                      {{ dict.label }}
-                    </el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-col>
           <el-col :span="6">
             <el-row>
@@ -322,12 +333,12 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="模具名称" prop="mouldName">
+                <el-form-item label="模具图号" prop="blueprintNo">
                   <el-input
                     class="!w-250px"
                     :disabled="alterDisabled || detailDisabled"
-                    v-model="formData.mouldName"
-                    placeholder="请输入模具名称"
+                    v-model="formData.blueprintNo"
+                    placeholder="请输入模具图号"
                   />
                 </el-form-item>
               </el-col>
@@ -366,31 +377,26 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="性质" prop="property">
-                  <el-select
-                    class="!w-250px"
-                    :class="{ 'alter-class': fieldHasAlter('property') }"
-                    :disabled="detailDisabled"
-                    v-model="formData.property"
-                    placeholder="请选择性质"
-                  >
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PROPERTY)"
+                <el-form-item label="是否已变更" prop="hasAlter">
+                  <el-radio-group v-model="formData.hasAlter" disabled>
+                    <el-radio
+                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
                       :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
+                      :label="dict.value"
+                    >
+                      {{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-col>
         </el-row>
-        <el-row style="margin-top:-10px;margin-left:15px">
+        <el-row >
           <el-col :span="12">
             <el-form-item label="检验要求" prop="qualityRequirement">
               <el-input
-                class="!w-700px"
+                class="!w-703px"
                 :disabled="detailDisabled"
                 type="textarea"
                 v-model="formData.qualityRequirement"
@@ -404,7 +410,7 @@
           <el-col :span="12">
             <el-form-item label="备注" prop="remark" :disabled="detailDisabled">
               <el-input
-                class="!w-700px"
+                class="!w-703px"
                 :disabled="detailDisabled"
                 type="textarea"
                 v-model="formData.remark"

From 609841764f3d8d865d812e15ca9118d98ffa5771 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 25 Jan 2024 14:13:38 +0800
Subject: [PATCH 17/64] =?UTF-8?q?=E3=80=90bug=E3=80=91=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BD=93=E5=89=8D=E4=BA=BA=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=E6=80=A7=E9=97=AE=E9=A2=98=E3=80=81=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BC=BA=E5=B0=91=E6=98=AF=E5=90=A6=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/projectorder/ProjectOrderMapper.java    |  1 +
 .../src/views/heli/projectorder/approve.vue       | 15 +++++++++++++++
 .../src/views/heli/projectorder/archive.vue       | 15 +++++++++++++++
 .../src/views/heli/projectorder/audit.vue         | 15 +++++++++++++++
 .../src/views/heli/projectorder/detail.vue        | 11 +++++++++++
 .../src/views/heli/projectorder/index.vue         | 15 +++++++++++++++
 sql/{v1.1.1 => v1.2.0}/1.structure.sql            |  3 +++
 sql/{v1.1.1 => v1.2.0}/2.data.sql                 |  0
 8 files changed, 75 insertions(+)
 rename sql/{v1.1.1 => v1.2.0}/1.structure.sql (56%)
 rename sql/{v1.1.1 => v1.2.0}/2.data.sql (100%)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
index c608230b..be4bde63 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
@@ -38,6 +38,7 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
                 .eq(reqVO.getDeliveryStatus() != null, ProjectOrderDO::getDeliveryStatus, reqVO.getDeliveryStatus())
                 .in(reqVO.getOrderStatusList() != null && !reqVO.getOrderStatusList().isEmpty(), ProjectOrderDO::getOrderStatus, reqVO.getOrderStatusList())
                 .eq(reqVO.getIsSnapshot() != null, ProjectOrderDO::getIsSnapshot, reqVO.getIsSnapshot())
+                .eq(reqVO.getHasAlter() != null, ProjectOrderDO::getHasAlter, reqVO.getHasAlter())
                 .like(!StringUtils.isEmpty(reqVO.getSnapshotCode()), ProjectOrderDO::getSnapshotCode, reqVO.getSnapshotCode());
         ;
         return selectPage(reqVO, query);
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
index 92b71834..ad5f95a1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
@@ -66,6 +66,21 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否已变更" prop="hasAlter">
+        <el-select
+          v-model="queryParams.hasAlter"
+          placeholder="请选择是否有价格"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="单据状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
index fa745f52..ec127c2c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
@@ -64,6 +64,21 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否已变更" prop="hasAlter">
+        <el-select
+          v-model="queryParams.hasAlter"
+          placeholder="请选择是否有价格"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="单据状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
index 1e25f146..284aab3c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
@@ -64,6 +64,21 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否已变更" prop="hasAlter">
+        <el-select
+          v-model="queryParams.hasAlter"
+          placeholder="请选择是否有价格"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="单据状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 7587bf65..cf2ba212 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -1083,6 +1083,17 @@ const queryData = async (type: string, id?: number) => {
     if (userProfile.dept) {
       formData.value.businessDeptId = userProfile.dept.id
     }
+    // 判断远程查询中是否存在当前默认人 如无则手动设置
+    const hasContainMe = userSelectList.value.some(user => {
+      return user.id == formData.value.businessMan
+    })
+    if(!hasContainMe){
+      if(userSelectList.value.length == userParams.pageSize){
+        userSelectList.value.splice(userSelectList.value.length-1,1,
+          {id: userProfile.id, username: userProfile.username, nickname: userProfile.nickname})
+      }
+
+    }
   } finally {
     formLoading.value = false
   }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
index 08013c84..a2baac67 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
@@ -64,6 +64,21 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="是否已变更" prop="hasAlter">
+          <el-select
+            v-model="queryParams.hasAlter"
+            placeholder="请选择是否有价格"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="单据状态" prop="orderStatus">
           <el-select
             v-model="queryParams.orderStatus"
diff --git a/sql/v1.1.1/1.structure.sql b/sql/v1.2.0/1.structure.sql
similarity index 56%
rename from sql/v1.1.1/1.structure.sql
rename to sql/v1.2.0/1.structure.sql
index 42d77aeb..4cbdc84c 100644
--- a/sql/v1.1.1/1.structure.sql
+++ b/sql/v1.2.0/1.structure.sql
@@ -3,3 +3,6 @@ ALTER TABLE project_sale_order COMMENT '项目销售订单表';
 
 ALTER TABLE project_order_sub RENAME project_sale_order_sub;
 ALTER TABLE project_sale_order_sub COMMENT '项目销售订单子项表';
+
+ALTER TABLE base_serial_number DROP INDEX uk_business_segment;
+ALTER TABLE base_serial_number ADD UNIQUE INDEX `uk_business_segment` ( `business_type`, `segment`, `tenant_id` ) USING BTREE;
diff --git a/sql/v1.1.1/2.data.sql b/sql/v1.2.0/2.data.sql
similarity index 100%
rename from sql/v1.1.1/2.data.sql
rename to sql/v1.2.0/2.data.sql

From b76af9758540af95233c07d5cf021eb02335d69e Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 25 Jan 2024 14:23:21 +0800
Subject: [PATCH 18/64] =?UTF-8?q?=E3=80=90bug=E3=80=91=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E5=A4=8D=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E9=80=81=E5=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heli/service/projectorder/ProjectOrderServiceImpl.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
index 2d010bcf..b4a19f04 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
@@ -76,6 +76,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
         // 客户编号
         CustomerDO customer = customerService.getCustomer(projectOrder.getCustomerId());
         projectOrder.setCode(PROJECT_ORDER.getCode(customer.getCode(), serialNumberDO.getSerialNumber().toString()));
+        projectOrder.setOrderStatus(ProjectOrderStatusEnum.valueOf(createReqVO.getActive()).getCode());
         projectOrderMapper.insert(projectOrder);
 
         // 插入子表

From 37d8391c2e1a277cacc9d0d6a067dc36c457ed49 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 25 Jan 2024 14:45:49 +0800
Subject: [PATCH 19/64] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BD=92=E6=A1=A3=E6=97=A5=E5=BF=97=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E9=9A=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
index a2baac67..e5c21f65 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
@@ -260,7 +260,7 @@
                       <el-dropdown-item v-if="scope.row.orderStatus == 32" command="alter"
                         >订单变更</el-dropdown-item
                       >
-                      <el-dropdown-item v-if="scope.row.hasAlter" command="viewArchive"
+                      <el-dropdown-item command="viewArchive"
                         >查看归档日志</el-dropdown-item
                       >
 <!--  临时隐藏，分阶段上线                    -->

From e65ac1944c2f46b38c62d666160c16eb41c332d7 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 25 Jan 2024 15:14:24 +0800
Subject: [PATCH 20/64] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=AE=A1=E7=90=86=E5=BB=BA=E8=A1=A8sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/v1.2.0/1.structure.sql | 56 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/sql/v1.2.0/1.structure.sql b/sql/v1.2.0/1.structure.sql
index 4cbdc84c..b6f8e542 100644
--- a/sql/v1.2.0/1.structure.sql
+++ b/sql/v1.2.0/1.structure.sql
@@ -6,3 +6,59 @@ ALTER TABLE project_sale_order_sub COMMENT '项目销售订单子项表';
 
 ALTER TABLE base_serial_number DROP INDEX uk_business_segment;
 ALTER TABLE base_serial_number ADD UNIQUE INDEX `uk_business_segment` ( `business_type`, `segment`, `tenant_id` ) USING BTREE;
+
+ALTER TABLE project_sale_order DROP INDEX `uk_code`;
+ALTER TABLE project_sale_order ADD UNIQUE INDEX `uk_code` ( `code`, `tenant_id` );
+
+DROP TABLE IF EXISTS `project_deliver_order`;
+CREATE TABLE `project_deliver_order` (
+                                         `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增字段，唯一',
+                                         `code` varchar(64) NOT NULL COMMENT '编号，唯一',
+                                         `sale_order_ids` varchar(255) not null comment '销售订单id列表 多个用英文逗号分割',
+                                         `customer_id` BIGINT(20) not null comment '客户id',
+                                         `deliver_date` DATETIME not null comment '发货日期',
+                                         `deliver_status` char(1) not null COMMENT '发货单状态 已保存/已发货',
+                                         `deliver_person` BIGINT(20) not null comment '发货人',
+                                         `deliver_person_mobile` varchar(32) not null comment '发货人电话',
+                                         `deliver_mode` char(1) not null comment '发货方式',
+                                         `receive_person_name` BIGINT(20) not null comment '收货人姓名',
+                                         `receive_person_mobile` varchar(32) not null comment '收货人电话',
+                                         `transport_driver_name` varchar(16) comment '司机姓名',
+                                         `transport_driver_mobile` varchar(32) comment '司机电话',
+                                         `transport_bus_number` varchar(32) comment '车牌号',
+                                         `transport_weight` varchar(16) comment '重量(T)',
+                                         `transport_size` varchar(16) comment '位置(米)',
+                                         `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+                                         `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态,1表示正常，2表示禁用',
+                                         `creator` varchar(64) DEFAULT '' COMMENT '创建者',
+                                         `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                         `updater` varchar(64) DEFAULT '' COMMENT '更新者',
+                                         `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                         `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+                                         `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
+                                         PRIMARY KEY (`id`) USING BTREE,
+                                         UNIQUE KEY `uk_code` (`code`,`tenant_id`) USING BTREE
+) ENGINE=InnoDB COMMENT='发货订单表';
+
+DROP TABLE IF EXISTS `project_deliver_order_sub`;
+CREATE TABLE `project_deliver_order_sub` (
+                                             `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增字段，唯一',
+                                             `delivery_order_id` bigint(20) NOT NULL COMMENT '订单id',
+                                             `category` char(1) not null comment '业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST',
+                                             `name` varchar(128) NOT NULL COMMENT '名称，唯一',
+                                             `blueprint_no` varchar(64) DEFAULT NULL COMMENT '图号',
+                                             `amount` int(11) NOT NULL COMMENT '数量',
+                                             `unit` char(1) NOT NULL COMMENT '单位',
+                                             `weight` varchar(16) comment '重量(T)',
+                                             `size` varchar(16) comment '尺寸(米)',
+                                             `sub_type` char(1) comment '子项类型',
+                                             `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+                                             `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态,1表示正常，2表示禁用',
+                                             `creator` varchar(64) DEFAULT '' COMMENT '创建者',
+                                             `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                             `updater` varchar(64) DEFAULT '' COMMENT '更新者',
+                                             `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                             `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+                                             `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
+                                             PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='发货订单子项表';

From 0fd48a14ce3a5f46be8a05867c42867edb44c0ff Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Thu, 25 Jan 2024 17:43:57 +0800
Subject: [PATCH 21/64] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=BF=85=E5=A1=AB=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/projectorder/detail.vue    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 9842fc99..19e6d76d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -392,7 +392,7 @@
             </el-row>
           </el-col>
         </el-row>
-        <el-row >
+        <el-row>
           <el-col :span="12">
             <el-form-item label="检验要求" prop="qualityRequirement">
               <el-input
@@ -514,7 +514,8 @@
               >
                 <el-table :data="formData.projectOrderSubs" class="hl-table">
                   <el-table-column label="序号" type="index" width="100" />
-                  <el-table-column label="子项目名称" min-width="150">
+                  <el-table-column min-width="150" align="center">
+                    <template #header> <span class="hl-table_header">*</span>子项目名称 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.name`"
@@ -544,7 +545,8 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="数量" min-width="150">
+                  <el-table-column min-width="150">
+                    <template #header> <span class="hl-table_header">*</span>数量 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.amount`"
@@ -562,7 +564,8 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="单位" min-width="150">
+                  <el-table-column min-width="150">
+                    <template #header> <span class="hl-table_header">*</span>单位 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.unit`"
@@ -585,7 +588,8 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="材质" min-width="150">
+                  <el-table-column min-width="150">
+                    <template #header> <span class="hl-table_header">*</span>材质 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.compositionId`"
@@ -1090,15 +1094,17 @@ const queryData = async (type: string, id?: number) => {
       formData.value.businessDeptId = userProfile.dept.id
     }
     // 判断远程查询中是否存在当前默认人 如无则手动设置
-    const hasContainMe = userSelectList.value.some(user => {
+    const hasContainMe = userSelectList.value.some((user) => {
       return user.id == formData.value.businessMan
     })
-    if(!hasContainMe){
-      if(userSelectList.value.length == userParams.pageSize){
-        userSelectList.value.splice(userSelectList.value.length-1,1,
-          {id: userProfile.id, username: userProfile.username, nickname: userProfile.nickname})
+    if (!hasContainMe) {
+      if (userSelectList.value.length == userParams.pageSize) {
+        userSelectList.value.splice(userSelectList.value.length - 1, 1, {
+          id: userProfile.id,
+          username: userProfile.username,
+          nickname: userProfile.nickname
+        })
       }
-
     }
   } finally {
     formLoading.value = false

From 46088a534c7a37224fbd8a45879fb8a7b36c03ac Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 25 Jan 2024 17:58:15 +0800
Subject: [PATCH 22/64] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 9842fc99..e3ce99db 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -576,7 +576,7 @@
                           :class="{ 'alter-class': fieldHasAlterInRow('unit', row) }"
                         >
                           <el-option
-                            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_PROJECT_ORDER_SUB_UNIT)"
+                            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)"
                             :key="dict.value"
                             :label="dict.label"
                             :value="dict.value"

From 6cf7f197796ad3a45f0ae07b89c1204fd569f17d Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Fri, 26 Jan 2024 12:47:40 +0800
Subject: [PATCH 23/64] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E3=80=91=E5=8F=91=E8=B4=A7=E5=8D=95=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/heli/enums/BusinesTypeEnum.java    |   4 +-
 .../heli/enums/DeliverOrderStatusEnum.java    |  23 ++
 .../module/heli/enums/ErrorCodeConstants.java |   4 +
 .../deliverorder/DeliverOrderController.java  | 106 +++++++
 .../vo/DeliverOrderPageReqVO.java             |  86 ++++++
 .../deliverorder/vo/DeliverOrderRespVO.java   | 121 ++++++++
 .../vo/DeliverOrderSaveReqVO.java             |  88 ++++++
 .../deliverorder/DeliverOrderDO.java          | 122 ++++++++
 .../deliverorder/DeliverOrderSubDO.java       |  85 ++++++
 .../deliverorder/DeliverOrderMapper.java      |  45 +++
 .../deliverorder/DeliverOrderSubMapper.java   |  28 ++
 .../deliverorder/DeliverOrderService.java     |  66 +++++
 .../deliverorder/DeliverOrderServiceImpl.java | 112 ++++++++
 .../deliverorder/DeliverOrderMapper.xml       |  12 +
 .../deliverorder/DeliverOrderMapper.xml       |  12 +
 .../src/api/heli/deliverorder/index.ts        |  60 ++++
 mes-ui/mes-ui-admin-vue3/src/utils/dict.ts    |   2 +
 .../heli/deliverorder/DeliverOrderForm.vue    | 227 +++++++++++++++
 .../components/DeliverOrderSubForm.vue        | 191 +++++++++++++
 .../src/views/heli/deliverorder/index.vue     | 265 ++++++++++++++++++
 sql/v1.2.0/1.structure.sql                    |   5 +-
 21 files changed, 1661 insertions(+), 3 deletions(-)
 create mode 100644 mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/DeliverOrderStatusEnum.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderPageReqVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderRespVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderSubDO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderSubMapper.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml
 create mode 100644 mes-server/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/DeliverOrderForm.vue
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue

diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinesTypeEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinesTypeEnum.java
index 9bb966ae..dff0dbb2 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinesTypeEnum.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinesTypeEnum.java
@@ -11,7 +11,9 @@ import lombok.Getter;
 public enum BusinesTypeEnum {
 
     PROJECT_ORDER("销售订单"),
-    PROJECT_ORDER_SNAPSHOT("销售订单快照");
+    PROJECT_ORDER_SNAPSHOT("销售订单快照"),
+    DELIVER_ORDER("发货订单"),
+    ;
 
     private String description;
 
diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/DeliverOrderStatusEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/DeliverOrderStatusEnum.java
new file mode 100644
index 00000000..dc5de32b
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/DeliverOrderStatusEnum.java
@@ -0,0 +1,23 @@
+package com.chanko.yunxi.mes.module.heli.enums;
+
+import lombok.Getter;
+
+/**
+ * 发货单状态枚举
+ * @author chenxi
+ * @date 2024-01-26 12:38
+ */
+@Getter
+public enum DeliverOrderStatusEnum {
+
+    DEFAULT(1, "已保存"),
+    FINISHED(2, "已发货");
+
+    private int code;
+    private String description;
+
+    DeliverOrderStatusEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+}
diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
index 2736cbd0..a6462988 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
@@ -15,6 +15,7 @@ import com.chanko.yunxi.mes.framework.common.exception.ErrorCode;
  *   002 组织架构
  *   003 库存管理
  *   004 订单管理
+ *   005 发货管理
  * 第三段，3 位，错误码
  */
 public interface ErrorCodeConstants {
@@ -47,4 +48,7 @@ public interface ErrorCodeConstants {
     /************订单管理***********/
     ErrorCode PROJECT_ORDER_NOT_EXISTS = new ErrorCode(1_004_001, "项目订单不存在");
 
+    /************发货管理***********/
+    ErrorCode DELIVER_ORDER_NOT_EXISTS = new ErrorCode(1_005_001, "发货订单不存在");
+
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
new file mode 100644
index 00000000..4b0d5574
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
@@ -0,0 +1,106 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
+import com.chanko.yunxi.mes.module.heli.service.deliverorder.DeliverOrderService;
+
+@Tag(name = "管理后台 - 发货订单")
+@RestController
+@RequestMapping("/heli/deliver-order")
+@Validated
+public class DeliverOrderController {
+
+    @Resource
+    private DeliverOrderService deliverOrderService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建发货订单")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:create')")
+    public CommonResult<Long> createDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO createReqVO) {
+        return success(deliverOrderService.createDeliverOrder(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新发货订单")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:update')")
+    public CommonResult<Boolean> updateDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO updateReqVO) {
+        deliverOrderService.updateDeliverOrder(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除发货订单")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:delete')")
+    public CommonResult<Boolean> deleteDeliverOrder(@RequestParam("id") Long id) {
+        deliverOrderService.deleteDeliverOrder(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得发货订单")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
+    public CommonResult<DeliverOrderRespVO> getDeliverOrder(@RequestParam("id") Long id) {
+        DeliverOrderDO deliverOrder = deliverOrderService.getDeliverOrder(id);
+        return success(BeanUtils.toBean(deliverOrder, DeliverOrderRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得发货订单分页")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
+    public CommonResult<PageResult<DeliverOrderRespVO>> getDeliverOrderPage(@Valid DeliverOrderPageReqVO pageReqVO) {
+        PageResult<DeliverOrderDO> pageResult = deliverOrderService.getDeliverOrderPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, DeliverOrderRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出发货订单 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:export')")
+    @OperateLog(type = EXPORT)
+    public void exportDeliverOrderExcel(@Valid DeliverOrderPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<DeliverOrderDO> list = deliverOrderService.getDeliverOrderPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "发货订单.xls", "数据", DeliverOrderRespVO.class,
+                        BeanUtils.toBean(list, DeliverOrderRespVO.class));
+    }
+
+    // ==================== 子表（发货订单子项） ====================
+
+    @GetMapping("/deliver-order-sub/list-by-delivery-order-id")
+    @Operation(summary = "获得发货订单子项列表")
+    @Parameter(name = "deliveryOrderId", description = "订单id")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
+    public CommonResult<List<DeliverOrderSubDO>> getDeliverOrderSubListByDeliveryOrderId(@RequestParam("deliveryOrderId") Long deliveryOrderId) {
+        return success(deliverOrderService.getDeliverOrderSubListByDeliveryOrderId(deliveryOrderId));
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderPageReqVO.java
new file mode 100644
index 00000000..65a1c2ca
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderPageReqVO.java
@@ -0,0 +1,86 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 发货订单分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DeliverOrderPageReqVO extends PageParam {
+
+    @Schema(description = "编号，唯一")
+    private String code;
+
+    @Schema(description = "销售订单id列表 多个用英文逗号分割")
+    private String saleOrderIds;
+
+    @Schema(description = "项目销售订单编号")
+    private String saleOrderCode;
+
+    @Schema(description = "客户id", example = "22885")
+    private Long customerId;
+
+    @Schema(description = "客户名称")
+    private String customerName;
+
+    @Schema(description = "发货日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] deliverDate;
+
+    @Schema(description = "发货单状态 已保存/已发货", example = "1")
+    private Integer deliverStatus;
+
+    @Schema(description = "发货人")
+    private Long deliverPerson;
+
+    @Schema(description = "发货人电话")
+    private String deliverPersonMobile;
+
+    @Schema(description = "发货方式")
+    private String deliverMode;
+
+    @Schema(description = "收货人电话")
+    private String receivePersonMobile;
+
+    @Schema(description = "司机姓名", example = "王五")
+    private String transportDriverName;
+
+    @Schema(description = "司机电话")
+    private String transportDriverMobile;
+
+    @Schema(description = "车牌号")
+    private String transportBusNumber;
+
+    @Schema(description = "重量(T)")
+    private String transportWeight;
+
+    @Schema(description = "位置(米)")
+    private String transportSize;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "状态,1表示正常，2表示禁用", example = "1")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "收货人姓名", example = "张三")
+    private String receivePersonName;
+
+    @Schema(description = "收货详细地址")
+    private String receiveAddress;
+
+    @Schema(description = "模具名称")
+    private String mouldName;
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderRespVO.java
new file mode 100644
index 00000000..e38c4f23
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderRespVO.java
@@ -0,0 +1,121 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat;
+import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 发货订单 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class DeliverOrderRespVO {
+
+    @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "21429")
+    @ExcelProperty("自增字段，唯一")
+    private Long id;
+
+    @Schema(description = "编号，唯一", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("编号，唯一")
+    private String code;
+
+    @Schema(description = "销售订单id列表 多个用英文逗号分割", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("销售订单id列表 多个用英文逗号分割")
+    private String saleOrderIds;
+
+    @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "22885")
+    @ExcelProperty("客户id")
+    private Long customerId;
+
+    @Schema(description = "发货日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("发货日期")
+    private LocalDateTime deliverDate;
+
+    @Schema(description = "发货单状态 已保存/已发货", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty(value = "发货单状态 已保存/已发货", converter = DictConvert.class)
+    @DictFormat("heli_deliver_order_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer deliverStatus;
+
+    @Schema(description = "发货人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("发货人")
+    private Long deliverPerson;
+
+    @Schema(description = "发货人电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("发货人电话")
+    private String deliverPersonMobile;
+
+    @Schema(description = "发货方式", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty(value = "发货方式", converter = DictConvert.class)
+    @DictFormat("heli_deliver_mode") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private String deliverMode;
+
+    @Schema(description = "收货人电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("收货人电话")
+    private String receivePersonMobile;
+
+    @Schema(description = "司机姓名", example = "王五")
+    @ExcelProperty("司机姓名")
+    private String transportDriverName;
+
+    @Schema(description = "司机电话")
+    @ExcelProperty("司机电话")
+    private String transportDriverMobile;
+
+    @Schema(description = "车牌号")
+    @ExcelProperty("车牌号")
+    private String transportBusNumber;
+
+    @Schema(description = "重量(T)")
+    @ExcelProperty("重量(T)")
+    private String transportWeight;
+
+    @Schema(description = "位置(米)")
+    @ExcelProperty("位置(米)")
+    private String transportSize;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态,1表示正常，2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("状态,1表示正常，2表示禁用")
+    private Integer status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "收货人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("收货人姓名")
+    private String receivePersonName;
+
+    @Schema(description = "收货详细地址")
+    @ExcelProperty("收货详细地址")
+    private String receiveAddress;
+
+    @Schema(description = "项目销售单号")
+    @ExcelProperty("项目销售单号")
+    private String saleOrderCode;
+
+    @Schema(description = "合同号")
+    @ExcelProperty("合同号")
+    private String contractNo;
+
+    @Schema(description = "模具名称")
+    @ExcelProperty("模具名称")
+    private String mouldName;
+
+    @Schema(description = "性质")
+    @ExcelProperty("性质")
+    private String property;
+
+    @Schema(description = "客户名称")
+    @ExcelProperty("客户名称")
+    private String customerName;
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
new file mode 100644
index 00000000..43158d4d
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
@@ -0,0 +1,88 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
+
+@Schema(description = "管理后台 - 发货订单新增/修改 Request VO")
+@Data
+public class DeliverOrderSaveReqVO {
+
+    @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "21429")
+    private Long id;
+
+    @Schema(description = "编号，唯一", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "编号，唯一不能为空")
+    private String code;
+
+    @Schema(description = "销售订单id列表 多个用英文逗号分割", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "销售订单id列表 多个用英文逗号分割不能为空")
+    private String saleOrderIds;
+
+    @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "22885")
+    @NotNull(message = "客户id不能为空")
+    private Long customerId;
+
+    @Schema(description = "发货日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "发货日期不能为空")
+    private LocalDateTime deliverDate;
+
+    @Schema(description = "发货单状态 已保存/已发货", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "发货单状态 已保存/已发货不能为空")
+    private Integer deliverStatus;
+
+    @Schema(description = "发货人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "发货人不能为空")
+    private Long deliverPerson;
+
+    @Schema(description = "发货人电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "发货人电话不能为空")
+    private String deliverPersonMobile;
+
+    @Schema(description = "发货方式", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "发货方式不能为空")
+    private String deliverMode;
+
+    @Schema(description = "收货人电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "收货人电话不能为空")
+    private String receivePersonMobile;
+
+    @Schema(description = "司机姓名", example = "王五")
+    private String transportDriverName;
+
+    @Schema(description = "司机电话")
+    private String transportDriverMobile;
+
+    @Schema(description = "车牌号")
+    private String transportBusNumber;
+
+    @Schema(description = "重量(T)")
+    private String transportWeight;
+
+    @Schema(description = "位置(米)")
+    private String transportSize;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "状态,1表示正常，2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "状态,1表示正常，2表示禁用不能为空")
+    private Integer status;
+
+    @Schema(description = "收货人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "收货人姓名不能为空")
+    private String receivePersonName;
+
+    @Schema(description = "收货详细地址", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "收货详细地址不能为空")
+    private String receiveAddress;
+
+    @Schema(description = "发货订单子项列表")
+    private List<DeliverOrderSubDO> deliverOrderSubs;
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
new file mode 100644
index 00000000..8eaca3a7
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
@@ -0,0 +1,122 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 发货订单 DO
+ *
+ * @author 管理员
+ */
+@TableName("project_deliver_order")
+@KeySequence("project_deliver_order_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeliverOrderDO extends BaseDO {
+
+    /**
+     * 自增字段，唯一
+     */
+    @TableId
+    private Long id;
+    /**
+     * 编号，唯一
+     */
+    private String code;
+    /**
+     * 销售订单id列表 多个用英文逗号分割
+     */
+    private String saleOrderIds;
+    /**
+     * 客户id
+     */
+    private Long customerId;
+    /**
+     * 发货日期
+     */
+    private LocalDateTime deliverDate;
+    /**
+     * 发货单状态 已保存/已发货
+     *
+     * 枚举 {@link TODO heli_deliver_order_status 对应的类}
+     */
+    private Integer deliverStatus;
+    /**
+     * 发货人
+     */
+    private Long deliverPerson;
+    /**
+     * 发货人电话
+     */
+    private String deliverPersonMobile;
+    /**
+     * 发货方式
+     *
+     * 枚举 {@link TODO heli_deliver_mode 对应的类}
+     */
+    private String deliverMode;
+    /**
+     * 收货人电话
+     */
+    private String receivePersonMobile;
+    /**
+     * 司机姓名
+     */
+    private String transportDriverName;
+    /**
+     * 司机电话
+     */
+    private String transportDriverMobile;
+    /**
+     * 车牌号
+     */
+    private String transportBusNumber;
+    /**
+     * 重量(T)
+     */
+    private String transportWeight;
+    /**
+     * 位置(米)
+     */
+    private String transportSize;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态,1表示正常，2表示禁用
+     */
+    private Integer status;
+    /**
+     * 收货人姓名
+     */
+    private String receivePersonName;
+    /**
+     * 收货详细地址
+     */
+    private String receiveAddress;
+
+    @TableField(exist = false)
+    private String saleOrderCode;
+
+    @TableField(exist = false)
+    private String contractNo;
+
+    @TableField(exist = false)
+    private String mouldName;
+
+    @TableField(exist = false)
+    private String property;
+
+    @TableField(exist = false)
+    private String customerName;
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderSubDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderSubDO.java
new file mode 100644
index 00000000..01fb60e2
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderSubDO.java
@@ -0,0 +1,85 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 发货订单子项 DO
+ *
+ * @author 管理员
+ */
+@TableName("project_deliver_order_sub")
+@KeySequence("project_deliver_order_sub_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeliverOrderSubDO extends BaseDO {
+
+    /**
+     * 自增字段，唯一
+     */
+    @TableId
+    private Long id;
+    /**
+     * 订单id
+     */
+    private Long deliveryOrderId;
+    /**
+     * 业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST
+     *
+     * 枚举 {@link TODO heli_deliver_list_type 对应的类}
+     */
+    private String category;
+    /**
+     * 名称，唯一
+     */
+    private String name;
+    /**
+     * 图号
+     */
+    private String blueprintNo;
+    /**
+     * 数量
+     */
+    private Integer amount;
+    /**
+     * 单位
+     *
+     * 枚举 {@link TODO heli_material_unit 对应的类}
+     */
+    private String unit;
+    /**
+     * 重量(T)
+     */
+    private String weight;
+    /**
+     * 尺寸(米)
+     */
+    private String size;
+    /**
+     * 子项类型
+     *
+     * 枚举 {@link TODO heli_deliver_material_type 对应的类}
+     */
+    private String subType;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态,1表示正常，2表示禁用
+     */
+    private Integer status;
+    /**
+     * 删除 物理删除
+     */
+    private Boolean deleted;
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
new file mode 100644
index 00000000..f1b1029e
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
@@ -0,0 +1,45 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.util.collection.ArrayUtils;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.DeliverOrderPageReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.util.StringUtils;
+
+/**
+ * 发货订单 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface DeliverOrderMapper extends BaseMapperX<DeliverOrderDO> {
+
+    default PageResult<DeliverOrderDO> selectPage(DeliverOrderPageReqVO reqVO) {
+        MPJLambdaWrapper<DeliverOrderDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(DeliverOrderDO.class)
+                .select("u.nickname as deliverPersonName", "e.name as customerName")
+                .select("GROUP_CONCAT(distinct p.code) as saleOrderCode", "GROUP_CONCAT(distinct p.mould_name) as mouldName"
+                        , "GROUP_CONCAT(distinct p.contract_no) as contractNo", "GROUP_CONCAT(distinct p.property) as property")
+                .leftJoin("project_sale_order p on FIND_IN_SET(p.id, t.sale_order_ids)")
+                .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, DeliverOrderDO::getDeliverPerson)
+                .leftJoin(CustomerDO.class, "e", CustomerDO::getId, DeliverOrderDO::getCustomerId)
+                .groupBy(DeliverOrderDO::getId)
+                .orderByDesc(DeliverOrderDO::getId)
+                .disableSubLogicDel();
+        query.like(!StringUtils.isEmpty(reqVO.getCode()), DeliverOrderDO::getCode, reqVO.getCode())
+                .like(!StringUtils.isEmpty(reqVO.getSaleOrderCode()), ProjectOrderDO::getCode, reqVO.getSaleOrderCode())
+                .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName())
+                .like(!StringUtils.isEmpty(reqVO.getMouldName()), ProjectOrderDO::getMouldName, reqVO.getMouldName())
+                .between(reqVO.getDeliverDate() != null && reqVO.getDeliverDate().length == 2,
+                        DeliverOrderDO::getDeliverDate, ArrayUtils.get(reqVO.getDeliverDate(), 0), ArrayUtils.get(reqVO.getDeliverDate(), 1))
+                .eq(reqVO.getDeliverStatus() != null, DeliverOrderDO::getDeliverStatus, reqVO.getDeliverStatus());
+        return selectPage(reqVO, query);
+    }
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderSubMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderSubMapper.java
new file mode 100644
index 00000000..6b4e39b2
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderSubMapper.java
@@ -0,0 +1,28 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.deliverordersub;
+
+import java.util.*;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 发货订单子项 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface DeliverOrderSubMapper extends BaseMapperX<DeliverOrderSubDO> {
+
+    default List<DeliverOrderSubDO> selectListByDeliveryOrderId(Long deliveryOrderId) {
+        return selectList(DeliverOrderSubDO::getDeliveryOrderId, deliveryOrderId);
+    }
+
+    default int deleteByDeliveryOrderId(Long deliveryOrderId) {
+        return delete(DeliverOrderSubDO::getDeliveryOrderId, deliveryOrderId);
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java
new file mode 100644
index 00000000..7bb6476c
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java
@@ -0,0 +1,66 @@
+package com.chanko.yunxi.mes.module.heli.service.deliverorder;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+
+/**
+ * 发货订单 Service 接口
+ *
+ * @author 管理员
+ */
+public interface DeliverOrderService {
+
+    /**
+     * 创建发货订单
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createDeliverOrder(@Valid DeliverOrderSaveReqVO createReqVO);
+
+    /**
+     * 更新发货订单
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateDeliverOrder(@Valid DeliverOrderSaveReqVO updateReqVO);
+
+    /**
+     * 删除发货订单
+     *
+     * @param id 编号
+     */
+    void deleteDeliverOrder(Long id);
+
+    /**
+     * 获得发货订单
+     *
+     * @param id 编号
+     * @return 发货订单
+     */
+    DeliverOrderDO getDeliverOrder(Long id);
+
+    /**
+     * 获得发货订单分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 发货订单分页
+     */
+    PageResult<DeliverOrderDO> getDeliverOrderPage(DeliverOrderPageReqVO pageReqVO);
+
+    // ==================== 子表（发货订单子项） ====================
+
+    /**
+     * 获得发货订单子项列表
+     *
+     * @param deliveryOrderId 订单id
+     * @return 发货订单子项列表
+     */
+    List<DeliverOrderSubDO> getDeliverOrderSubListByDeliveryOrderId(Long deliveryOrderId);
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
new file mode 100644
index 00000000..b6ddbe77
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
@@ -0,0 +1,112 @@
+package com.chanko.yunxi.mes.module.heli.service.deliverorder;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper;
+import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverordersub.DeliverOrderSubMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 发货订单 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class DeliverOrderServiceImpl implements DeliverOrderService {
+
+    @Resource
+    private DeliverOrderMapper deliverOrderMapper;
+    @Resource
+    private DeliverOrderSubMapper deliverOrderSubMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createDeliverOrder(DeliverOrderSaveReqVO createReqVO) {
+        // 插入
+        DeliverOrderDO deliverOrder = BeanUtils.toBean(createReqVO, DeliverOrderDO.class);
+        deliverOrderMapper.insert(deliverOrder);
+
+        // 插入子表
+        createDeliverOrderSubList(deliverOrder.getId(), createReqVO.getDeliverOrderSubs());
+        // 返回
+        return deliverOrder.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateDeliverOrder(DeliverOrderSaveReqVO updateReqVO) {
+        // 校验存在
+        validateDeliverOrderExists(updateReqVO.getId());
+        // 更新
+        DeliverOrderDO updateObj = BeanUtils.toBean(updateReqVO, DeliverOrderDO.class);
+        deliverOrderMapper.updateById(updateObj);
+
+        // 更新子表
+        updateDeliverOrderSubList(updateReqVO.getId(), updateReqVO.getDeliverOrderSubs());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDeliverOrder(Long id) {
+        // 校验存在
+        validateDeliverOrderExists(id);
+        // 删除
+        deliverOrderMapper.deleteById(id);
+
+        // 删除子表
+        deleteDeliverOrderSubByDeliveryOrderId(id);
+    }
+
+    private void validateDeliverOrderExists(Long id) {
+        if (deliverOrderMapper.selectById(id) == null) {
+            throw exception(DELIVER_ORDER_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public DeliverOrderDO getDeliverOrder(Long id) {
+        return deliverOrderMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<DeliverOrderDO> getDeliverOrderPage(DeliverOrderPageReqVO pageReqVO) {
+        return deliverOrderMapper.selectPage(pageReqVO);
+    }
+
+    // ==================== 子表（发货订单子项） ====================
+
+    @Override
+    public List<DeliverOrderSubDO> getDeliverOrderSubListByDeliveryOrderId(Long deliveryOrderId) {
+        return deliverOrderSubMapper.selectListByDeliveryOrderId(deliveryOrderId);
+    }
+
+    private void createDeliverOrderSubList(Long deliveryOrderId, List<DeliverOrderSubDO> list) {
+        list.forEach(o -> o.setDeliveryOrderId(deliveryOrderId));
+        deliverOrderSubMapper.insertBatch(list);
+    }
+
+    private void updateDeliverOrderSubList(Long deliveryOrderId, List<DeliverOrderSubDO> list) {
+        deleteDeliverOrderSubByDeliveryOrderId(deliveryOrderId);
+		list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
+        createDeliverOrderSubList(deliveryOrderId, list);
+    }
+
+    private void deleteDeliverOrderSubByDeliveryOrderId(Long deliveryOrderId) {
+        deliverOrderSubMapper.deleteByDeliveryOrderId(deliveryOrderId);
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml
new file mode 100644
index 00000000..6d3c6b42
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml
@@ -0,0 +1,12 @@
+<?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.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/mes-server/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml b/mes-server/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml
new file mode 100644
index 00000000..6d3c6b42
--- /dev/null
+++ b/mes-server/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml
@@ -0,0 +1,12 @@
+<?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.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
new file mode 100644
index 00000000..aa567570
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface DeliverOrderVO {
+  id: number
+  code: string
+  saleOrderIds: string
+  customerId: number
+  deliverDate: Date
+  deliverStatus: number
+  deliverPerson: number
+  deliverPersonMobile: string
+  deliverMode: string
+  receivePersonMobile: string
+  transportDriverName: string
+  transportDriverMobile: string
+  transportBusNumber: string
+  transportWeight: string
+  transportSize: string
+  remark: string
+  status: number
+  receivePersonName: string
+  receiveAddress: string
+}
+
+// 查询发货订单分页
+export const getDeliverOrderPage = async (params) => {
+  return await request.get({ url: `/heli/deliver-order/page`, params })
+}
+
+// 查询发货订单详情
+export const getDeliverOrder = async (id: number) => {
+  return await request.get({ url: `/heli/deliver-order/get?id=` + id })
+}
+
+// 新增发货订单
+export const createDeliverOrder = async (data: DeliverOrderVO) => {
+  return await request.post({ url: `/heli/deliver-order/create`, data })
+}
+
+// 修改发货订单
+export const updateDeliverOrder = async (data: DeliverOrderVO) => {
+  return await request.put({ url: `/heli/deliver-order/update`, data })
+}
+
+// 删除发货订单
+export const deleteDeliverOrder = async (id: number) => {
+  return await request.delete({ url: `/heli/deliver-order/delete?id=` + id })
+}
+
+// 导出发货订单 Excel
+export const exportDeliverOrder = async (params) => {
+  return await request.download({ url: `/heli/deliver-order/export-excel`, params })
+}
+
+// ==================== 子表（发货订单子项） ====================
+
+// 获得发货订单子项列表
+export const getDeliverOrderSubListByDeliveryOrderId = async (deliveryOrderId) => {
+  return await request.get({ url: `/heli/deliver-order/deliver-order-sub/list-by-delivery-order-id?deliveryOrderId=` + deliveryOrderId })
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
index 9807eddb..2faae34b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
@@ -206,6 +206,7 @@ export enum DICT_TYPE {
   CRM_PRODUCT_STATUS = 'crm_product_status',
   CRM_PERMISSION_LEVEL = 'crm_permission_level', // CRM 数据权限的级别
 
+  // ========== HELI 模块 ==========
   HELI_COMMON_STATUS = 'heli_common_status',// 业务实体启用禁用状态
   HELI_CUSTOMER_LEVEL = 'heli_customer_level', //合立客户级别
   HELI_SYSTEM_COMMON_STATUS = 'heli_system_common_status', // 系统适配业务状态展示
@@ -233,4 +234,5 @@ export enum DICT_TYPE {
   HELI_PROJECT_ORDER_AUDIT_STATUS = 'heli_project_order_audit_status', // 项目单据审核页状态
   HELI_PROJECT_ORDER_APPROVE_STATUS = 'heli_project_order_approve_status', // 项目单据批准页状态
   HELI_PROJECT_ORDER_ALTER_STATUS = 'heli_project_order_alter_status', // 项目单据变更页状态
+  HELI_DELIVER_ORDER_STATUS = 'heli_deliver_order_status', // 发货单状态
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/DeliverOrderForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/DeliverOrderForm.vue
new file mode 100644
index 00000000..4131e688
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/DeliverOrderForm.vue
@@ -0,0 +1,227 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="编号，唯一" prop="code">
+        <el-input v-model="formData.code" placeholder="请输入编号，唯一" />
+      </el-form-item>
+      <el-form-item label="销售订单id列表 多个用英文逗号分割" prop="saleOrderIds">
+        <el-input v-model="formData.saleOrderIds" placeholder="请输入销售订单id列表 多个用英文逗号分割" />
+      </el-form-item>
+      <el-form-item label="客户id" prop="customerId">
+        <el-input v-model="formData.customerId" placeholder="请输入客户id" />
+      </el-form-item>
+      <el-form-item label="发货日期" prop="deliverDate">
+        <el-date-picker
+          v-model="formData.deliverDate"
+          type="date"
+          value-format="x"
+          placeholder="选择发货日期"
+        />
+      </el-form-item>
+      <el-form-item label="发货单状态 已保存/已发货" prop="deliverStatus">
+        <el-select v-model="formData.deliverStatus" placeholder="请选择发货单状态 已保存/已发货">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DELIVER_ORDER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发货人" prop="deliverPerson">
+        <el-input v-model="formData.deliverPerson" placeholder="请输入发货人" />
+      </el-form-item>
+      <el-form-item label="发货人电话" prop="deliverPersonMobile">
+        <el-input v-model="formData.deliverPersonMobile" placeholder="请输入发货人电话" />
+      </el-form-item>
+      <el-form-item label="发货方式" prop="deliverMode">
+        <el-select v-model="formData.deliverMode" placeholder="请选择发货方式">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="收货人电话" prop="receivePersonMobile">
+        <el-input v-model="formData.receivePersonMobile" placeholder="请输入收货人电话" />
+      </el-form-item>
+      <el-form-item label="司机姓名" prop="transportDriverName">
+        <el-input v-model="formData.transportDriverName" placeholder="请输入司机姓名" />
+      </el-form-item>
+      <el-form-item label="司机电话" prop="transportDriverMobile">
+        <el-input v-model="formData.transportDriverMobile" placeholder="请输入司机电话" />
+      </el-form-item>
+      <el-form-item label="车牌号" prop="transportBusNumber">
+        <el-input v-model="formData.transportBusNumber" placeholder="请输入车牌号" />
+      </el-form-item>
+      <el-form-item label="重量(T)" prop="transportWeight">
+        <el-input v-model="formData.transportWeight" placeholder="请输入重量(T)" />
+      </el-form-item>
+      <el-form-item label="位置(米)" prop="transportSize">
+        <el-input v-model="formData.transportSize" placeholder="请输入位置(米)" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="状态,1表示正常，2表示禁用" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="收货人姓名" prop="receivePersonName">
+        <el-input v-model="formData.receivePersonName" placeholder="请输入收货人姓名" />
+      </el-form-item>
+      <el-form-item label="收货详细地址" prop="receiveAddress">
+        <el-input v-model="formData.receiveAddress" placeholder="请输入收货详细地址" />
+      </el-form-item>
+    </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="发货订单子项" name="deliverOrderSub">
+        <DeliverOrderSubForm ref="deliverOrderSubFormRef" :delivery-order-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import {getStrDictOptions, DICT_TYPE, getIntDictOptions} from '@/utils/dict'
+import * as DeliverOrderApi from '@/api/heli/deliverorder'
+import DeliverOrderSubForm from './components/DeliverOrderSubForm.vue'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  code: undefined,
+  saleOrderIds: undefined,
+  customerId: undefined,
+  deliverDate: undefined,
+  deliverStatus: undefined,
+  deliverPerson: undefined,
+  deliverPersonMobile: undefined,
+  deliverMode: undefined,
+  receivePersonMobile: undefined,
+  transportDriverName: undefined,
+  transportDriverMobile: undefined,
+  transportBusNumber: undefined,
+  transportWeight: undefined,
+  transportSize: undefined,
+  remark: undefined,
+  status: undefined,
+  receivePersonName: undefined,
+  receiveAddress: undefined,
+})
+const formRules = reactive({
+  code: [{ required: true, message: '编号，唯一不能为空', trigger: 'blur' }],
+  saleOrderIds: [{ required: true, message: '销售订单id列表 多个用英文逗号分割不能为空', trigger: 'blur' }],
+  customerId: [{ required: true, message: '客户id不能为空', trigger: 'blur' }],
+  deliverDate: [{ required: true, message: '发货日期不能为空', trigger: 'blur' }],
+  deliverStatus: [{ required: true, message: '发货单状态 已保存/已发货不能为空', trigger: 'change' }],
+  deliverPerson: [{ required: true, message: '发货人不能为空', trigger: 'blur' }],
+  deliverPersonMobile: [{ required: true, message: '发货人电话不能为空', trigger: 'blur' }],
+  deliverMode: [{ required: true, message: '发货方式不能为空', trigger: 'change' }],
+  receivePersonMobile: [{ required: true, message: '收货人电话不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
+  receivePersonName: [{ required: true, message: '收货人姓名不能为空', trigger: 'blur' }],
+  receiveAddress: [{ required: true, message: '收货详细地址不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 子表的表单 */
+const subTabsName = ref('deliverOrderSub')
+const deliverOrderSubFormRef = ref()
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await DeliverOrderApi.getDeliverOrder(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 校验子表单
+  try {
+    await deliverOrderSubFormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = 'deliverOrderSub'
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as DeliverOrderApi.DeliverOrderVO
+    // 拼接子表的数据
+    data.deliverOrderSubs = deliverOrderSubFormRef.value.getData()
+    if (formType.value === 'create') {
+      await DeliverOrderApi.createDeliverOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DeliverOrderApi.updateDeliverOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    saleOrderIds: undefined,
+    customerId: undefined,
+    deliverDate: undefined,
+    deliverStatus: undefined,
+    deliverPerson: undefined,
+    deliverPersonMobile: undefined,
+    deliverMode: undefined,
+    receivePersonMobile: undefined,
+    transportDriverName: undefined,
+    transportDriverMobile: undefined,
+    transportBusNumber: undefined,
+    transportWeight: undefined,
+    transportSize: undefined,
+    remark: undefined,
+    status: undefined,
+    receivePersonName: undefined,
+    receiveAddress: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
new file mode 100644
index 00000000..e75587cb
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
@@ -0,0 +1,191 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+       <el-table-column label="业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.category`" :rules="formRules.category" class="mb-0px!">
+            <el-select v-model="row.category" placeholder="请选择业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_LIST_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="名称，唯一" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.name`" :rules="formRules.name" class="mb-0px!">
+            <el-input v-model="row.name" placeholder="请输入名称，唯一" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="图号" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.blueprintNo`" :rules="formRules.blueprintNo" class="mb-0px!">
+            <el-input v-model="row.blueprintNo" placeholder="请输入图号" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="数量" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.amount`" :rules="formRules.amount" class="mb-0px!">
+            <el-input v-model="row.amount" placeholder="请输入数量" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.unit`" :rules="formRules.unit" class="mb-0px!">
+            <el-select v-model="row.unit" placeholder="请选择单位">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="重量(T)" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.weight`" :rules="formRules.weight" class="mb-0px!">
+            <el-input v-model="row.weight" placeholder="请输入重量(T)" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="尺寸(米)" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.size`" :rules="formRules.size" class="mb-0px!">
+            <el-input v-model="row.size" placeholder="请输入尺寸(米)" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="子项类型" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.subType`" :rules="formRules.subType" class="mb-0px!">
+            <el-select v-model="row.subType" placeholder="请选择子项类型">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MATERIAL_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.remark`" :rules="formRules.remark" class="mb-0px!">
+            <el-input v-model="row.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态,1表示正常，2表示禁用" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.status`" :rules="formRules.status" class="mb-0px!">
+            <el-radio-group v-model="row.status">
+                <el-radio label="1">请选择字典生成</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加发货订单子项</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as DeliverOrderApi from '@/api/heli/deliverorder'
+
+const props = defineProps<{
+  deliveryOrderId: undefined // 订单id（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+  deliveryOrderId: [{ required: true, message: '订单id不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST不能为空', trigger: 'change' }],
+  name: [{ required: true, message: '名称，唯一不能为空', trigger: 'blur' }],
+  amount: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+  unit: [{ required: true, message: '单位不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.deliveryOrderId,
+  async (val) => {
+    // 1. 重置表单
+    formData.value = []
+    // 2. val 非空，则加载数据
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+      formData.value = await DeliverOrderApi.getDeliverOrderSubListByDeliveryOrderId(val)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    deliveryOrderId: undefined,
+    category: undefined,
+    name: undefined,
+    blueprintNo: undefined,
+    amount: undefined,
+    unit: undefined,
+    weight: undefined,
+    size: undefined,
+    subType: undefined,
+    remark: undefined,
+    status: undefined,
+  }
+  row.deliveryOrderId = props.deliveryOrderId
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+  return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
new file mode 100644
index 00000000..67629b68
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
@@ -0,0 +1,265 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="发货单号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入发货单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="项目编号" prop="saleOrderCode">
+        <el-input
+          v-model="queryParams.saleOrderCode"
+          placeholder="请输入项目编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="模具名称" prop="mouldName">
+        <el-input
+          v-model="queryParams.mouldName"
+          placeholder="请输入模具名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="发货日期" prop="deliverDate">
+        <el-date-picker
+          v-model="queryParams.deliverDate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="发货单状态" prop="deliverStatus">
+        <el-select
+          v-model="queryParams.deliverStatus"
+          placeholder="请选择发货单状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DELIVER_ORDER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['heli:deliver-order:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+<!--        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['heli:deliver-order:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>-->
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column fixed label="序号" type="index" width="100" />
+      <el-table-column fixed label="发货单号" align="center" prop="code" width="180" />
+      <el-table-column fixed label="项目编号" align="center" prop="saleOrderCode" width="180" />
+      <el-table-column
+        fixed
+        label="发货日期"
+        align="center"
+        prop="deliverDate"
+        :formatter="dateFormatter"
+        width="180"
+      />
+      <el-table-column label="客户名称" align="center" prop="customerName" width="180" />
+      <el-table-column label="合同号" align="center" prop="contractNo" width="180" />
+      <el-table-column label="模具名称" align="center" prop="mouldName" width="120" />
+      <el-table-column label="性质" align="center" prop="property" width="100" />
+      <el-table-column label="发货人姓名" align="center" prop="deliverPersonName" width="120" />
+      <el-table-column label="发货人电话" align="center" prop="deliverPersonMobile" width="120" />
+      <el-table-column label="收货人姓名" align="center" prop="receivePersonName" width="120" />
+      <el-table-column label="收货人电话" align="center" prop="receivePersonMobile" width="120" />
+      <el-table-column label="收货详细地址" align="center" prop="receiveAddress" width="180" />
+      <el-table-column label="司机姓名" align="center" prop="transportDriverName" width="120" />
+      <el-table-column label="司机电话" align="center" prop="transportDriverMobile" width="120" />
+      <el-table-column label="发货备注" align="center" prop="remark" width="180" />
+      <el-table-column fixed="right" label="发货单状态" align="center" prop="deliverStatus" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_DELIVER_ORDER_STATUS" :value="scope.row.deliverStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" align="center" width="160">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:deliver-order:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['heli:deliver-order:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <DeliverOrderForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import {getStrDictOptions, DICT_TYPE, getIntDictOptions} from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as DeliverOrderApi from '@/api/heli/deliverorder'
+import DeliverOrderForm from './DeliverOrderForm.vue'
+
+defineOptions({ name: 'DeliverOrder' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  saleOrderCode: undefined,
+  customerName: undefined,
+  deliverDate: [],
+  deliverStatus: undefined,
+  deliverPerson: undefined,
+  deliverPersonMobile: undefined,
+  deliverMode: undefined,
+  receivePersonMobile: undefined,
+  transportDriverName: undefined,
+  transportDriverMobile: undefined,
+  transportBusNumber: undefined,
+  transportWeight: undefined,
+  transportSize: undefined,
+  remark: undefined,
+  status: undefined,
+  createTime: [],
+  receivePersonName: undefined,
+  receiveAddress: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DeliverOrderApi.getDeliverOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DeliverOrderApi.deleteDeliverOrder(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DeliverOrderApi.exportDeliverOrder(queryParams)
+    download.excel(data, '发货订单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/sql/v1.2.0/1.structure.sql b/sql/v1.2.0/1.structure.sql
index b6f8e542..4c9332b8 100644
--- a/sql/v1.2.0/1.structure.sql
+++ b/sql/v1.2.0/1.structure.sql
@@ -17,12 +17,13 @@ CREATE TABLE `project_deliver_order` (
                                          `sale_order_ids` varchar(255) not null comment '销售订单id列表 多个用英文逗号分割',
                                          `customer_id` BIGINT(20) not null comment '客户id',
                                          `deliver_date` DATETIME not null comment '发货日期',
-                                         `deliver_status` char(1) not null COMMENT '发货单状态 已保存/已发货',
+                                         `deliver_status` int(11) not null COMMENT '发货单状态 已保存/已发货',
                                          `deliver_person` BIGINT(20) not null comment '发货人',
                                          `deliver_person_mobile` varchar(32) not null comment '发货人电话',
                                          `deliver_mode` char(1) not null comment '发货方式',
-                                         `receive_person_name` BIGINT(20) not null comment '收货人姓名',
+                                         `receive_person_name` varchar(16) not null comment '收货人姓名',
                                          `receive_person_mobile` varchar(32) not null comment '收货人电话',
+                                         `receive_address` varchar(255) not null comment '收货详细地址',
                                          `transport_driver_name` varchar(16) comment '司机姓名',
                                          `transport_driver_mobile` varchar(32) comment '司机电话',
                                          `transport_bus_number` varchar(32) comment '车牌号',

From 159def12f65449580e0a7544742f4a156e674b7d Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sat, 27 Jan 2024 21:34:45 +0800
Subject: [PATCH 24/64] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

物料出入库日志
---
 .../controller/admin/pn/PnController.java     | 197 +++++++-------
 .../controller/admin/rg/RgController.java     | 198 +++++++-------
 .../admin/storage/StorageController.java      |  25 ++
 .../storagelog/StorageLogController.java      | 191 +++++++-------
 .../storagelog/vo/StorageLogPageReqVO.java    |  42 +--
 .../admin/storagelog/vo/StorageLogRespVO.java |  35 +++
 .../admin/warehouse/WarehouseController.java  |   8 +
 .../storagelogAll/StorageLogAllDO.java        |  66 +++++
 .../module/heli/dal/mysql/pn/PnMapper.java    |   8 +
 .../module/heli/dal/mysql/rg/RgMapper.java    |   9 +
 .../mysql/storagelog/StorageLogAllMapper.java |  42 +++
 .../mysql/storagelog/StorageLogMapper.java    |  50 ++--
 .../mysql/storagemat/StorageMatMapper.java    |  13 +
 .../dal/mysql/warehouse/WarehouseMapper.java  |   9 +
 .../mes/module/heli/service/pn/PnService.java | 113 ++++----
 .../module/heli/service/pn/PnServiceImpl.java | 153 +++++------
 .../mes/module/heli/service/rg/RgService.java | 112 ++++----
 .../module/heli/service/rg/RgServiceImpl.java | 153 +++++------
 .../service/storagelog/StorageLogService.java | 114 ++++----
 .../storagelog/StorageLogServiceImpl.java     | 160 +++++------
 .../service/storagemat/StorageMatService.java |   4 +-
 .../storagemat/StorageMatServiceImpl.java     |   9 +-
 .../service/warehouse/WarehouseService.java   |   2 +
 .../warehouse/WarehouseServiceImpl.java       |   4 +
 .../mapper/storagelog/StorageLogAllMapper.xml |  58 ++++
 .../mapper/storagelog/StorageLogMapper.xml    |   4 +-
 .../src/api/heli/pn/index.ts                  |  87 +++---
 .../src/api/heli/rg/index.ts                  |  85 +++---
 .../src/api/heli/warehouse/index.ts           |   4 +
 mes-ui/mes-ui-admin-vue3/src/utils/dict.ts    |   1 +
 .../src/views/heli/storagelog/index.vue       | 249 ++++++------------
 31 files changed, 1228 insertions(+), 977 deletions(-)
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogAll/StorageLogAllDO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogAllMapper.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogAllMapper.xml

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pn/PnController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pn/PnController.java
index 1992bad7..8efc8f2f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pn/PnController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pn/PnController.java
@@ -1,95 +1,102 @@
-package com.chanko.yunxi.mes.module.heli.controller.admin.pn;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
-
-import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
-
-import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
-import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.chanko.yunxi.mes.module.heli.controller.admin.pn.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
-import com.chanko.yunxi.mes.module.heli.service.pn.PnService;
-
-@Tag(name = "管理后台 - 库位")
-@RestController
-@RequestMapping("/heli/pn")
-@Validated
-public class PnController {
-
-    @Resource
-    private PnService pnService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建库位")
-    @PreAuthorize("@ss.hasPermission('heli:pn:create')")
-    public CommonResult<Long> createPn(@Valid @RequestBody PnSaveReqVO createReqVO) {
-        return success(pnService.createPn(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新库位")
-    @PreAuthorize("@ss.hasPermission('heli:pn:update')")
-    public CommonResult<Boolean> updatePn(@Valid @RequestBody PnSaveReqVO updateReqVO) {
-        pnService.updatePn(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除库位")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('heli:pn:delete')")
-    public CommonResult<Boolean> deletePn(@RequestParam("id") Long id) {
-        pnService.deletePn(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得库位")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('heli:pn:query')")
-    public CommonResult<PnRespVO> getPn(@RequestParam("id") Long id) {
-        PnDO pn = pnService.getPn(id);
-        return success(BeanUtils.toBean(pn, PnRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得库位分页")
-    @PreAuthorize("@ss.hasPermission('heli:pn:query')")
-    public CommonResult<PageResult<PnRespVO>> getPnPage(@Valid PnPageReqVO pageReqVO) {
-        PageResult<PnDO> pageResult = pnService.getPnPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PnRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出库位 Excel")
-    @PreAuthorize("@ss.hasPermission('heli:pn:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPnExcel(@Valid PnPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PnDO> list = pnService.getPnPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "库位.xls", "数据", PnRespVO.class,
-                        BeanUtils.toBean(list, PnRespVO.class));
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.controller.admin.pn;
+
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.pn.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
+import com.chanko.yunxi.mes.module.heli.service.pn.PnService;
+
+@Tag(name = "管理后台 - 库位")
+@RestController
+@RequestMapping("/heli/pn")
+@Validated
+public class PnController {
+
+    @Resource
+    private PnService pnService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建库位")
+    @PreAuthorize("@ss.hasPermission('heli:pn:create')")
+    public CommonResult<Long> createPn(@Valid @RequestBody PnSaveReqVO createReqVO) {
+        return success(pnService.createPn(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新库位")
+    @PreAuthorize("@ss.hasPermission('heli:pn:update')")
+    public CommonResult<Boolean> updatePn(@Valid @RequestBody PnSaveReqVO updateReqVO) {
+        pnService.updatePn(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除库位")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:pn:delete')")
+    public CommonResult<Boolean> deletePn(@RequestParam("id") Long id) {
+        pnService.deletePn(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得库位")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:pn:query')")
+    public CommonResult<PnRespVO> getPn(@RequestParam("id") Long id) {
+        PnDO pn = pnService.getPn(id);
+        return success(BeanUtils.toBean(pn, PnRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得库位分页")
+    @PreAuthorize("@ss.hasPermission('heli:pn:query')")
+    public CommonResult<PageResult<PnRespVO>> getPnPage(@Valid PnPageReqVO pageReqVO) {
+        PageResult<PnDO> pageResult = pnService.getPnPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PnRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出库位 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:pn:export')")
+    @OperateLog(type = EXPORT)
+    public void exportPnExcel(@Valid PnPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<PnDO> list = pnService.getPnPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "库位.xls", "数据", PnRespVO.class,
+                        BeanUtils.toBean(list, PnRespVO.class));
+    }
+    @GetMapping({"/all-simples"})
+    @Operation(summary = "TODO:获取仓库精简信息列表", description = "只包含被开启的仓库，主要用于前端的下拉选项")
+    public CommonResult<List<Map<String, Object>> > getSimpleList() {
+        List<Map<String, Object>>  list = pnService.getSimpleList();
+        // 拼接数据
+        return success(list);
+    }
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/rg/RgController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/rg/RgController.java
index 7d3a93ff..1f5aaf2f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/rg/RgController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/rg/RgController.java
@@ -1,95 +1,103 @@
-package com.chanko.yunxi.mes.module.heli.controller.admin.rg;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
-
-import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
-
-import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
-import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.chanko.yunxi.mes.module.heli.controller.admin.rg.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
-import com.chanko.yunxi.mes.module.heli.service.rg.RgService;
-
-@Tag(name = "管理后台 - 库区")
-@RestController
-@RequestMapping("/heli/rg")
-@Validated
-public class RgController {
-
-    @Resource
-    private RgService rgService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建库区")
-    @PreAuthorize("@ss.hasPermission('heli:rg:create')")
-    public CommonResult<Long> createRg(@Valid @RequestBody RgSaveReqVO createReqVO) {
-        return success(rgService.createRg(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新库区")
-    @PreAuthorize("@ss.hasPermission('heli:rg:update')")
-    public CommonResult<Boolean> updateRg(@Valid @RequestBody RgSaveReqVO updateReqVO) {
-        rgService.updateRg(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除库区")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('heli:rg:delete')")
-    public CommonResult<Boolean> deleteRg(@RequestParam("id") Long id) {
-        rgService.deleteRg(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得库区")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('heli:rg:query')")
-    public CommonResult<RgRespVO> getRg(@RequestParam("id") Long id) {
-        RgDO rg = rgService.getRg(id);
-        return success(BeanUtils.toBean(rg, RgRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得库区分页")
-    @PreAuthorize("@ss.hasPermission('heli:rg:query')")
-    public CommonResult<PageResult<RgRespVO>> getRgPage(@Valid RgPageReqVO pageReqVO) {
-        PageResult<RgDO> pageResult = rgService.getRgPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, RgRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出库区 Excel")
-    @PreAuthorize("@ss.hasPermission('heli:rg:export')")
-    @OperateLog(type = EXPORT)
-    public void exportRgExcel(@Valid RgPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<RgDO> list = rgService.getRgPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "库区.xls", "数据", RgRespVO.class,
-                        BeanUtils.toBean(list, RgRespVO.class));
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.controller.admin.rg;
+
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.rg.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+import com.chanko.yunxi.mes.module.heli.service.rg.RgService;
+
+@Tag(name = "管理后台 - 库区")
+@RestController
+@RequestMapping("/heli/rg")
+@Validated
+public class RgController {
+
+    @Resource
+    private RgService rgService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建库区")
+    @PreAuthorize("@ss.hasPermission('heli:rg:create')")
+    public CommonResult<Long> createRg(@Valid @RequestBody RgSaveReqVO createReqVO) {
+        return success(rgService.createRg(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新库区")
+    @PreAuthorize("@ss.hasPermission('heli:rg:update')")
+    public CommonResult<Boolean> updateRg(@Valid @RequestBody RgSaveReqVO updateReqVO) {
+        rgService.updateRg(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除库区")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:rg:delete')")
+    public CommonResult<Boolean> deleteRg(@RequestParam("id") Long id) {
+        rgService.deleteRg(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得库区")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:rg:query')")
+    public CommonResult<RgRespVO> getRg(@RequestParam("id") Long id) {
+        RgDO rg = rgService.getRg(id);
+        return success(BeanUtils.toBean(rg, RgRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得库区分页")
+    @PreAuthorize("@ss.hasPermission('heli:rg:query')")
+    public CommonResult<PageResult<RgRespVO>> getRgPage(@Valid RgPageReqVO pageReqVO) {
+        PageResult<RgDO> pageResult = rgService.getRgPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, RgRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出库区 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:rg:export')")
+    @OperateLog(type = EXPORT)
+    public void exportRgExcel(@Valid RgPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<RgDO> list = rgService.getRgPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "库区.xls", "数据", RgRespVO.class,
+                        BeanUtils.toBean(list, RgRespVO.class));
+    }
+
+    @GetMapping({"/all-simples"})
+    @Operation(summary = "TODO:获取仓库精简信息列表", description = "只包含被开启的仓库，主要用于前端的下拉选项")
+    public CommonResult<List<Map<String, Object>> > getSimpleList() {
+        List<Map<String, Object>>  list = rgService.getSimpleList();
+        // 拼接数据
+        return success(list);
+    }
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
index 1eeed880..db67486a 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
@@ -1,5 +1,9 @@
 package com.chanko.yunxi.mes.module.heli.controller.admin.storage;
 
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
+import com.chanko.yunxi.mes.module.heli.service.storagelog.StorageLogService;
+import com.chanko.yunxi.mes.module.heli.service.storagemat.StorageMatService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +43,12 @@ public class StorageController {
     @Resource
     private StorageService storageService;
 
+    @Resource
+    private StorageMatService storageMatService;
+
+    @Resource
+    private StorageLogService storageLogService;
+
     @PostMapping("/create")
     @Operation(summary = "创建入/出库")
     @PreAuthorize("@ss.hasPermission('heli:storage:create')")
@@ -57,9 +67,12 @@ public class StorageController {
     @Operation(summary = "更新入/出库")
     @PreAuthorize("@ss.hasPermission('heli:storage:update')")
     public CommonResult<Boolean> updateStorageStatus(@Valid @RequestBody StorageSaveReqVO updateReqVO) {
+
+        // 获取最新的出入库信息
         StorageDO targetDo = storageService.getStorage(updateReqVO.getId());
         targetDo.setStatus(updateReqVO.getStatus());
 
+        // 提交或者作废时记录相关操作人
         LocalDateTime currTime = LocalDateTime.now();
         if(updateReqVO.getStatus().equals(2) && updateReqVO.getStockType().equals(1)){
             targetDo.setKeeper(updateReqVO.getKeeper());
@@ -74,6 +87,18 @@ public class StorageController {
         updateReqVO = BeanUtils.toBean(targetDo, StorageSaveReqVO.class);
 
         storageService.updateStorage(updateReqVO);
+
+        // 获取当前库存下所有物料信息
+        List<StorageMatDO> matList = storageMatService.getStorageMatListByStockId(targetDo.getId());
+        // 将物料信息转化日志信息
+        List<StorageLogDO> logList = BeanUtils.toBean(matList,StorageLogDO.class);
+        // 同步库存单状态到日志，便于以后统计
+        for (StorageLogDO log : logList){
+            log.setStatus(targetDo.getStatus());
+        }
+        // 批量保存当前库存物料日志信息
+        storageLogService.createStorageLogBatch(logList);
+
         return success(true);
     }
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java
index 8d1b3883..9ca23bce 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java
@@ -1,95 +1,96 @@
-package com.chanko.yunxi.mes.module.heli.controller.admin.storagelog;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
-
-import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
-
-import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
-import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
-import com.chanko.yunxi.mes.module.heli.service.storagelog.StorageLogService;
-
-@Tag(name = "管理后台 - 入/出库日志")
-@RestController
-@RequestMapping("/heli/storage-log")
-@Validated
-public class StorageLogController {
-
-    @Resource
-    private StorageLogService storageLogService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建入/出库日志")
-    @PreAuthorize("@ss.hasPermission('heli:storage-log:create')")
-    public CommonResult<Long> createStorageLog(@Valid @RequestBody StorageLogSaveReqVO createReqVO) {
-        return success(storageLogService.createStorageLog(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新入/出库日志")
-    @PreAuthorize("@ss.hasPermission('heli:storage-log:update')")
-    public CommonResult<Boolean> updateStorageLog(@Valid @RequestBody StorageLogSaveReqVO updateReqVO) {
-        storageLogService.updateStorageLog(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除入/出库日志")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('heli:storage-log:delete')")
-    public CommonResult<Boolean> deleteStorageLog(@RequestParam("id") Long id) {
-        storageLogService.deleteStorageLog(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得入/出库日志")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('heli:storage-log:query')")
-    public CommonResult<StorageLogRespVO> getStorageLog(@RequestParam("id") Long id) {
-        StorageLogDO storageLog = storageLogService.getStorageLog(id);
-        return success(BeanUtils.toBean(storageLog, StorageLogRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得入/出库日志分页")
-    @PreAuthorize("@ss.hasPermission('heli:storage-log:query')")
-    public CommonResult<PageResult<StorageLogRespVO>> getStorageLogPage(@Valid StorageLogPageReqVO pageReqVO) {
-        PageResult<StorageLogDO> pageResult = storageLogService.getStorageLogPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, StorageLogRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出入/出库日志 Excel")
-    @PreAuthorize("@ss.hasPermission('heli:storage-log:export')")
-    @OperateLog(type = EXPORT)
-    public void exportStorageLogExcel(@Valid StorageLogPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<StorageLogDO> list = storageLogService.getStorageLogPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "入/出库日志.xls", "数据", StorageLogRespVO.class,
-                        BeanUtils.toBean(list, StorageLogRespVO.class));
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagelog;
+
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
+import com.chanko.yunxi.mes.module.heli.service.storagelog.StorageLogService;
+
+@Tag(name = "管理后台 - 入/出库日志")
+@RestController
+@RequestMapping("/heli/storage-log")
+@Validated
+public class StorageLogController {
+
+    @Resource
+    private StorageLogService storageLogService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建入/出库日志")
+    @PreAuthorize("@ss.hasPermission('heli:storage-log:create')")
+    public CommonResult<Long> createStorageLog(@Valid @RequestBody StorageLogSaveReqVO createReqVO) {
+        return success(storageLogService.createStorageLog(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新入/出库日志")
+    @PreAuthorize("@ss.hasPermission('heli:storage-log:update')")
+    public CommonResult<Boolean> updateStorageLog(@Valid @RequestBody StorageLogSaveReqVO updateReqVO) {
+        storageLogService.updateStorageLog(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除入/出库日志")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:storage-log:delete')")
+    public CommonResult<Boolean> deleteStorageLog(@RequestParam("id") Long id) {
+        storageLogService.deleteStorageLog(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得入/出库日志")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:storage-log:query')")
+    public CommonResult<StorageLogRespVO> getStorageLog(@RequestParam("id") Long id) {
+        StorageLogDO storageLog = storageLogService.getStorageLog(id);
+        return success(BeanUtils.toBean(storageLog, StorageLogRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得入/出库日志分页")
+    @PreAuthorize("@ss.hasPermission('heli:storage-log:query')")
+    public CommonResult<PageResult<StorageLogAllDO>> getStorageLogPage(@Valid StorageLogPageReqVO pageReqVO) {
+        PageResult<StorageLogAllDO> pageResult = storageLogService.getStorageLogPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出入/出库日志 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:storage-log:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStorageLogExcel(@Valid StorageLogPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<StorageLogAllDO> list = storageLogService.getStorageLogPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "入/出库日志.xls", "数据", StorageLogRespVO.class,
+                        BeanUtils.toBean(list, StorageLogRespVO.class));
+    }
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogPageReqVO.java
index da341cc6..e046a78f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogPageReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogPageReqVO.java
@@ -16,45 +16,27 @@ import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_Y
 @ToString(callSuper = true)
 public class StorageLogPageReqVO extends PageParam {
 
-    @Schema(description = "入/出库Id", example = "3528")
-    private Long stockId;
+    @Schema(description = "物料编码")
+    private String matCode;
 
-    @Schema(description = "物料 Id,对应 base_material表中的 Id 列", example = "21832")
-    private Long matId;
+    @Schema(description = "物料名称")
+    private String matName;
 
-    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", example = "3")
-    private Long whId;
-
-    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", example = "15108")
-    private Long rgId;
-
-    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", example = "3954")
-    private Long pnId;
-
-    @Schema(description = "库存良品数量")
-    private BigDecimal storageOkQty;
+    @Schema(description = "物料类型")
+    private String matType;
 
     @Schema(description = "批次号")
     private String lotNo;
 
-    @Schema(description = "状态")
-    private String status;
-
-    @Schema(description = "备注", example = "你说的对")
-    private String description;
+    @Schema(description = "业务单据编号")
+    private String stockNo;
 
-    @Schema(description = "记录的创建人,对应员工表中的 Id")
-    private String creator;
+    @Schema(description = "上游单据编号")
+    private String headerNo;
 
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    @Schema(description = "出入库类型")
+    private Integer stockType;
 
-    @Schema(description = "记录的修改人,对应员工表中的 Id")
-    private String updater;
 
-    @Schema(description = "更新时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] updateTime;
 
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogRespVO.java
index 3c6a2d4a..a953e650 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogRespVO.java
@@ -54,4 +54,39 @@ public class StorageLogRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "业务编号")
+    @ExcelProperty("业务编号")
+    private String stockNo;
+
+    @Schema(description = "业务类型")
+    @ExcelProperty("业务类型")
+    private Integer stockType;
+
+    @Schema(description = "上游业务编号")
+    @ExcelProperty("上游业务编号")
+    private String headerNo;
+
+    @Schema(description = "物料名称")
+    @ExcelProperty("物料名称")
+    private String matName;
+
+    @Schema(description = "物料编码")
+    @ExcelProperty("物料编码")
+    private String matCode;
+
+    @Schema(description = "物料类型")
+    @ExcelProperty("物料类型")
+    private String matType;
+
+    @Schema(description = "仓库名称")
+    @ExcelProperty("物料类型")
+    private String whName;
+
+    @Schema(description = "库区名称")
+    @ExcelProperty("物料类型")
+    private String rgName;
+
+    @Schema(description = "库位名称")
+    @ExcelProperty("物料类型")
+    private String pnName;
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/WarehouseController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/WarehouseController.java
index f520c3ad..8a3f59bf 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/WarehouseController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/WarehouseController.java
@@ -106,4 +106,12 @@ public class WarehouseController {
         // 拼接数据
         return success(BeanUtils.toBean(list, WarehouseDO.class));
     }
+
+    @GetMapping({"/all-simples"})
+    @Operation(summary = "TODO:获取仓库精简信息列表", description = "只包含被开启的仓库，主要用于前端的下拉选项")
+    public CommonResult<List<Map<String, Object>> > getSimpleList() {
+        List<Map<String, Object>>  list = warehouseService.getSimpleList();
+        // 拼接数据
+        return success(list);
+    }
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogAll/StorageLogAllDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogAll/StorageLogAllDO.java
new file mode 100644
index 00000000..d04d8dfa
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogAll/StorageLogAllDO.java
@@ -0,0 +1,66 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * 入/出库日志 DO
+ *
+ * @author 管理员
+ */
+@TableName("v_storage_material_log")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StorageLogAllDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 库存良品数量
+     */
+    private BigDecimal storageOkQty;
+    /**
+     * 批次号
+     */
+    private String lotNo;
+
+    private String stockNo;
+
+    private Integer stockType;
+
+    private String stockTypeName;
+
+    private String headerNo;
+
+    private String matName;
+
+    private String matCode;
+
+    private String matType;
+
+    private String whName;
+
+    private String rgName;
+
+    private String pnName;
+
+    private String shortName;
+
+    private String matSpec;
+    private String matBrand;
+    private String matUnit;
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pn/PnMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pn/PnMapper.java
index 569e9830..d1c931d3 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pn/PnMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pn/PnMapper.java
@@ -2,10 +2,14 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.pn;
 
 import java.util.*;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.QueryWrapperX;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.pn.vo.*;
 
@@ -31,5 +35,9 @@ public interface PnMapper extends BaseMapperX<PnDO> {
                 .eqIfPresent(PnDO::getWhId, reqVO.getWhId())
                 .orderByDesc(PnDO::getId));
     }
+    default List<Map<String, Object>> selectSimpleList() {
 
+        return selectMaps(new QueryWrapper<PnDO>().select("id", "pn_name").lambda());
+
+    }
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/rg/RgMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/rg/RgMapper.java
index e466a96d..de43c580 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/rg/RgMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/rg/RgMapper.java
@@ -2,10 +2,13 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.rg;
 
 import java.util.*;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.QueryWrapperX;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.rg.vo.*;
 
@@ -30,4 +33,10 @@ public interface RgMapper extends BaseMapperX<RgDO> {
                 .orderByDesc(RgDO::getId));
     }
 
+    default List<Map<String, Object>> selectSimpleList() {
+
+        return selectMaps(new QueryWrapper<RgDO>().select("id", "rg_name").lambda());
+
+    }
+
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogAllMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogAllMapper.java
new file mode 100644
index 00000000..1fcd61a0
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogAllMapper.java
@@ -0,0 +1,42 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog;
+
+import com.alibaba.druid.util.StringUtils;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageLogPageReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 入/出库日志 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface StorageLogAllMapper extends BaseMapperX<StorageLogAllDO> {
+
+    default PageResult<StorageLogAllDO> selectPage(StorageLogPageReqVO reqVO) {
+        MPJLambdaWrapper<StorageLogAllDO> query = new MPJLambdaWrapper<>();
+
+        query.selectAll(StorageLogAllDO.class)
+                .orderByDesc(StorageLogAllDO::getId);
+
+        query.like(!StringUtils.isEmpty(reqVO.getMatType()),StorageLogAllDO::getMatType, reqVO.getMatType())
+                .eq(reqVO.getStockType()!= null,StorageLogAllDO::getStockType, reqVO.getStockType())
+                .like(!StringUtils.isEmpty(reqVO.getMatName()), StorageLogAllDO::getMatName, reqVO.getMatName())
+                .like(!StringUtils.isEmpty(reqVO.getMatCode()), StorageLogAllDO::getMatCode, reqVO.getMatCode())
+                .like(!StringUtils.isEmpty(reqVO.getStockNo()), StorageLogAllDO::getStockNo, reqVO.getStockNo())
+                .like(!StringUtils.isEmpty(reqVO.getHeaderNo()), StorageLogAllDO::getHeaderNo, reqVO.getHeaderNo())
+                .like(!StringUtils.isEmpty(reqVO.getLotNo()),StorageLogAllDO::getLotNo, reqVO.getLotNo());
+
+        return selectPage(reqVO,query);
+    }
+    PageResult<StorageLogAllDO> selectAllPage(StorageLogPageReqVO reqVO);
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java
index 22ccdcc5..ffef076e 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java
@@ -3,11 +3,18 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog;
 import java.util.*;
 
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
+import org.springframework.util.StringUtils;
 
 /**
  * 入/出库日志 Mapper
@@ -17,21 +24,28 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.*;
 @Mapper
 public interface StorageLogMapper extends BaseMapperX<StorageLogDO> {
 
-    default PageResult<StorageLogDO> selectPage(StorageLogPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<StorageLogDO>()
-                .eqIfPresent(StorageLogDO::getStockId, reqVO.getStockId())
-                .eqIfPresent(StorageLogDO::getMatId, reqVO.getMatId())
-                .eqIfPresent(StorageLogDO::getWhId, reqVO.getWhId())
-                .eqIfPresent(StorageLogDO::getRgId, reqVO.getRgId())
-                .eqIfPresent(StorageLogDO::getPnId, reqVO.getPnId())
-                .eqIfPresent(StorageLogDO::getStorageOkQty, reqVO.getStorageOkQty())
-                .eqIfPresent(StorageLogDO::getLotNo, reqVO.getLotNo())
-                .eqIfPresent(StorageLogDO::getDescription, reqVO.getDescription())
-                .eqIfPresent(StorageLogDO::getCreator, reqVO.getCreator())
-                .betweenIfPresent(StorageLogDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(StorageLogDO::getUpdater, reqVO.getUpdater())
-                .betweenIfPresent(StorageLogDO::getUpdateTime, reqVO.getUpdateTime())
-                .orderByDesc(StorageLogDO::getId));
-    }
-
+//    default PageResult<StorageLogDO> selectPage(StorageLogPageReqVO reqVO) {
+//        MPJLambdaWrapper<StorageLogDO> query = new MPJLambdaWrapper<>();
+//
+//        query.selectAll(StorageLogDO.class)
+//                .select("st.stock_no as stockNo", "st.stock_type as stockType","st.header_no as headerNo", "mat.name as matName","mat.code as matCode","mat.material_type as matType","wh.wh_name as whName","rg.rg_name as rgName","pn.pn_name as pnName")
+//                .leftJoin(StorageDO.class, "st", StorageDO::getId, StorageLogDO::getStockId)
+//                .leftJoin(MaterialDO.class,"mat", MaterialDO::getId,StorageLogDO::getMatId)
+//                .leftJoin(WarehouseDO.class,"wh", WarehouseDO::getId,StorageLogDO::getWhId)
+//                .leftJoin(RgDO.class,"rg", RgDO::getId,StorageLogDO::getRgId)
+//                .leftJoin(PnDO.class,"pn", PnDO::getId,StorageLogDO::getPnId)
+//                .disableSubLogicDel()
+//                .orderByDesc(StorageLogDO::getId);
+//
+//        query.eq(reqVO.getMatType() != null,"mat.material_type", reqVO.getMatType())
+//                .eq(reqVO.getStockType() != null,"st.stock_type", reqVO.getStockType())
+//                .like(!StringUtils.isEmpty(reqVO.getMatName()), "mat.name", reqVO.getMatName())
+//                .like(!StringUtils.isEmpty(reqVO.getMatCode()), "mat.code", reqVO.getMatCode())
+//                .like(!StringUtils.isEmpty(reqVO.getStockNo()), "st.stock_no", reqVO.getStockNo())
+//                .like(!StringUtils.isEmpty(reqVO.getHeaderNo()), "st.header_no", reqVO.getHeaderNo())
+//                .like(!StringUtils.isEmpty(reqVO.getLotNo()),StorageLogDO::getLotNo, reqVO.getLotNo());
+//
+//        return selectPage(reqVO);
+//    }
+    //PageResult<StorageLogAllDO> selectAllPage(StorageLogPageReqVO reqVO);
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagemat/StorageMatMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagemat/StorageMatMapper.java
index 22be3ced..ce146ab1 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagemat/StorageMatMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagemat/StorageMatMapper.java
@@ -2,10 +2,15 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.storagemat;
 
 import java.util.*;
 
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo.*;
 
@@ -33,5 +38,13 @@ public interface StorageMatMapper extends BaseMapperX<StorageMatDO> {
                 .betweenIfPresent(StorageMatDO::getUpdateTime, reqVO.getUpdateTime())
                 .orderByDesc(StorageMatDO::getId));
     }
+
+    default List<StorageMatDO> selectMatByStorckID(Long stockId) {
+
+        MPJLambdaWrapper<StorageMatDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(StorageMatDO.class)
+                .eq(StorageMatDO::getStockId, stockId);
+        return selectList(query);
+    }
     List<StorageMatValidRespVO> selectStorageMatValid();
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/warehouse/WarehouseMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/warehouse/WarehouseMapper.java
index 64148440..8cf5f934 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/warehouse/WarehouseMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/warehouse/WarehouseMapper.java
@@ -2,9 +2,12 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.warehouse;
 
 import java.util.*;
 
+import cn.hutool.core.lang.Dict;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.QueryWrapperX;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -36,4 +39,10 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
     default List<WarehouseDO> selectListByStatus(Integer wStatus) {
         return selectList(WarehouseDO::getWhStatus, wStatus);
     }
+
+    default List<Map<String, Object>> selectSimpleList() {
+
+        return selectMaps(new QueryWrapper<WarehouseDO>().select("id", "wh_name").lambda());
+
+    }
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pn/PnService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pn/PnService.java
index 7a30460e..ef4bfa50 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pn/PnService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pn/PnService.java
@@ -1,55 +1,58 @@
-package com.chanko.yunxi.mes.module.heli.service.pn;
-
-import java.util.*;
-import javax.validation.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.pn.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-
-/**
- * 库位 Service 接口
- *
- * @author 管理员
- */
-public interface PnService {
-
-    /**
-     * 创建库位
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createPn(@Valid PnSaveReqVO createReqVO);
-
-    /**
-     * 更新库位
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updatePn(@Valid PnSaveReqVO updateReqVO);
-
-    /**
-     * 删除库位
-     *
-     * @param id 编号
-     */
-    void deletePn(Long id);
-
-    /**
-     * 获得库位
-     *
-     * @param id 编号
-     * @return 库位
-     */
-    PnDO getPn(Long id);
-
-    /**
-     * 获得库位分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 库位分页
-     */
-    PageResult<PnDO> getPnPage(PnPageReqVO pageReqVO);
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.pn;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.pn.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+
+/**
+ * 库位 Service 接口
+ *
+ * @author 管理员
+ */
+public interface PnService {
+
+    /**
+     * 创建库位
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createPn(@Valid PnSaveReqVO createReqVO);
+
+    /**
+     * 更新库位
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updatePn(@Valid PnSaveReqVO updateReqVO);
+
+    /**
+     * 删除库位
+     *
+     * @param id 编号
+     */
+    void deletePn(Long id);
+
+    /**
+     * 获得库位
+     *
+     * @param id 编号
+     * @return 库位
+     */
+    PnDO getPn(Long id);
+
+    /**
+     * 获得库位分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 库位分页
+     */
+    PageResult<PnDO> getPnPage(PnPageReqVO pageReqVO);
+
+    List<Map<String, Object>> getSimpleList();
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pn/PnServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pn/PnServiceImpl.java
index ddac994c..09571aa9 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pn/PnServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pn/PnServiceImpl.java
@@ -1,74 +1,79 @@
-package com.chanko.yunxi.mes.module.heli.service.pn;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.pn.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-
-import com.chanko.yunxi.mes.module.heli.dal.mysql.pn.PnMapper;
-
-import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
-
-/**
- * 库位 Service 实现类
- *
- * @author 管理员
- */
-@Service
-@Validated
-public class PnServiceImpl implements PnService {
-
-    @Resource
-    private PnMapper pnMapper;
-
-    @Override
-    public Long createPn(PnSaveReqVO createReqVO) {
-        // 插入
-        PnDO pn = BeanUtils.toBean(createReqVO, PnDO.class);
-        pnMapper.insert(pn);
-        // 返回
-        return pn.getId();
-    }
-
-    @Override
-    public void updatePn(PnSaveReqVO updateReqVO) {
-        // 校验存在
-        validatePnExists(updateReqVO.getId());
-        // 更新
-        PnDO updateObj = BeanUtils.toBean(updateReqVO, PnDO.class);
-        pnMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deletePn(Long id) {
-        // 校验存在
-        validatePnExists(id);
-        // 删除
-        pnMapper.deleteById(id);
-    }
-
-    private void validatePnExists(Long id) {
-        if (pnMapper.selectById(id) == null) {
-            throw exception(PN_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public PnDO getPn(Long id) {
-        return pnMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<PnDO> getPnPage(PnPageReqVO pageReqVO) {
-        return pnMapper.selectPage(pageReqVO);
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.pn;
+
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.pn.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.pn.PnMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 库位 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class PnServiceImpl implements PnService {
+
+    @Resource
+    private PnMapper pnMapper;
+
+    @Override
+    public Long createPn(PnSaveReqVO createReqVO) {
+        // 插入
+        PnDO pn = BeanUtils.toBean(createReqVO, PnDO.class);
+        pnMapper.insert(pn);
+        // 返回
+        return pn.getId();
+    }
+
+    @Override
+    public void updatePn(PnSaveReqVO updateReqVO) {
+        // 校验存在
+        validatePnExists(updateReqVO.getId());
+        // 更新
+        PnDO updateObj = BeanUtils.toBean(updateReqVO, PnDO.class);
+        pnMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deletePn(Long id) {
+        // 校验存在
+        validatePnExists(id);
+        // 删除
+        pnMapper.deleteById(id);
+    }
+
+    private void validatePnExists(Long id) {
+        if (pnMapper.selectById(id) == null) {
+            throw exception(PN_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public PnDO getPn(Long id) {
+        return pnMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<PnDO> getPnPage(PnPageReqVO pageReqVO) {
+        return pnMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<Map<String, Object>> getSimpleList() {
+        return pnMapper.selectSimpleList();
+    }
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/rg/RgService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/rg/RgService.java
index 9a403198..699f5cec 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/rg/RgService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/rg/RgService.java
@@ -1,55 +1,57 @@
-package com.chanko.yunxi.mes.module.heli.service.rg;
-
-import java.util.*;
-import javax.validation.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.rg.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-
-/**
- * 库区 Service 接口
- *
- * @author 管理员
- */
-public interface RgService {
-
-    /**
-     * 创建库区
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createRg(@Valid RgSaveReqVO createReqVO);
-
-    /**
-     * 更新库区
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateRg(@Valid RgSaveReqVO updateReqVO);
-
-    /**
-     * 删除库区
-     *
-     * @param id 编号
-     */
-    void deleteRg(Long id);
-
-    /**
-     * 获得库区
-     *
-     * @param id 编号
-     * @return 库区
-     */
-    RgDO getRg(Long id);
-
-    /**
-     * 获得库区分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 库区分页
-     */
-    PageResult<RgDO> getRgPage(RgPageReqVO pageReqVO);
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.rg;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.rg.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
+
+/**
+ * 库区 Service 接口
+ *
+ * @author 管理员
+ */
+public interface RgService {
+
+    /**
+     * 创建库区
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createRg(@Valid RgSaveReqVO createReqVO);
+
+    /**
+     * 更新库区
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateRg(@Valid RgSaveReqVO updateReqVO);
+
+    /**
+     * 删除库区
+     *
+     * @param id 编号
+     */
+    void deleteRg(Long id);
+
+    /**
+     * 获得库区
+     *
+     * @param id 编号
+     * @return 库区
+     */
+    RgDO getRg(Long id);
+
+    /**
+     * 获得库区分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 库区分页
+     */
+    PageResult<RgDO> getRgPage(RgPageReqVO pageReqVO);
+
+    List<Map<String, Object>> getSimpleList();
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/rg/RgServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/rg/RgServiceImpl.java
index 8f6dbd5f..f61b037a 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/rg/RgServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/rg/RgServiceImpl.java
@@ -1,74 +1,79 @@
-package com.chanko.yunxi.mes.module.heli.service.rg;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.rg.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-
-import com.chanko.yunxi.mes.module.heli.dal.mysql.rg.RgMapper;
-
-import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
-
-/**
- * 库区 Service 实现类
- *
- * @author 管理员
- */
-@Service
-@Validated
-public class RgServiceImpl implements RgService {
-
-    @Resource
-    private RgMapper rgMapper;
-
-    @Override
-    public Long createRg(RgSaveReqVO createReqVO) {
-        // 插入
-        RgDO rg = BeanUtils.toBean(createReqVO, RgDO.class);
-        rgMapper.insert(rg);
-        // 返回
-        return rg.getId();
-    }
-
-    @Override
-    public void updateRg(RgSaveReqVO updateReqVO) {
-        // 校验存在
-        validateRgExists(updateReqVO.getId());
-        // 更新
-        RgDO updateObj = BeanUtils.toBean(updateReqVO, RgDO.class);
-        rgMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteRg(Long id) {
-        // 校验存在
-        validateRgExists(id);
-        // 删除
-        rgMapper.deleteById(id);
-    }
-
-    private void validateRgExists(Long id) {
-        if (rgMapper.selectById(id) == null) {
-            throw exception(RG_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public RgDO getRg(Long id) {
-        return rgMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<RgDO> getRgPage(RgPageReqVO pageReqVO) {
-        return rgMapper.selectPage(pageReqVO);
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.rg;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.rg.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.rg.RgDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.rg.RgMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 库区 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class RgServiceImpl implements RgService {
+
+    @Resource
+    private RgMapper rgMapper;
+
+    @Override
+    public Long createRg(RgSaveReqVO createReqVO) {
+        // 插入
+        RgDO rg = BeanUtils.toBean(createReqVO, RgDO.class);
+        rgMapper.insert(rg);
+        // 返回
+        return rg.getId();
+    }
+
+    @Override
+    public void updateRg(RgSaveReqVO updateReqVO) {
+        // 校验存在
+        validateRgExists(updateReqVO.getId());
+        // 更新
+        RgDO updateObj = BeanUtils.toBean(updateReqVO, RgDO.class);
+        rgMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteRg(Long id) {
+        // 校验存在
+        validateRgExists(id);
+        // 删除
+        rgMapper.deleteById(id);
+    }
+
+    private void validateRgExists(Long id) {
+        if (rgMapper.selectById(id) == null) {
+            throw exception(RG_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public RgDO getRg(Long id) {
+        return rgMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<RgDO> getRgPage(RgPageReqVO pageReqVO) {
+        return rgMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<Map<String, Object>> getSimpleList() {
+        return rgMapper.selectSimpleList();
+    }
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java
index f0a4fd87..50c9c1f2 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java
@@ -1,55 +1,59 @@
-package com.chanko.yunxi.mes.module.heli.service.storagelog;
-
-import java.util.*;
-import javax.validation.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-
-/**
- * 入/出库日志 Service 接口
- *
- * @author 管理员
- */
-public interface StorageLogService {
-
-    /**
-     * 创建入/出库日志
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createStorageLog(@Valid StorageLogSaveReqVO createReqVO);
-
-    /**
-     * 更新入/出库日志
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateStorageLog(@Valid StorageLogSaveReqVO updateReqVO);
-
-    /**
-     * 删除入/出库日志
-     *
-     * @param id 编号
-     */
-    void deleteStorageLog(Long id);
-
-    /**
-     * 获得入/出库日志
-     *
-     * @param id 编号
-     * @return 入/出库日志
-     */
-    StorageLogDO getStorageLog(Long id);
-
-    /**
-     * 获得入/出库日志分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 入/出库日志分页
-     */
-    PageResult<StorageLogDO> getStorageLogPage(StorageLogPageReqVO pageReqVO);
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.storagelog;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
+
+/**
+ * 入/出库日志 Service 接口
+ *
+ * @author 管理员
+ */
+public interface StorageLogService {
+
+    /**
+     * 创建入/出库日志
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStorageLog(@Valid StorageLogSaveReqVO createReqVO);
+
+    /**
+     * 更新入/出库日志
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStorageLog(@Valid StorageLogSaveReqVO updateReqVO);
+
+    /**
+     * 删除入/出库日志
+     *
+     * @param id 编号
+     */
+    void deleteStorageLog(Long id);
+
+    /**
+     * 获得入/出库日志
+     *
+     * @param id 编号
+     * @return 入/出库日志
+     */
+    StorageLogDO getStorageLog(Long id);
+
+    /**
+     * 获得入/出库日志分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 入/出库日志分页
+     */
+    PageResult<StorageLogAllDO> getStorageLogPage(StorageLogPageReqVO pageReqVO);
+
+    void createStorageLogBatch(List<StorageLogDO> storageLogDOs);
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java
index f3de4675..313e3deb 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java
@@ -1,74 +1,86 @@
-package com.chanko.yunxi.mes.module.heli.service.storagelog;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-
-import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogMapper;
-
-import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
-
-/**
- * 入/出库日志 Service 实现类
- *
- * @author 管理员
- */
-@Service
-@Validated
-public class StorageLogServiceImpl implements StorageLogService {
-
-    @Resource
-    private StorageLogMapper storageLogMapper;
-
-    @Override
-    public Long createStorageLog(StorageLogSaveReqVO createReqVO) {
-        // 插入
-        StorageLogDO storageLog = BeanUtils.toBean(createReqVO, StorageLogDO.class);
-        storageLogMapper.insert(storageLog);
-        // 返回
-        return storageLog.getId();
-    }
-
-    @Override
-    public void updateStorageLog(StorageLogSaveReqVO updateReqVO) {
-        // 校验存在
-        validateStorageLogExists(updateReqVO.getId());
-        // 更新
-        StorageLogDO updateObj = BeanUtils.toBean(updateReqVO, StorageLogDO.class);
-        storageLogMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteStorageLog(Long id) {
-        // 校验存在
-        validateStorageLogExists(id);
-        // 删除
-        storageLogMapper.deleteById(id);
-    }
-
-    private void validateStorageLogExists(Long id) {
-        if (storageLogMapper.selectById(id) == null) {
-            throw exception(STORAGE_LOG_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public StorageLogDO getStorageLog(Long id) {
-        return storageLogMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<StorageLogDO> getStorageLogPage(StorageLogPageReqVO pageReqVO) {
-        return storageLogMapper.selectPage(pageReqVO);
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.storagelog;
+
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO;
+import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogAllMapper;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 入/出库日志 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class StorageLogServiceImpl implements StorageLogService {
+
+    @Resource
+    private StorageLogMapper storageLogMapper;
+
+    @Resource
+    private StorageLogAllMapper storageLogAllMapper;
+
+    @Override
+    public Long createStorageLog(StorageLogSaveReqVO createReqVO) {
+        // 插入
+        StorageLogDO storageLog = BeanUtils.toBean(createReqVO, StorageLogDO.class);
+        storageLogMapper.insert(storageLog);
+        // 返回
+        return storageLog.getId();
+    }
+
+    @Override
+    public void updateStorageLog(StorageLogSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStorageLogExists(updateReqVO.getId());
+        // 更新
+        StorageLogDO updateObj = BeanUtils.toBean(updateReqVO, StorageLogDO.class);
+        storageLogMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteStorageLog(Long id) {
+        // 校验存在
+        validateStorageLogExists(id);
+        // 删除
+        storageLogMapper.deleteById(id);
+    }
+
+    private void validateStorageLogExists(Long id) {
+        if (storageLogMapper.selectById(id) == null) {
+            throw exception(STORAGE_LOG_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public StorageLogDO getStorageLog(Long id) {
+        return storageLogMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<StorageLogAllDO> getStorageLogPage(StorageLogPageReqVO pageReqVO) {
+        return storageLogAllMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public void createStorageLogBatch(List<StorageLogDO> storageLogDOs) {
+        for (StorageLogDO storageLogDo : storageLogDOs){
+            storageLogMapper.insert(storageLogDo);
+        }
+    }
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java
index f0703944..8d5d1354 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java
@@ -59,6 +59,8 @@ public interface StorageMatService {
      */
     List<StorageMatValidRespVO> getStorageMatList();
 
-    int deleteStorageMatList(Long stockid);
+    int deleteStorageMatList(Long stockId);
+
+    List<StorageMatDO> getStorageMatListByStockId(Long stockId);
 
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java
index 475850b8..0bf3f0dd 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java
@@ -83,12 +83,17 @@ public class StorageMatServiceImpl implements StorageMatService {
     }
 
     @Override
-    public int deleteStorageMatList(Long stockid) {
+    public int deleteStorageMatList(Long stockId) {
         //删除条件
         Map<String, Object> columnMap = Maps.newHashMap();
-        columnMap.put("stock_id", stockid);
+        columnMap.put("stock_id", stockId);
 
         return storageMatMapper.deleteByMap(columnMap);
     }
 
+    @Override
+    public List<StorageMatDO> getStorageMatListByStockId(Long stockId) {
+        return storageMatMapper.selectMatByStorckID(stockId);
+    }
+
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseService.java
index a98ec994..a0c321bd 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseService.java
@@ -61,4 +61,6 @@ public interface WarehouseService {
      */
     List<WarehouseDO> getWarehouseListByStatus(Integer whStatus);
 
+    List<Map<String, Object>> getSimpleList();
+
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseServiceImpl.java
index 39b3554a..4898aa1c 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseServiceImpl.java
@@ -83,4 +83,8 @@ public class WarehouseServiceImpl implements WarehouseService {
         return warehouseMapper.selectListByStatus(whStatus);
     }
 
+    @Override
+    public List<Map<String, Object>> getSimpleList() {
+        return warehouseMapper.selectSimpleList();
+    }
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogAllMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogAllMapper.xml
new file mode 100644
index 00000000..7a67ca90
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogAllMapper.xml
@@ -0,0 +1,58 @@
+<?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.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogAllMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+    <resultMap id="StorageLogAllDO" type="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO">
+        <result property="id" column="id"/>
+        <result property="stockId" column="stock_id"/>
+        <result property="matId" column="mat_id"/>
+        <result property="whId" column="wh_id"/>
+        <result property="rgId" column="rg_id"/>
+        <result property="pnId" column="pn_id"/>
+        <result property="storageOkQty" column="storage_ok_qty"/>
+        <result property="lotNo" column="lotNo"/>
+        <result property="stockNo" column="stock_no"/>
+        <result property="stockType" column="stock_type"/>
+        <result property="headerNo" column="header_no"/>
+        <result property="matName" column="mat_name"/>
+        <result property="matCode" column="mat_code"/>
+        <result property="matType" column="mat_type"/>
+        <result property="whName" column="wh_name"/>
+        <result property="rgName" column="rg_name"/>
+        <result property="pnName" column="pn_name"/>
+    </resultMap>
+    <select id="selectAllPage"
+            parameterType="com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageLogPageReqVO"
+            resultMap="StorageLogAllDO">
+        select * from v_storage_material_log
+        <where>
+            <if test="matCode != null and matCode != ''">
+                AND  matCode like concat('%', #{matCode}, '%')
+            </if>
+            <if test="matName != null and matName != ''">
+                AND  matName like concat('%', #{matName}, '%')
+            </if>
+            <if test="lotNo != null and lotNo != ''">
+                AND  lotNo like concat('%', #{lotNo}, '%')
+            </if>
+            <if test="stockNo != null and stockNo != ''">
+                AND  stockNo like concat('%', #{stockNo}, '%')
+            </if>
+            <if test="headerNo != null and headerNo != ''">
+                AND  headerNo like concat('%', #{headerNo}, '%')
+            </if>
+            <if test="stockType != null and stockType != ''">
+                AND  stockType =#{headerNo}
+            </if>
+            <if test="matType != null and matType != ''">
+                AND  matType  #{matType}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogMapper.xml
index d89a38b3..f383c187 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogMapper.xml
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogMapper.xml
@@ -8,7 +8,5 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-    <select id="selectStorageMatLogList" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO">
-        select * from v_storage_material_log
-    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/pn/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/pn/index.ts
index d20819e6..ec50962d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/pn/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/pn/index.ts
@@ -1,41 +1,46 @@
-import request from '@/config/axios'
-
-export interface PnVO {
-  id: number
-  pnNo: string
-  pnName: string
-  rgId: number
-  descr: string
-  pnStatus: number
-  whId: number
-}
-
-// 查询库位分页
-export const getPnPage = async (params) => {
-  return await request.get({ url: `/heli/pn/page`, params })
-}
-
-// 查询库位详情
-export const getPn = async (id: number) => {
-  return await request.get({ url: `/heli/pn/get?id=` + id })
-}
-
-// 新增库位
-export const createPn = async (data: PnVO) => {
-  return await request.post({ url: `/heli/pn/create`, data })
-}
-
-// 修改库位
-export const updatePn = async (data: PnVO) => {
-  return await request.put({ url: `/heli/pn/update`, data })
-}
-
-// 删除库位
-export const deletePn = async (id: number) => {
-  return await request.delete({ url: `/heli/pn/delete?id=` + id })
-}
-
-// 导出库位 Excel
-export const exportPn = async (params) => {
-  return await request.download({ url: `/heli/pn/export-excel`, params })
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+export interface PnVO {
+  id: number
+  pnNo: string
+  pnName: string
+  rgId: number
+  descr: string
+  pnStatus: number
+  whId: number
+}
+
+// 查询库区分页
+export const getSimpList = async () => {
+  return await request.get({ url: `/heli/pn/all-simples` })
+}
+
+// 查询库位分页
+export const getPnPage = async (params) => {
+  return await request.get({ url: `/heli/pn/page`, params })
+}
+
+// 查询库位详情
+export const getPn = async (id: number) => {
+  return await request.get({ url: `/heli/pn/get?id=` + id })
+}
+
+// 新增库位
+export const createPn = async (data: PnVO) => {
+  return await request.post({ url: `/heli/pn/create`, data })
+}
+
+// 修改库位
+export const updatePn = async (data: PnVO) => {
+  return await request.put({ url: `/heli/pn/update`, data })
+}
+
+// 删除库位
+export const deletePn = async (id: number) => {
+  return await request.delete({ url: `/heli/pn/delete?id=` + id })
+}
+
+// 导出库位 Excel
+export const exportPn = async (params) => {
+  return await request.download({ url: `/heli/pn/export-excel`, params })
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/rg/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/rg/index.ts
index 5b8a8e8e..f46eaf8e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/rg/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/rg/index.ts
@@ -1,40 +1,45 @@
-import request from '@/config/axios'
-
-export interface RgVO {
-  id: number
-  rgNo: string
-  rgName: string
-  whId: number
-  descr: string
-  rgStatus: number
-}
-
-// 查询库区分页
-export const getRgPage = async (params) => {
-  return await request.get({ url: `/heli/rg/page`, params })
-}
-
-// 查询库区详情
-export const getRg = async (id: number) => {
-  return await request.get({ url: `/heli/rg/get?id=` + id })
-}
-
-// 新增库区
-export const createRg = async (data: RgVO) => {
-  return await request.post({ url: `/heli/rg/create`, data })
-}
-
-// 修改库区
-export const updateRg = async (data: RgVO) => {
-  return await request.put({ url: `/heli/rg/update`, data })
-}
-
-// 删除库区
-export const deleteRg = async (id: number) => {
-  return await request.delete({ url: `/heli/rg/delete?id=` + id })
-}
-
-// 导出库区 Excel
-export const exportRg = async (params) => {
-  return await request.download({ url: `/heli/rg/export-excel`, params })
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+export interface RgVO {
+  id: number
+  rgNo: string
+  rgName: string
+  whId: number
+  descr: string
+  rgStatus: number
+}
+
+// 查询库区分页
+export const getSimpList = async () => {
+  return await request.get({ url: `/heli/rg/all-simples` })
+}
+
+// 查询库区分页
+export const getRgPage = async (params) => {
+  return await request.get({ url: `/heli/rg/page`, params })
+}
+
+// 查询库区详情
+export const getRg = async (id: number) => {
+  return await request.get({ url: `/heli/rg/get?id=` + id })
+}
+
+// 新增库区
+export const createRg = async (data: RgVO) => {
+  return await request.post({ url: `/heli/rg/create`, data })
+}
+
+// 修改库区
+export const updateRg = async (data: RgVO) => {
+  return await request.put({ url: `/heli/rg/update`, data })
+}
+
+// 删除库区
+export const deleteRg = async (id: number) => {
+  return await request.delete({ url: `/heli/rg/delete?id=` + id })
+}
+
+// 导出库区 Excel
+export const exportRg = async (params) => {
+  return await request.download({ url: `/heli/rg/export-excel`, params })
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/warehouse/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/warehouse/index.ts
index 3ef86bac..abf97131 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/warehouse/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/warehouse/index.ts
@@ -8,6 +8,10 @@ export interface WarehouseVO {
   telephone: string
   whStatus: number
 }
+// 查询仓库分页
+export const getSimpList = async () => {
+  return await request.get({ url: `/heli/warehouse/all-simples` })
+}
 
 // 查询仓库分页
 export const getWarehouseSimpList = async () => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
index 2faae34b..6eb36029 100644
--- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
@@ -223,6 +223,7 @@ export enum DICT_TYPE {
   HELI_STORAGE_IN_TYPE = 'heli_storage_in_type', // 入库类型
   HELI_STORAGE_OUT_TYPE = 'heli_storage_out_type',//出库类型
   HELI_STORAGE_STATUS = 'heli_storage_status',//入库出库状态
+  HELI_STORAGE_TYPE = 'heli_storage_type', // 入库类型
 
   HELI_PROJECT_ORDER_STATUS = 'heli_project_order_status', //项目订单状态
   HELI_DELIVERY_STATUS = 'heli_delivery_status', // 发货状态
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
index 91d94b82..1a6bd0a9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
@@ -1,135 +1,46 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="入/出库Id" prop="stockId">
-        <el-input
-          v-model="queryParams.stockId"
-          placeholder="请输入入/出库Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="物料编码" prop="matCode">
+        <el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="物料 Id,对应 base_material表中的 Id 列" prop="matId">
-        <el-input
-          v-model="queryParams.matId"
-          placeholder="请输入物料 Id,对应 base_material表中的 Id 列"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+      <el-form-item label="物料名称" prop="matName">
+        <el-input v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="仓库 Id，对应 wms_wh 表中的Id" prop="whId">
-        <el-input
-          v-model="queryParams.whId"
-          placeholder="请输入仓库 Id，对应 wms_wh 表中的Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="rgId">
-        <el-input
-          v-model="queryParams.rgId"
-          placeholder="请输入库区 Id，对应 wms_rg 表中的Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="pnId">
-        <el-input
-          v-model="queryParams.pnId"
-          placeholder="请输入库区 Id，对应 wms_rg 表中的Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="库存良品数量" prop="storageOkQty">
-        <el-input
-          v-model="queryParams.storageOkQty"
-          placeholder="请输入库存良品数量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+      <el-form-item label="物料类型" prop="matType">
+        <el-select v-model="queryParams.matType" placeholder="下拉选择" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label"
+            :value="dict.label" />
+        </el-select>
       </el-form-item>
       <el-form-item label="批次号" prop="lotNo">
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.lotNo" placeholder="批次号" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
-      <el-form-item label="记录的创建人,对应员工表中的 Id" prop="creator">
-        <el-input
-          v-model="queryParams.creator"
-          placeholder="请输入记录的创建人,对应员工表中的 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+      <el-form-item label="业务单据编号" prop="stockNo">
+        <el-input v-model="queryParams.stockNo" placeholder="业务单据编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
+      <el-form-item label="变动方向" prop="stockType">
+        <el-select v-model="queryParams.stockType" placeholder="下拉选择" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_TYPE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="记录的修改人,对应员工表中的 Id" prop="updater">
-        <el-input
-          v-model="queryParams.updater"
-          placeholder="请输入记录的修改人,对应员工表中的 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
-        <el-date-picker
-          v-model="queryParams.updateTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
+      <el-form-item label="上游单据编号" prop="headerNo">
+        <el-input v-model="queryParams.headerNo" placeholder="上游单据编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
+
+
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['heli:storage-log:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['heli:storage-log:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
         </el-button>
       </el-form-item>
     </el-form>
@@ -138,30 +49,25 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="入/出库Id" align="center" prop="stockId" />
-      <el-table-column label="物料 Id,对应 base_material表中的 Id 列" align="center" prop="matId" />
-      <el-table-column label="仓库 Id，对应 wms_wh 表中的Id" align="center" prop="whId" />
-      <el-table-column label="库区 Id，对应 wms_rg 表中的Id" align="center" prop="rgId" />
-      <el-table-column label="库区 Id，对应 wms_rg 表中的Id" align="center" prop="pnId" />
-      <el-table-column label="库存良品数量" align="center" prop="storageOkQty" />
+      <el-table-column label="物料编码" align="center" prop="matCode" />
+      <el-table-column label="物料名称" align="center" prop="matName" />
+      <el-table-column label="物料类型" align="center" prop="matType" />
+      <el-table-column label="物料简称" align="center" prop="shortName" />
+      <el-table-column label="规格/型号" align="center" prop="matSpec" />
+      <el-table-column label="品牌" align="center" prop="matBrand" />
+      <el-table-column label="业务单据编号" align="center" prop="stockNo" />
+      <el-table-column label="业务单据类型" align="center" prop="stockTypeName" />
+      <el-table-column label="上游单据编号" align="center" prop="headerNo" />
+      <el-table-column label="仓库" align="center" prop="whName" />
+      <el-table-column label="库区" align="center" prop="rgName" />
+      <el-table-column label="库位" align="center" prop="pnName" />
       <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+      <el-table-column label="变动数量" align="center" prop="storageOkQty" />
+      <el-table-column label="库存单位" align="center" prop="matUnit" />
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -169,13 +75,22 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as StorageLogApi from '@/api/heli/storagelog'
 import StorageLogForm from './StorageLogForm.vue'
 
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+
+import * as WarehouseApi from '@/api/heli/warehouse'
+import * as RgApi from '@/api/heli/rg'
+import * as PnApi from '@/api/heli/pn'
+
 defineOptions({ name: 'StorageLog' })
 
+const whList = ref([])
+const rgList = ref([])
+const pnList = ref([])
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -185,21 +100,16 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  stockId: undefined,
-  matId: undefined,
-  whId: undefined,
-  rgId: undefined,
-  pnId: undefined,
-  storageOkQty: undefined,
+  matCode: undefined,
+  matName: undefined,
+  matType: undefined,
   lotNo: undefined,
-  description: undefined,
-  creator: undefined,
-  createTime: [],
-  updater: undefined,
-  updateTime: [],
+  pnId: undefined,
+  stockNo: undefined,
+  stockType: undefined,
+  headerNo: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
 
 /** 查询列表 */
 const getList = async () => {
@@ -224,25 +134,24 @@ const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
-
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await StorageLogApi.exportStorageLog(queryParams)
-    download.excel(data, '入/出库日志.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
+//仓库列表
+const init_page_wh = (async ()=>{
+  whList.value = await WarehouseApi.getSimpList()
+})
+//库区列表
+const init_page_rg = (async ()=>{
+  rgList.value = await RgApi.getSimpList()
+})
+//库位列表
+const init_page_pn = (async ()=>{
+  pnList.value = await PnApi.getSimpList()
+})
 
 /** 初始化 **/
-onMounted( async () => {
+onMounted(async () => {
+  await init_page_wh()
+  await init_page_rg()
+  await init_page_pn()
   await getList()
 })
 </script>
\ No newline at end of file

From cb5140230110c52f1be6cd60dfa16336dda21749 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sun, 28 Jan 2024 10:10:43 +0800
Subject: [PATCH 25/64] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

实时库存
---
 .../storagelog/StorageLogController.java      |   9 +
 .../storagelog/vo/StorageLogPageReqVO.java    |   9 +
 .../storagelogNow/StorageLogNowDO.java        |  59 +++++
 .../module/heli/dal/mysql/pn/PnMapper.java    |   2 +-
 .../module/heli/dal/mysql/rg/RgMapper.java    |   2 +-
 .../mysql/storagelog/StorageLogNowMapper.java |  36 +++
 .../service/storagelog/StorageLogService.java |   3 +
 .../storagelog/StorageLogServiceImpl.java     |  10 +
 .../src/api/heli/storagelog/index.ts          |  91 ++++---
 .../views/heli/storagelog/StorageLogForm.vue  | 246 ++++++++++--------
 .../src/views/heli/storagelog/index.vue       |  45 ++--
 11 files changed, 341 insertions(+), 171 deletions(-)
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java
index 9ca23bce..f52b90f3 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java
@@ -1,6 +1,7 @@
 package com.chanko.yunxi.mes.module.heli.controller.admin.storagelog;
 
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -80,6 +81,14 @@ public class StorageLogController {
         return success(pageResult);
     }
 
+    @GetMapping("/now")
+    @Operation(summary = "获得入/出库实时分页")
+    @PreAuthorize("@ss.hasPermission('heli:storage-log:query')")
+    public CommonResult<PageResult<StorageLogNowDO>> getStorageNowPage(@Valid StorageLogPageReqVO pageReqVO) {
+        PageResult<StorageLogNowDO> pageResult = storageLogService.getStorageNowPage(pageReqVO);
+        return success(pageResult);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出入/出库日志 Excel")
     @PreAuthorize("@ss.hasPermission('heli:storage-log:export')")
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogPageReqVO.java
index e046a78f..17ce94fd 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogPageReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageLogPageReqVO.java
@@ -37,6 +37,15 @@ public class StorageLogPageReqVO extends PageParam {
     @Schema(description = "出入库类型")
     private Integer stockType;
 
+    @Schema(description = "仓库")
+    private Long whId;
+
+    @Schema(description = "库区")
+    private Long rgId;
+
+    @Schema(description = "库位")
+    private Long pnId;
+
 
 
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java
new file mode 100644
index 00000000..f5f45e5e
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java
@@ -0,0 +1,59 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * 入/出库日志 DO
+ *
+ * @author 管理员
+ */
+@TableName("v_storage_material_now")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StorageLogNowDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 库存良品数量
+     */
+    private BigDecimal storageOkQty;
+    /**
+     * 批次号
+     */
+    private String lotNo;
+
+    private String matName;
+
+    private String matCode;
+
+    private String matType;
+
+    private Long whId;
+    private String whName;
+
+    private  Long rgId;
+    private String rgName;
+
+    private  Long pnId;
+    private String pnName;
+
+    private String shortName;
+
+    private String matSpec;
+    private String matBrand;
+    private String matUnit;
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pn/PnMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pn/PnMapper.java
index d1c931d3..b3070b9b 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pn/PnMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pn/PnMapper.java
@@ -37,7 +37,7 @@ public interface PnMapper extends BaseMapperX<PnDO> {
     }
     default List<Map<String, Object>> selectSimpleList() {
 
-        return selectMaps(new QueryWrapper<PnDO>().select("id", "pn_name").lambda());
+        return selectMaps(new QueryWrapper<PnDO>().select("id", "pn_name","rg_id").lambda());
 
     }
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/rg/RgMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/rg/RgMapper.java
index de43c580..1bc6a966 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/rg/RgMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/rg/RgMapper.java
@@ -35,7 +35,7 @@ public interface RgMapper extends BaseMapperX<RgDO> {
 
     default List<Map<String, Object>> selectSimpleList() {
 
-        return selectMaps(new QueryWrapper<RgDO>().select("id", "rg_name").lambda());
+        return selectMaps(new QueryWrapper<RgDO>().select("id", "rg_name","wh_id").lambda());
 
     }
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java
new file mode 100644
index 00000000..c9032d78
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java
@@ -0,0 +1,36 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog;
+
+import com.alibaba.druid.util.StringUtils;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageLogPageReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 入/出库日志 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface StorageLogNowMapper extends BaseMapperX<StorageLogNowDO> {
+
+    default PageResult<StorageLogNowDO> selectPage(StorageLogPageReqVO reqVO) {
+        MPJLambdaWrapper<StorageLogNowDO> query = new MPJLambdaWrapper<>();
+
+        query.selectAll(StorageLogNowDO.class)
+                .orderByDesc(StorageLogNowDO::getId);
+
+        query.like(!StringUtils.isEmpty(reqVO.getMatType()),StorageLogNowDO::getMatType, reqVO.getMatType())
+                .eq(reqVO.getWhId()!= null,StorageLogNowDO::getWhId, reqVO.getWhId())
+                .eq(reqVO.getRgId()!= null,StorageLogNowDO::getRgId, reqVO.getRgId())
+                .eq(reqVO.getPnId()!= null,StorageLogNowDO::getPnId, reqVO.getPnId())
+                .like(!StringUtils.isEmpty(reqVO.getMatName()), StorageLogNowDO::getMatName, reqVO.getMatName())
+                .like(!StringUtils.isEmpty(reqVO.getMatCode()), StorageLogNowDO::getMatCode, reqVO.getMatCode())
+                .like(!StringUtils.isEmpty(reqVO.getLotNo()),StorageLogNowDO::getLotNo, reqVO.getLotNo());
+
+        return selectPage(reqVO,query);
+    }
+    PageResult<StorageLogNowDO> selectAllPage(StorageLogPageReqVO reqVO);
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java
index 50c9c1f2..f5506731 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java
@@ -7,6 +7,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
 
 /**
@@ -54,6 +55,8 @@ public interface StorageLogService {
      */
     PageResult<StorageLogAllDO> getStorageLogPage(StorageLogPageReqVO pageReqVO);
 
+    PageResult<StorageLogNowDO> getStorageNowPage(StorageLogPageReqVO pageReqVO);
+
     void createStorageLogBatch(List<StorageLogDO> storageLogDOs);
 
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java
index 313e3deb..133a0b86 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java
@@ -1,7 +1,9 @@
 package com.chanko.yunxi.mes.module.heli.service.storagelog;
 
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogAll.StorageLogAllDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogAllMapper;
+import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogNowMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -34,6 +36,9 @@ public class StorageLogServiceImpl implements StorageLogService {
     @Resource
     private StorageLogAllMapper storageLogAllMapper;
 
+    @Resource
+    private StorageLogNowMapper storageLogNowMapper;
+
     @Override
     public Long createStorageLog(StorageLogSaveReqVO createReqVO) {
         // 插入
@@ -76,6 +81,11 @@ public class StorageLogServiceImpl implements StorageLogService {
         return storageLogAllMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<StorageLogNowDO> getStorageNowPage(StorageLogPageReqVO pageReqVO) {
+        return storageLogNowMapper.selectPage(pageReqVO);
+    }
+
     @Override
     public void createStorageLogBatch(List<StorageLogDO> storageLogDOs) {
         for (StorageLogDO storageLogDo : storageLogDOs){
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagelog/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagelog/index.ts
index e479f3f9..01989c02 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagelog/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagelog/index.ts
@@ -1,43 +1,48 @@
-import request from '@/config/axios'
-
-export interface StorageLogVO {
-  id: number
-  stockId: number
-  matId: number
-  whId: number
-  rgId: number
-  pnId: number
-  storageOkQty: number
-  lotNo: string
-  description: string
-}
-
-// 查询入/出库日志分页
-export const getStorageLogPage = async (params) => {
-  return await request.get({ url: `/heli/storage-log/page`, params })
-}
-
-// 查询入/出库日志详情
-export const getStorageLog = async (id: number) => {
-  return await request.get({ url: `/heli/storage-log/get?id=` + id })
-}
-
-// 新增入/出库日志
-export const createStorageLog = async (data: StorageLogVO) => {
-  return await request.post({ url: `/heli/storage-log/create`, data })
-}
-
-// 修改入/出库日志
-export const updateStorageLog = async (data: StorageLogVO) => {
-  return await request.put({ url: `/heli/storage-log/update`, data })
-}
-
-// 删除入/出库日志
-export const deleteStorageLog = async (id: number) => {
-  return await request.delete({ url: `/heli/storage-log/delete?id=` + id })
-}
-
-// 导出入/出库日志 Excel
-export const exportStorageLog = async (params) => {
-  return await request.download({ url: `/heli/storage-log/export-excel`, params })
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+export interface StorageLogVO {
+  id: number
+  stockId: number
+  matId: number
+  whId: number
+  rgId: number
+  pnId: number
+  storageOkQty: number
+  lotNo: string
+  description: string
+}
+
+// 查询入/出库实时分页
+export const getStorageNowPage = async (params) => {
+  return await request.get({ url: `/heli/storage-log/now`, params })
+}
+
+// 查询入/出库日志分页
+export const getStorageLogPage = async (params) => {
+  return await request.get({ url: `/heli/storage-log/page`, params })
+}
+
+// 查询入/出库日志详情
+export const getStorageLog = async (id: number) => {
+  return await request.get({ url: `/heli/storage-log/get?id=` + id })
+}
+
+// 新增入/出库日志
+export const createStorageLog = async (data: StorageLogVO) => {
+  return await request.post({ url: `/heli/storage-log/create`, data })
+}
+
+// 修改入/出库日志
+export const updateStorageLog = async (data: StorageLogVO) => {
+  return await request.put({ url: `/heli/storage-log/update`, data })
+}
+
+// 删除入/出库日志
+export const deleteStorageLog = async (id: number) => {
+  return await request.delete({ url: `/heli/storage-log/delete?id=` + id })
+}
+
+// 导出入/出库日志 Excel
+export const exportStorageLog = async (params) => {
+  return await request.download({ url: `/heli/storage-log/export-excel`, params })
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
index e03e2e6f..900f3a4d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
@@ -1,128 +1,170 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="入/出库Id" prop="stockId">
-        <el-input v-model="formData.stockId" placeholder="请输入入/出库Id" />
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="物料编码" prop="matCode">
+        <el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="物料 Id,对应 base_material表中的 Id 列" prop="matId">
-        <el-input v-model="formData.matId" placeholder="请输入物料 Id,对应 base_material表中的 Id 列" />
+      <el-form-item label="物料名称" prop="matName">
+        <el-input v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="仓库 Id，对应 wms_wh 表中的Id" prop="whId">
-        <el-input v-model="formData.whId" placeholder="请输入仓库 Id，对应 wms_wh 表中的Id" />
+      <el-form-item label="物料类型" prop="matType">
+        <el-select v-model="queryParams.matType" placeholder="下拉选择" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label"
+            :value="dict.label" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="rgId">
-        <el-input v-model="formData.rgId" placeholder="请输入库区 Id，对应 wms_rg 表中的Id" />
+      <el-form-item label="批次号" prop="lotNo">
+        <el-input v-model="queryParams.lotNo" placeholder="批次号" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
-      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="pnId">
-        <el-input v-model="formData.pnId" placeholder="请输入库区 Id，对应 wms_rg 表中的Id" />
+      <el-form-item label="仓库" prop="whId">
+        <el-select v-model="queryParams.whId" placeholder="下拉选择" clearable class="!w-240px" @change="handleWh">
+          <el-option v-for="dict in whList" :key="dict.id" :label="dict.wh_name"
+            :value="dict.id" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="库存良品数量" prop="storageOkQty">
-        <el-input v-model="formData.storageOkQty" placeholder="请输入库存良品数量" />
+      <el-form-item label="库区" prop="rgId">
+        <el-select v-model="queryParams.rgId" placeholder="下拉选择" clearable class="!w-240px" @change="handleRg">
+          <el-option v-for="dict in rgCurrentList" :key="dict.id" :label="dict.rg_name"
+            :value="dict.id" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input v-model="formData.lotNo" placeholder="请输入批次号" />
+      <el-form-item label="库位" prop="pnId">
+        <el-select v-model="queryParams.pnId" placeholder="下拉选择" clearable class="!w-240px">
+          <el-option v-for="dict in pnCurrentList" :key="dict.id" :label="dict.pn_name"
+            :value="dict.id" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="备注" prop="description">
-        <el-input v-model="formData.description" type="textarea" placeholder="请输入备注" />
+
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
       </el-form-item>
     </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="物料编码" align="center" prop="matCode" />
+      <el-table-column label="物料名称" align="center" prop="matName" />
+      <el-table-column label="物料类型" align="center" prop="matType" />
+      <el-table-column label="物料简称" align="center" prop="shortName" />
+      <el-table-column label="规格/型号" align="center" prop="matSpec" />
+      <el-table-column label="品牌" align="center" prop="matBrand" />
+      <el-table-column label="仓库" align="center" prop="whName" />
+      <el-table-column label="库区" align="center" prop="rgName" />
+      <el-table-column label="库位" align="center" prop="pnName" />
+      <el-table-column label="批次号" align="center" prop="lotNo" />
+      <el-table-column label="变动数量" align="center" prop="storageOkQty" />
+      <el-table-column label="库存单位" align="center" prop="matUnit" />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
 </template>
+
 <script setup lang="ts">
+import download from '@/utils/download'
 import * as StorageLogApi from '@/api/heli/storagelog'
 
-const { t } = useI18n() // 国际化
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+
+import * as WarehouseApi from '@/api/heli/warehouse'
+import * as RgApi from '@/api/heli/rg'
+import * as PnApi from '@/api/heli/pn'
+
+defineOptions({ name: 'StorageLog' })
+
+const whList = ref([])
+const rgList = ref([])
+const pnList = ref([])
+
+const rgCurrentList = ref([])
+const pnCurrentList = ref([])
+
 const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
 
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  stockId: undefined,
-  matId: undefined,
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  matCode: undefined,
+  matName: undefined,
+  matType: undefined,
+  lotNo: undefined,
   whId: undefined,
-  rgId: undefined,
+  rgId:undefined,
   pnId: undefined,
-  storageOkQty: undefined,
-  lotNo: undefined,
-  description: undefined,
+  headerNo: undefined,
 })
-const formRules = reactive({
-  stockId: [{ required: true, message: '入/出库Id不能为空', trigger: 'blur' }],
-  matId: [{ required: true, message: '物料 Id,对应 base_material表中的 Id 列不能为空', trigger: 'blur' }],
-  whId: [{ required: true, message: '仓库 Id，对应 wms_wh 表中的Id不能为空', trigger: 'blur' }],
-  rgId: [{ required: true, message: '库区 Id，对应 wms_rg 表中的Id不能为空', trigger: 'blur' }],
-  pnId: [{ required: true, message: '库区 Id，对应 wms_rg 表中的Id不能为空', trigger: 'blur' }],
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await StorageLogApi.getStorageLog(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
   try {
-    const data = formData.value as unknown as StorageLogApi.StorageLogVO
-    if (formType.value === 'create') {
-      await StorageLogApi.createStorageLog(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await StorageLogApi.updateStorageLog(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
+    const data = await StorageLogApi.getStorageNowPage(queryParams)
+    list.value = data.list
+    total.value = data.total
   } finally {
-    formLoading.value = false
+    loading.value = false
   }
 }
 
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    stockId: undefined,
-    matId: undefined,
-    whId: undefined,
-    rgId: undefined,
-    pnId: undefined,
-    storageOkQty: undefined,
-    lotNo: undefined,
-    description: undefined,
-  }
-  formRef.value?.resetFields()
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
 }
+
+const handleWh = async (wid) => {
+  queryParams.rgId = undefined
+  queryParams.pnId = undefined
+
+  rgCurrentList.value =[]
+  pnCurrentList.value =[]
+  rgCurrentList.value = rgList.value.filter( (item) => { return  item.wh_id == wid})
+
+}
+const handleRg = async (rgid) => {
+  pnCurrentList.value =[]
+  pnCurrentList.value = pnList.value.filter( (item) => { return  item.rg_id == rgid})
+}
+//仓库列表
+const init_page_wh = (async ()=>{
+  whList.value = await WarehouseApi.getSimpList()
+})
+//库区列表
+const init_page_rg = (async ()=>{
+  rgList.value = await RgApi.getSimpList()
+})
+//库位列表
+const init_page_pn = (async ()=>{
+  pnList.value = await PnApi.getSimpList()
+})
+
+/** 初始化 **/
+onMounted(async () => {
+  await init_page_wh()
+  await init_page_rg()
+  await init_page_pn()
+  await getList()
+})
 </script>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
index 1a6bd0a9..350c6c3d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
@@ -70,26 +70,23 @@
       @pagination="getList" />
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <StorageLogForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as StorageLogApi from '@/api/heli/storagelog'
-import StorageLogForm from './StorageLogForm.vue'
 
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 
-import * as WarehouseApi from '@/api/heli/warehouse'
-import * as RgApi from '@/api/heli/rg'
-import * as PnApi from '@/api/heli/pn'
+// import * as WarehouseApi from '@/api/heli/warehouse'
+// import * as RgApi from '@/api/heli/rg'
+// import * as PnApi from '@/api/heli/pn'
 
 defineOptions({ name: 'StorageLog' })
 
-const whList = ref([])
-const rgList = ref([])
-const pnList = ref([])
+// const whList = ref([])
+// const rgList = ref([])
+// const pnList = ref([])
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -134,24 +131,24 @@ const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
-//仓库列表
-const init_page_wh = (async ()=>{
-  whList.value = await WarehouseApi.getSimpList()
-})
-//库区列表
-const init_page_rg = (async ()=>{
-  rgList.value = await RgApi.getSimpList()
-})
-//库位列表
-const init_page_pn = (async ()=>{
-  pnList.value = await PnApi.getSimpList()
-})
+// //仓库列表
+// const init_page_wh = (async ()=>{
+//   whList.value = await WarehouseApi.getSimpList()
+// })
+// //库区列表
+// const init_page_rg = (async ()=>{
+//   rgList.value = await RgApi.getSimpList()
+// })
+// //库位列表
+// const init_page_pn = (async ()=>{
+//   pnList.value = await PnApi.getSimpList()
+// })
 
 /** 初始化 **/
 onMounted(async () => {
-  await init_page_wh()
-  await init_page_rg()
-  await init_page_pn()
+  // await init_page_wh()
+  // await init_page_rg()
+  // await init_page_pn()
   await getList()
 })
 </script>
\ No newline at end of file

From 55386366a6517619eaae2c63174e6c9927f50fdc Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sun, 28 Jan 2024 18:36:32 +0800
Subject: [PATCH 26/64] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存物料盘点
---
 .../module/heli/enums/ErrorCodeConstants.java |   2 +
 .../storagecheck/StorageCheckController.java  |  95 ++++
 .../vo/StorageCheckPageReqVO.java             |  74 ++++
 .../storagecheck/vo/StorageCheckRespVO.java   |  89 ++++
 .../vo/StorageCheckSaveReqVO.java             |  56 +++
 .../StorageCheckMatController.java            |  95 ++++
 .../vo/StorageCheckMatPageReqVO.java          |  60 +++
 .../vo/StorageCheckMatRespVO.java             |  69 +++
 .../vo/StorageCheckMatSaveReqVO.java          |  46 ++
 .../storagecheck/StorageCheckDO.java          |  88 ++++
 .../storagecheckmat/StorageCheckMatDO.java    |  65 +++
 .../storagecheck/StorageCheckMapper.java      |  42 ++
 .../StorageCheckMatMapper.java                |  38 ++
 .../storagecheck/StorageCheckService.java     |  55 +++
 .../storagecheck/StorageCheckServiceImpl.java |  74 ++++
 .../StorageCheckMatService.java               |  55 +++
 .../StorageCheckMatServiceImpl.java           |  74 ++++
 .../storagecheck/StorageCheckMapper.xml       |  12 +
 .../storagecheckmat/StorageCheckMatMapper.xml |  12 +
 .../src/api/heli/storagecheck/index.ts        |  47 ++
 .../src/api/heli/storagecheckmat/index.ts     |  43 ++
 .../heli/storagecheck/StorageCheckForm.vue    | 183 ++++++++
 .../src/views/heli/storagecheck/index.vue     | 404 ++++++++++++++++++
 .../storagecheckmat/StorageCheckMatForm.vue   | 128 ++++++
 .../src/views/heli/storagecheckmat/index.vue  | 314 ++++++++++++++
 25 files changed, 2220 insertions(+)
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckPageReqVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/StorageCheckMatController.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatPageReqVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatRespVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatSaveReqVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheckmat/StorageCheckMatDO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheck/StorageCheckMapper.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckService.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheck/StorageCheckMapper.xml
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheckmat/StorageCheckMatMapper.xml
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheckmat/index.ts
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheckmat/StorageCheckMatForm.vue
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheckmat/index.vue

diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
index a6462988..93254126 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
@@ -44,6 +44,8 @@ public interface ErrorCodeConstants {
     ErrorCode STORAGE_NOT_EXISTS = new ErrorCode(1_003_004,"库存不存在");
     ErrorCode STORAGE_MAT_NOT_EXISTS = new ErrorCode(1_003_005, "物料不存在");
     ErrorCode STORAGE_LOG_NOT_EXISTS = new ErrorCode(1_003_006, "库存日志不存在");
+    ErrorCode STORAGE_CHECK_NOT_EXISTS = new ErrorCode(1_003_007, "库存盘点不存在");
+    ErrorCode STORAGE_CHECK_MAT_NOT_EXISTS = new ErrorCode(1_003_008, "盘点物料不存在");
 
     /************订单管理***********/
     ErrorCode PROJECT_ORDER_NOT_EXISTS = new ErrorCode(1_004_001, "项目订单不存在");
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
new file mode 100644
index 00000000..80dafe22
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
@@ -0,0 +1,95 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
+import com.chanko.yunxi.mes.module.heli.service.storagecheck.StorageCheckService;
+
+@Tag(name = "管理后台 - 入/出库盘点")
+@RestController
+@RequestMapping("/heli/storage-check")
+@Validated
+public class StorageCheckController {
+
+    @Resource
+    private StorageCheckService storageCheckService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建入/出库盘点")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:create')")
+    public CommonResult<Long> createStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO createReqVO) {
+        return success(storageCheckService.createStorageCheck(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新入/出库盘点")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:update')")
+    public CommonResult<Boolean> updateStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) {
+        storageCheckService.updateStorageCheck(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除入/出库盘点")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:delete')")
+    public CommonResult<Boolean> deleteStorageCheck(@RequestParam("id") Long id) {
+        storageCheckService.deleteStorageCheck(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得入/出库盘点")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
+    public CommonResult<StorageCheckRespVO> getStorageCheck(@RequestParam("id") Long id) {
+        StorageCheckDO storageCheck = storageCheckService.getStorageCheck(id);
+        return success(BeanUtils.toBean(storageCheck, StorageCheckRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得入/出库盘点分页")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
+    public CommonResult<PageResult<StorageCheckRespVO>> getStorageCheckPage(@Valid StorageCheckPageReqVO pageReqVO) {
+        PageResult<StorageCheckDO> pageResult = storageCheckService.getStorageCheckPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, StorageCheckRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出入/出库盘点 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStorageCheckExcel(@Valid StorageCheckPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<StorageCheckDO> list = storageCheckService.getStorageCheckPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "入/出库盘点.xls", "数据", StorageCheckRespVO.class,
+                        BeanUtils.toBean(list, StorageCheckRespVO.class));
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckPageReqVO.java
new file mode 100644
index 00000000..ee345539
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckPageReqVO.java
@@ -0,0 +1,74 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 入/出库盘点分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class StorageCheckPageReqVO extends PageParam {
+
+    @Schema(description = "主键id")
+    private Long id;
+
+    @Schema(description = "盘点单号")
+    private String stockNo;
+
+    @Schema(description = "盘点类型：1部分盘点2整体盘点")
+    private Integer checkType;
+
+    @Schema(description = "排除库存为0的物料：1是2否")
+    private Integer noZero;
+
+    @Schema(description = "备注")
+    private String description;
+
+    @Schema(description = "状态：1已保存；2已提交；3已删除")
+    private Integer status;
+
+    @Schema(description = "仓库Id，对应 wms_wh 表中的Id")
+    private Long whId;
+
+    @Schema(description = "记录的创建人,对应员工表中的 Id")
+    private String creator;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "记录的修改人,对应员工表中的 Id")
+    private String updater;
+
+    @Schema(description = "更新时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] updateTime;
+
+    @Schema(description = "入库人")
+    private Long keeper;
+
+    @Schema(description = "入库时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] keeperTime;
+
+    @Schema(description = "出库人")
+    private Long outbound;
+
+    @Schema(description = "出库时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] outboundTime;
+
+    @Schema(description = "作废人")
+    private Long cancel;
+
+    @Schema(description = "作废时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] cancelTime;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java
new file mode 100644
index 00000000..72027852
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java
@@ -0,0 +1,89 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat;
+import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 入/出库盘点 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class StorageCheckRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "盘点单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("盘点单号")
+    private String stockNo;
+
+    @Schema(description = "盘点类型：1部分盘点2整体盘点")
+    @ExcelProperty(value = "盘点类型：1部分盘点2整体盘点", converter = DictConvert.class)
+    @DictFormat("heli_storage_mat_check_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer checkType;
+
+    @Schema(description = "排除库存为0的物料：1是2否")
+    @ExcelProperty(value = "排除库存为0的物料：1是2否", converter = DictConvert.class)
+    @DictFormat("heli_common_is_or_not") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer noZero;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String description;
+
+    @Schema(description = "状态：1已保存；2已提交；3已删除")
+    @ExcelProperty(value = "状态：1已保存；2已提交；3已删除", converter = DictConvert.class)
+    @DictFormat("heli_storage_mat_check_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer status;
+
+    @Schema(description = "仓库Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("仓库Id，对应 wms_wh 表中的Id")
+    private Long whId;
+
+    @Schema(description = "记录的创建人,对应员工表中的 Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("记录的创建人,对应员工表中的 Id")
+    private String creator;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "记录的修改人,对应员工表中的 Id")
+    @ExcelProperty("记录的修改人,对应员工表中的 Id")
+    private String updater;
+
+    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "入库人")
+    @ExcelProperty("入库人")
+    private Long keeper;
+
+    @Schema(description = "入库时间")
+    @ExcelProperty("入库时间")
+    private LocalDateTime keeperTime;
+
+    @Schema(description = "出库人")
+    @ExcelProperty("出库人")
+    private Long outbound;
+
+    @Schema(description = "出库时间")
+    @ExcelProperty("出库时间")
+    private LocalDateTime outboundTime;
+
+    @Schema(description = "作废人")
+    @ExcelProperty("作废人")
+    private Long cancel;
+
+    @Schema(description = "作废时间")
+    @ExcelProperty("作废时间")
+    private LocalDateTime cancelTime;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java
new file mode 100644
index 00000000..2ed796cc
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java
@@ -0,0 +1,56 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 入/出库盘点新增/修改 Request VO")
+@Data
+public class StorageCheckSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    @Schema(description = "盘点单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "盘点单号不能为空")
+    private String stockNo;
+
+    @Schema(description = "盘点类型：1部分盘点2整体盘点")
+    private Integer checkType;
+
+    @Schema(description = "排除库存为0的物料：1是2否")
+    private Integer noZero;
+
+    @Schema(description = "备注")
+    private String description;
+
+    @Schema(description = "状态：1已保存；2已提交；3已删除")
+    private Integer status;
+
+    @Schema(description = "仓库Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "仓库Id，对应 wms_wh 表中的Id不能为空")
+    private Long whId;
+
+    @Schema(description = "入库人")
+    private Long keeper;
+
+    @Schema(description = "入库时间")
+    private LocalDateTime keeperTime;
+
+    @Schema(description = "出库人")
+    private Long outbound;
+
+    @Schema(description = "出库时间")
+    private LocalDateTime outboundTime;
+
+    @Schema(description = "作废人")
+    private Long cancel;
+
+    @Schema(description = "作废时间")
+    private LocalDateTime cancelTime;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/StorageCheckMatController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/StorageCheckMatController.java
new file mode 100644
index 00000000..c0667b82
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/StorageCheckMatController.java
@@ -0,0 +1,95 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO;
+import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService;
+
+@Tag(name = "管理后台 - 盘点物料")
+@RestController
+@RequestMapping("/heli/storage-check-mat")
+@Validated
+public class StorageCheckMatController {
+
+    @Resource
+    private StorageCheckMatService storageCheckMatService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建盘点物料")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:create')")
+    public CommonResult<Long> createStorageCheckMat(@Valid @RequestBody StorageCheckMatSaveReqVO createReqVO) {
+        return success(storageCheckMatService.createStorageCheckMat(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新盘点物料")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:update')")
+    public CommonResult<Boolean> updateStorageCheckMat(@Valid @RequestBody StorageCheckMatSaveReqVO updateReqVO) {
+        storageCheckMatService.updateStorageCheckMat(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除盘点物料")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:delete')")
+    public CommonResult<Boolean> deleteStorageCheckMat(@RequestParam("id") Long id) {
+        storageCheckMatService.deleteStorageCheckMat(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得盘点物料")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:query')")
+    public CommonResult<StorageCheckMatRespVO> getStorageCheckMat(@RequestParam("id") Long id) {
+        StorageCheckMatDO storageCheckMat = storageCheckMatService.getStorageCheckMat(id);
+        return success(BeanUtils.toBean(storageCheckMat, StorageCheckMatRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得盘点物料分页")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:query')")
+    public CommonResult<PageResult<StorageCheckMatRespVO>> getStorageCheckMatPage(@Valid StorageCheckMatPageReqVO pageReqVO) {
+        PageResult<StorageCheckMatDO> pageResult = storageCheckMatService.getStorageCheckMatPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, StorageCheckMatRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出盘点物料 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStorageCheckMatExcel(@Valid StorageCheckMatPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<StorageCheckMatDO> list = storageCheckMatService.getStorageCheckMatPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "盘点物料.xls", "数据", StorageCheckMatRespVO.class,
+                        BeanUtils.toBean(list, StorageCheckMatRespVO.class));
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatPageReqVO.java
new file mode 100644
index 00000000..1703d6b5
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatPageReqVO.java
@@ -0,0 +1,60 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 盘点物料分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class StorageCheckMatPageReqVO extends PageParam {
+
+    @Schema(description = "主键id")
+    private Long id;
+
+    @Schema(description = "盘点Id")
+    private Long checkId;
+
+    @Schema(description = "物料 Id,对应 base_material表中的 Id 列")
+    private Long matId;
+
+    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id")
+    private Long whId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id")
+    private Long rgId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id")
+    private Long pnId;
+
+    @Schema(description = "盘点数量")
+    private BigDecimal storageOkQty;
+
+    @Schema(description = "物料当前库存数量")
+    private BigDecimal matRest;
+
+    @Schema(description = "批次号")
+    private String lotNo;
+
+    @Schema(description = "记录的创建人,对应员工表中的 Id")
+    private String creator;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "记录的修改人,对应员工表中的 Id")
+    private String updater;
+
+    @Schema(description = "更新时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] updateTime;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatRespVO.java
new file mode 100644
index 00000000..0accfeb0
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatRespVO.java
@@ -0,0 +1,69 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 盘点物料 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class StorageCheckMatRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "盘点Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("盘点Id")
+    private Long checkId;
+
+    @Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("物料 Id,对应 base_material表中的 Id 列")
+    private Long matId;
+
+    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("仓库 Id，对应 wms_wh 表中的Id")
+    private Long whId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("库区 Id，对应 wms_rg 表中的Id")
+    private Long rgId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("库区 Id，对应 wms_rg 表中的Id")
+    private Long pnId;
+
+    @Schema(description = "盘点数量")
+    @ExcelProperty("盘点数量")
+    private BigDecimal storageOkQty;
+
+    @Schema(description = "物料当前库存数量")
+    @ExcelProperty("物料当前库存数量")
+    private BigDecimal matRest;
+
+    @Schema(description = "批次号")
+    @ExcelProperty("批次号")
+    private String lotNo;
+
+    @Schema(description = "记录的创建人,对应员工表中的 Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("记录的创建人,对应员工表中的 Id")
+    private String creator;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "记录的修改人,对应员工表中的 Id")
+    @ExcelProperty("记录的修改人,对应员工表中的 Id")
+    private String updater;
+
+    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatSaveReqVO.java
new file mode 100644
index 00000000..25abb814
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/vo/StorageCheckMatSaveReqVO.java
@@ -0,0 +1,46 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - 盘点物料新增/修改 Request VO")
+@Data
+public class StorageCheckMatSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    @Schema(description = "盘点Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "盘点Id不能为空")
+    private Long checkId;
+
+    @Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
+    private Long matId;
+
+    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "仓库 Id，对应 wms_wh 表中的Id不能为空")
+    private Long whId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
+    private Long rgId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
+    private Long pnId;
+
+    @Schema(description = "盘点数量")
+    private BigDecimal storageOkQty;
+
+    @Schema(description = "物料当前库存数量")
+    private BigDecimal matRest;
+
+    @Schema(description = "批次号")
+    private String lotNo;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java
new file mode 100644
index 00000000..cc341263
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java
@@ -0,0 +1,88 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 入/出库盘点 DO
+ *
+ * @author 管理员
+ */
+@TableName("wms_storage_check")
+@KeySequence("wms_storage_check_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StorageCheckDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 盘点单号
+     */
+    private String stockNo;
+    /**
+     * 盘点类型：1部分盘点2整体盘点
+     *
+     * 枚举 {@link TODO heli_storage_mat_check_type 对应的类}
+     */
+    private Integer checkType;
+    /**
+     * 排除库存为0的物料：1是2否
+     *
+     * 枚举 {@link TODO heli_common_is_or_not 对应的类}
+     */
+    private Integer noZero;
+    /**
+     * 备注
+     */
+    private String description;
+    /**
+     * 状态：1已保存；2已提交；3已删除
+     *
+     * 枚举 {@link TODO heli_storage_mat_check_status 对应的类}
+     */
+    private Integer status;
+    /**
+     * 仓库Id，对应 wms_wh 表中的Id
+     */
+    private Long whId;
+    /**
+     * 入库人
+     */
+    private Long keeper;
+    /**
+     * 入库时间
+     */
+    private LocalDateTime keeperTime;
+    /**
+     * 出库人
+     */
+    private Long outbound;
+    /**
+     * 出库时间
+     */
+    private LocalDateTime outboundTime;
+    /**
+     * 作废人
+     */
+    private Long cancel;
+    /**
+     * 作废时间
+     */
+    private LocalDateTime cancelTime;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheckmat/StorageCheckMatDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheckmat/StorageCheckMatDO.java
new file mode 100644
index 00000000..2fd38e90
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheckmat/StorageCheckMatDO.java
@@ -0,0 +1,65 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 盘点物料 DO
+ *
+ * @author 管理员
+ */
+@TableName("wms_storage_check_mat")
+@KeySequence("wms_storage_check_mat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StorageCheckMatDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 盘点Id
+     */
+    private Long checkId;
+    /**
+     * 物料 Id,对应 base_material表中的 Id 列
+     */
+    private Long matId;
+    /**
+     * 仓库 Id，对应 wms_wh 表中的Id
+     */
+    private Long whId;
+    /**
+     * 库区 Id，对应 wms_rg 表中的Id
+     */
+    private Long rgId;
+    /**
+     * 库区 Id，对应 wms_rg 表中的Id
+     */
+    private Long pnId;
+    /**
+     * 盘点数量
+     */
+    private BigDecimal storageOkQty;
+    /**
+     * 物料当前库存数量
+     */
+    private BigDecimal matRest;
+    /**
+     * 批次号
+     */
+    private String lotNo;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheck/StorageCheckMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheck/StorageCheckMapper.java
new file mode 100644
index 00000000..7f3a49c7
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheck/StorageCheckMapper.java
@@ -0,0 +1,42 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheck;
+
+import java.util.*;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
+
+/**
+ * 入/出库盘点 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface StorageCheckMapper extends BaseMapperX<StorageCheckDO> {
+
+    default PageResult<StorageCheckDO> selectPage(StorageCheckPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<StorageCheckDO>()
+                .eqIfPresent(StorageCheckDO::getId, reqVO.getId())
+                .eqIfPresent(StorageCheckDO::getStockNo, reqVO.getStockNo())
+                .eqIfPresent(StorageCheckDO::getCheckType, reqVO.getCheckType())
+                .eqIfPresent(StorageCheckDO::getNoZero, reqVO.getNoZero())
+                .eqIfPresent(StorageCheckDO::getDescription, reqVO.getDescription())
+                .eqIfPresent(StorageCheckDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(StorageCheckDO::getWhId, reqVO.getWhId())
+                .eqIfPresent(StorageCheckDO::getCreator, reqVO.getCreator())
+                .betweenIfPresent(StorageCheckDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(StorageCheckDO::getUpdater, reqVO.getUpdater())
+                .betweenIfPresent(StorageCheckDO::getUpdateTime, reqVO.getUpdateTime())
+                .eqIfPresent(StorageCheckDO::getKeeper, reqVO.getKeeper())
+                .betweenIfPresent(StorageCheckDO::getKeeperTime, reqVO.getKeeperTime())
+                .eqIfPresent(StorageCheckDO::getOutbound, reqVO.getOutbound())
+                .betweenIfPresent(StorageCheckDO::getOutboundTime, reqVO.getOutboundTime())
+                .eqIfPresent(StorageCheckDO::getCancel, reqVO.getCancel())
+                .betweenIfPresent(StorageCheckDO::getCancelTime, reqVO.getCancelTime())
+                .orderByDesc(StorageCheckDO::getId));
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java
new file mode 100644
index 00000000..42d4d551
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java
@@ -0,0 +1,38 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheckmat;
+
+import java.util.*;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*;
+
+/**
+ * 盘点物料 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface StorageCheckMatMapper extends BaseMapperX<StorageCheckMatDO> {
+
+    default PageResult<StorageCheckMatDO> selectPage(StorageCheckMatPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<StorageCheckMatDO>()
+                .eqIfPresent(StorageCheckMatDO::getId, reqVO.getId())
+                .eqIfPresent(StorageCheckMatDO::getCheckId, reqVO.getCheckId())
+                .eqIfPresent(StorageCheckMatDO::getMatId, reqVO.getMatId())
+                .eqIfPresent(StorageCheckMatDO::getWhId, reqVO.getWhId())
+                .eqIfPresent(StorageCheckMatDO::getRgId, reqVO.getRgId())
+                .eqIfPresent(StorageCheckMatDO::getPnId, reqVO.getPnId())
+                .eqIfPresent(StorageCheckMatDO::getStorageOkQty, reqVO.getStorageOkQty())
+                .eqIfPresent(StorageCheckMatDO::getMatRest, reqVO.getMatRest())
+                .eqIfPresent(StorageCheckMatDO::getLotNo, reqVO.getLotNo())
+                .eqIfPresent(StorageCheckMatDO::getCreator, reqVO.getCreator())
+                .betweenIfPresent(StorageCheckMatDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(StorageCheckMatDO::getUpdater, reqVO.getUpdater())
+                .betweenIfPresent(StorageCheckMatDO::getUpdateTime, reqVO.getUpdateTime())
+                .orderByDesc(StorageCheckMatDO::getId));
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckService.java
new file mode 100644
index 00000000..5c7412f8
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckService.java
@@ -0,0 +1,55 @@
+package com.chanko.yunxi.mes.module.heli.service.storagecheck;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+
+/**
+ * 入/出库盘点 Service 接口
+ *
+ * @author 管理员
+ */
+public interface StorageCheckService {
+
+    /**
+     * 创建入/出库盘点
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStorageCheck(@Valid StorageCheckSaveReqVO createReqVO);
+
+    /**
+     * 更新入/出库盘点
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStorageCheck(@Valid StorageCheckSaveReqVO updateReqVO);
+
+    /**
+     * 删除入/出库盘点
+     *
+     * @param id 编号
+     */
+    void deleteStorageCheck(Long id);
+
+    /**
+     * 获得入/出库盘点
+     *
+     * @param id 编号
+     * @return 入/出库盘点
+     */
+    StorageCheckDO getStorageCheck(Long id);
+
+    /**
+     * 获得入/出库盘点分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 入/出库盘点分页
+     */
+    PageResult<StorageCheckDO> getStorageCheckPage(StorageCheckPageReqVO pageReqVO);
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
new file mode 100644
index 00000000..5ab69dda
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
@@ -0,0 +1,74 @@
+package com.chanko.yunxi.mes.module.heli.service.storagecheck;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheck.StorageCheckMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 入/出库盘点 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class StorageCheckServiceImpl implements StorageCheckService {
+
+    @Resource
+    private StorageCheckMapper storageCheckMapper;
+
+    @Override
+    public Long createStorageCheck(StorageCheckSaveReqVO createReqVO) {
+        // 插入
+        StorageCheckDO storageCheck = BeanUtils.toBean(createReqVO, StorageCheckDO.class);
+        storageCheckMapper.insert(storageCheck);
+        // 返回
+        return storageCheck.getId();
+    }
+
+    @Override
+    public void updateStorageCheck(StorageCheckSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStorageCheckExists(updateReqVO.getId());
+        // 更新
+        StorageCheckDO updateObj = BeanUtils.toBean(updateReqVO, StorageCheckDO.class);
+        storageCheckMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteStorageCheck(Long id) {
+        // 校验存在
+        validateStorageCheckExists(id);
+        // 删除
+        storageCheckMapper.deleteById(id);
+    }
+
+    private void validateStorageCheckExists(Long id) {
+        if (storageCheckMapper.selectById(id) == null) {
+            throw exception(STORAGE_CHECK_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public StorageCheckDO getStorageCheck(Long id) {
+        return storageCheckMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<StorageCheckDO> getStorageCheckPage(StorageCheckPageReqVO pageReqVO) {
+        return storageCheckMapper.selectPage(pageReqVO);
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java
new file mode 100644
index 00000000..00227048
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java
@@ -0,0 +1,55 @@
+package com.chanko.yunxi.mes.module.heli.service.storagecheckmat;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+
+/**
+ * 盘点物料 Service 接口
+ *
+ * @author 管理员
+ */
+public interface StorageCheckMatService {
+
+    /**
+     * 创建盘点物料
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStorageCheckMat(@Valid StorageCheckMatSaveReqVO createReqVO);
+
+    /**
+     * 更新盘点物料
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStorageCheckMat(@Valid StorageCheckMatSaveReqVO updateReqVO);
+
+    /**
+     * 删除盘点物料
+     *
+     * @param id 编号
+     */
+    void deleteStorageCheckMat(Long id);
+
+    /**
+     * 获得盘点物料
+     *
+     * @param id 编号
+     * @return 盘点物料
+     */
+    StorageCheckMatDO getStorageCheckMat(Long id);
+
+    /**
+     * 获得盘点物料分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 盘点物料分页
+     */
+    PageResult<StorageCheckMatDO> getStorageCheckMatPage(StorageCheckMatPageReqVO pageReqVO);
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java
new file mode 100644
index 00000000..6ab814b3
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java
@@ -0,0 +1,74 @@
+package com.chanko.yunxi.mes.module.heli.service.storagecheckmat;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheckmat.StorageCheckMatMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 盘点物料 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class StorageCheckMatServiceImpl implements StorageCheckMatService {
+
+    @Resource
+    private StorageCheckMatMapper storageCheckMatMapper;
+
+    @Override
+    public Long createStorageCheckMat(StorageCheckMatSaveReqVO createReqVO) {
+        // 插入
+        StorageCheckMatDO storageCheckMat = BeanUtils.toBean(createReqVO, StorageCheckMatDO.class);
+        storageCheckMatMapper.insert(storageCheckMat);
+        // 返回
+        return storageCheckMat.getId();
+    }
+
+    @Override
+    public void updateStorageCheckMat(StorageCheckMatSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStorageCheckMatExists(updateReqVO.getId());
+        // 更新
+        StorageCheckMatDO updateObj = BeanUtils.toBean(updateReqVO, StorageCheckMatDO.class);
+        storageCheckMatMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteStorageCheckMat(Long id) {
+        // 校验存在
+        validateStorageCheckMatExists(id);
+        // 删除
+        storageCheckMatMapper.deleteById(id);
+    }
+
+    private void validateStorageCheckMatExists(Long id) {
+        if (storageCheckMatMapper.selectById(id) == null) {
+            throw exception(STORAGE_CHECK_MAT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public StorageCheckMatDO getStorageCheckMat(Long id) {
+        return storageCheckMatMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<StorageCheckMatDO> getStorageCheckMatPage(StorageCheckMatPageReqVO pageReqVO) {
+        return storageCheckMatMapper.selectPage(pageReqVO);
+    }
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheck/StorageCheckMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheck/StorageCheckMapper.xml
new file mode 100644
index 00000000..8971e1c4
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheck/StorageCheckMapper.xml
@@ -0,0 +1,12 @@
+<?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.chanko.yunxi.mes.module.heli.dal.mysql.storagecheck.StorageCheckMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheckmat/StorageCheckMatMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheckmat/StorageCheckMatMapper.xml
new file mode 100644
index 00000000..21bc3b44
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheckmat/StorageCheckMatMapper.xml
@@ -0,0 +1,12 @@
+<?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.chanko.yunxi.mes.module.heli.dal.mysql.storagecheckmat.StorageCheckMatMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts
new file mode 100644
index 00000000..6eec5658
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export interface StorageCheckVO {
+  id: number
+  stockNo: string
+  checkType: number
+  noZero: number
+  description: string
+  status: number
+  whId: number
+  keeper: number
+  keeperTime: Date
+  outbound: number
+  outboundTime: Date
+  cancel: number
+  cancelTime: Date
+}
+
+// 查询入/出库盘点分页
+export const getStorageCheckPage = async (params) => {
+  return await request.get({ url: `/heli/storage-check/page`, params })
+}
+
+// 查询入/出库盘点详情
+export const getStorageCheck = async (id: number) => {
+  return await request.get({ url: `/heli/storage-check/get?id=` + id })
+}
+
+// 新增入/出库盘点
+export const createStorageCheck = async (data: StorageCheckVO) => {
+  return await request.post({ url: `/heli/storage-check/create`, data })
+}
+
+// 修改入/出库盘点
+export const updateStorageCheck = async (data: StorageCheckVO) => {
+  return await request.put({ url: `/heli/storage-check/update`, data })
+}
+
+// 删除入/出库盘点
+export const deleteStorageCheck = async (id: number) => {
+  return await request.delete({ url: `/heli/storage-check/delete?id=` + id })
+}
+
+// 导出入/出库盘点 Excel
+export const exportStorageCheck = async (params) => {
+  return await request.download({ url: `/heli/storage-check/export-excel`, params })
+}
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheckmat/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheckmat/index.ts
new file mode 100644
index 00000000..c2efa32c
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheckmat/index.ts
@@ -0,0 +1,43 @@
+import request from '@/config/axios'
+
+export interface StorageCheckMatVO {
+  id: number
+  checkId: number
+  matId: number
+  whId: number
+  rgId: number
+  pnId: number
+  storageOkQty: number
+  matRest: number
+  lotNo: string
+}
+
+// 查询盘点物料分页
+export const getStorageCheckMatPage = async (params) => {
+  return await request.get({ url: `/heli/storage-check-mat/page`, params })
+}
+
+// 查询盘点物料详情
+export const getStorageCheckMat = async (id: number) => {
+  return await request.get({ url: `/heli/storage-check-mat/get?id=` + id })
+}
+
+// 新增盘点物料
+export const createStorageCheckMat = async (data: StorageCheckMatVO) => {
+  return await request.post({ url: `/heli/storage-check-mat/create`, data })
+}
+
+// 修改盘点物料
+export const updateStorageCheckMat = async (data: StorageCheckMatVO) => {
+  return await request.put({ url: `/heli/storage-check-mat/update`, data })
+}
+
+// 删除盘点物料
+export const deleteStorageCheckMat = async (id: number) => {
+  return await request.delete({ url: `/heli/storage-check-mat/delete?id=` + id })
+}
+
+// 导出盘点物料 Excel
+export const exportStorageCheckMat = async (params) => {
+  return await request.download({ url: `/heli/storage-check-mat/export-excel`, params })
+}
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
new file mode 100644
index 00000000..2518bfd1
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
@@ -0,0 +1,183 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="盘点单号" prop="stockNo">
+        <el-input v-model="formData.stockNo" placeholder="请输入盘点单号" />
+      </el-form-item>
+      <el-form-item label="盘点类型：1部分盘点2整体盘点" prop="checkType">
+        <el-select v-model="formData.checkType" placeholder="请选择盘点类型：1部分盘点2整体盘点">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排除库存为0的物料：1是2否" prop="noZero">
+        <el-radio-group v-model="formData.noZero">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="description">
+        <Editor v-model="formData.description" height="150px" />
+      </el-form-item>
+      <el-form-item label="状态：1已保存；2已提交；3已删除" prop="status">
+        <el-select v-model="formData.status" placeholder="请选择状态：1已保存；2已提交；3已删除">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库Id，对应 wms_wh 表中的Id" prop="whId">
+        <el-input v-model="formData.whId" placeholder="请输入仓库Id，对应 wms_wh 表中的Id" />
+      </el-form-item>
+      <el-form-item label="入库人" prop="keeper">
+        <el-input v-model="formData.keeper" placeholder="请输入入库人" />
+      </el-form-item>
+      <el-form-item label="入库时间" prop="keeperTime">
+        <el-date-picker
+          v-model="formData.keeperTime"
+          type="date"
+          value-format="x"
+          placeholder="选择入库时间"
+        />
+      </el-form-item>
+      <el-form-item label="出库人" prop="outbound">
+        <el-input v-model="formData.outbound" placeholder="请输入出库人" />
+      </el-form-item>
+      <el-form-item label="出库时间" prop="outboundTime">
+        <el-date-picker
+          v-model="formData.outboundTime"
+          type="date"
+          value-format="x"
+          placeholder="选择出库时间"
+        />
+      </el-form-item>
+      <el-form-item label="作废人" prop="cancel">
+        <el-input v-model="formData.cancel" placeholder="请输入作废人" />
+      </el-form-item>
+      <el-form-item label="作废时间" prop="cancelTime">
+        <el-date-picker
+          v-model="formData.cancelTime"
+          type="date"
+          value-format="x"
+          placeholder="选择作废时间"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as StorageCheckApi from '@/api/heli/storagecheck'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  stockNo: undefined,
+  checkType: undefined,
+  noZero: undefined,
+  description: undefined,
+  status: undefined,
+  whId: undefined,
+  keeper: undefined,
+  keeperTime: undefined,
+  outbound: undefined,
+  outboundTime: undefined,
+  cancel: undefined,
+  cancelTime: undefined,
+})
+const formRules = reactive({
+  stockNo: [{ required: true, message: '盘点单号不能为空', trigger: 'blur' }],
+  whId: [{ required: true, message: '仓库Id，对应 wms_wh 表中的Id不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await StorageCheckApi.getStorageCheck(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as StorageCheckApi.StorageCheckVO
+    if (formType.value === 'create') {
+      await StorageCheckApi.createStorageCheck(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StorageCheckApi.updateStorageCheck(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    stockNo: undefined,
+    checkType: undefined,
+    noZero: undefined,
+    description: undefined,
+    status: undefined,
+    whId: undefined,
+    keeper: undefined,
+    keeperTime: undefined,
+    outbound: undefined,
+    outboundTime: undefined,
+    cancel: undefined,
+    cancelTime: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
new file mode 100644
index 00000000..bbd6a5ad
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
@@ -0,0 +1,404 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="主键id" prop="id">
+        <el-input
+          v-model="queryParams.id"
+          placeholder="请输入主键id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="盘点单号" prop="stockNo">
+        <el-input
+          v-model="queryParams.stockNo"
+          placeholder="请输入盘点单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="盘点类型：1部分盘点2整体盘点" prop="checkType">
+        <el-select
+          v-model="queryParams.checkType"
+          placeholder="请选择盘点类型：1部分盘点2整体盘点"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排除库存为0的物料：1是2否" prop="noZero">
+        <el-select
+          v-model="queryParams.noZero"
+          placeholder="请选择排除库存为0的物料：1是2否"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态：1已保存；2已提交；3已删除" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态：1已保存；2已提交；3已删除"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库Id，对应 wms_wh 表中的Id" prop="whId">
+        <el-input
+          v-model="queryParams.whId"
+          placeholder="请输入仓库Id，对应 wms_wh 表中的Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="记录的创建人,对应员工表中的 Id" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入记录的创建人,对应员工表中的 Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="记录的修改人,对应员工表中的 Id" prop="updater">
+        <el-input
+          v-model="queryParams.updater"
+          placeholder="请输入记录的修改人,对应员工表中的 Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-date-picker
+          v-model="queryParams.updateTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="入库人" prop="keeper">
+        <el-input
+          v-model="queryParams.keeper"
+          placeholder="请输入入库人"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="入库时间" prop="keeperTime">
+        <el-date-picker
+          v-model="queryParams.keeperTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="出库人" prop="outbound">
+        <el-input
+          v-model="queryParams.outbound"
+          placeholder="请输入出库人"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="出库时间" prop="outboundTime">
+        <el-date-picker
+          v-model="queryParams.outboundTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="作废人" prop="cancel">
+        <el-input
+          v-model="queryParams.cancel"
+          placeholder="请输入作废人"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="作废时间" prop="cancelTime">
+        <el-date-picker
+          v-model="queryParams.cancelTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['heli:storage-check:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['heli:storage-check:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="盘点单号" align="center" prop="stockNo" />
+      <el-table-column label="盘点类型：1部分盘点2整体盘点" align="center" prop="checkType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE" :value="scope.row.checkType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="排除库存为0的物料：1是2否" align="center" prop="noZero">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.noZero" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="description" />
+      <el-table-column label="状态：1已保存；2已提交；3已删除" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="仓库Id，对应 wms_wh 表中的Id" align="center" prop="whId" />
+      <el-table-column label="记录的创建人,对应员工表中的 Id" align="center" prop="creator" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="记录的修改人,对应员工表中的 Id" align="center" prop="updater" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="入库人" align="center" prop="keeper" />
+      <el-table-column
+        label="入库时间"
+        align="center"
+        prop="keeperTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="出库人" align="center" prop="outbound" />
+      <el-table-column
+        label="出库时间"
+        align="center"
+        prop="outboundTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="作废人" align="center" prop="cancel" />
+      <el-table-column
+        label="作废时间"
+        align="center"
+        prop="cancelTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:storage-check:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['heli:storage-check:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <StorageCheckForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as StorageCheckApi from '@/api/heli/storagecheck'
+import StorageCheckForm from './StorageCheckForm.vue'
+
+defineOptions({ name: 'StorageCheck' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  id: undefined,
+  stockNo: undefined,
+  checkType: undefined,
+  noZero: undefined,
+  description: undefined,
+  status: undefined,
+  whId: undefined,
+  creator: undefined,
+  createTime: [],
+  updater: undefined,
+  updateTime: [],
+  keeper: undefined,
+  keeperTime: [],
+  outbound: undefined,
+  outboundTime: [],
+  cancel: undefined,
+  cancelTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StorageCheckApi.getStorageCheckPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StorageCheckApi.deleteStorageCheck(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StorageCheckApi.exportStorageCheck(queryParams)
+    download.excel(data, '入/出库盘点.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheckmat/StorageCheckMatForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheckmat/StorageCheckMatForm.vue
new file mode 100644
index 00000000..4bf830b0
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheckmat/StorageCheckMatForm.vue
@@ -0,0 +1,128 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="盘点Id" prop="checkId">
+        <el-input v-model="formData.checkId" placeholder="请输入盘点Id" />
+      </el-form-item>
+      <el-form-item label="物料 Id,对应 base_material表中的 Id 列" prop="matId">
+        <el-input v-model="formData.matId" placeholder="请输入物料 Id,对应 base_material表中的 Id 列" />
+      </el-form-item>
+      <el-form-item label="仓库 Id，对应 wms_wh 表中的Id" prop="whId">
+        <el-input v-model="formData.whId" placeholder="请输入仓库 Id，对应 wms_wh 表中的Id" />
+      </el-form-item>
+      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="rgId">
+        <el-input v-model="formData.rgId" placeholder="请输入库区 Id，对应 wms_rg 表中的Id" />
+      </el-form-item>
+      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="pnId">
+        <el-input v-model="formData.pnId" placeholder="请输入库区 Id，对应 wms_rg 表中的Id" />
+      </el-form-item>
+      <el-form-item label="盘点数量" prop="storageOkQty">
+        <el-input v-model="formData.storageOkQty" placeholder="请输入盘点数量" />
+      </el-form-item>
+      <el-form-item label="物料当前库存数量" prop="matRest">
+        <el-input v-model="formData.matRest" placeholder="请输入物料当前库存数量" />
+      </el-form-item>
+      <el-form-item label="批次号" prop="lotNo">
+        <el-input v-model="formData.lotNo" placeholder="请输入批次号" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as StorageCheckMatApi from '@/api/heli/storagecheckmat'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  checkId: undefined,
+  matId: undefined,
+  whId: undefined,
+  rgId: undefined,
+  pnId: undefined,
+  storageOkQty: undefined,
+  matRest: undefined,
+  lotNo: undefined,
+})
+const formRules = reactive({
+  checkId: [{ required: true, message: '盘点Id不能为空', trigger: 'blur' }],
+  matId: [{ required: true, message: '物料 Id,对应 base_material表中的 Id 列不能为空', trigger: 'blur' }],
+  whId: [{ required: true, message: '仓库 Id，对应 wms_wh 表中的Id不能为空', trigger: 'blur' }],
+  rgId: [{ required: true, message: '库区 Id，对应 wms_rg 表中的Id不能为空', trigger: 'blur' }],
+  pnId: [{ required: true, message: '库区 Id，对应 wms_rg 表中的Id不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await StorageCheckMatApi.getStorageCheckMat(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as StorageCheckMatApi.StorageCheckMatVO
+    if (formType.value === 'create') {
+      await StorageCheckMatApi.createStorageCheckMat(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StorageCheckMatApi.updateStorageCheckMat(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    checkId: undefined,
+    matId: undefined,
+    whId: undefined,
+    rgId: undefined,
+    pnId: undefined,
+    storageOkQty: undefined,
+    matRest: undefined,
+    lotNo: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheckmat/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheckmat/index.vue
new file mode 100644
index 00000000..e1683648
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheckmat/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="主键id" prop="id">
+        <el-input
+          v-model="queryParams.id"
+          placeholder="请输入主键id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="盘点Id" prop="checkId">
+        <el-input
+          v-model="queryParams.checkId"
+          placeholder="请输入盘点Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="物料 Id,对应 base_material表中的 Id 列" prop="matId">
+        <el-input
+          v-model="queryParams.matId"
+          placeholder="请输入物料 Id,对应 base_material表中的 Id 列"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="仓库 Id，对应 wms_wh 表中的Id" prop="whId">
+        <el-input
+          v-model="queryParams.whId"
+          placeholder="请输入仓库 Id，对应 wms_wh 表中的Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="rgId">
+        <el-input
+          v-model="queryParams.rgId"
+          placeholder="请输入库区 Id，对应 wms_rg 表中的Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="pnId">
+        <el-input
+          v-model="queryParams.pnId"
+          placeholder="请输入库区 Id，对应 wms_rg 表中的Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="盘点数量" prop="storageOkQty">
+        <el-input
+          v-model="queryParams.storageOkQty"
+          placeholder="请输入盘点数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="物料当前库存数量" prop="matRest">
+        <el-input
+          v-model="queryParams.matRest"
+          placeholder="请输入物料当前库存数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="批次号" prop="lotNo">
+        <el-input
+          v-model="queryParams.lotNo"
+          placeholder="请输入批次号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="记录的创建人,对应员工表中的 Id" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入记录的创建人,对应员工表中的 Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="记录的修改人,对应员工表中的 Id" prop="updater">
+        <el-input
+          v-model="queryParams.updater"
+          placeholder="请输入记录的修改人,对应员工表中的 Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-date-picker
+          v-model="queryParams.updateTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['heli:storage-check-mat:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['heli:storage-check-mat:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="盘点Id" align="center" prop="checkId" />
+      <el-table-column label="物料 Id,对应 base_material表中的 Id 列" align="center" prop="matId" />
+      <el-table-column label="仓库 Id，对应 wms_wh 表中的Id" align="center" prop="whId" />
+      <el-table-column label="库区 Id，对应 wms_rg 表中的Id" align="center" prop="rgId" />
+      <el-table-column label="库区 Id，对应 wms_rg 表中的Id" align="center" prop="pnId" />
+      <el-table-column label="盘点数量" align="center" prop="storageOkQty" />
+      <el-table-column label="物料当前库存数量" align="center" prop="matRest" />
+      <el-table-column label="批次号" align="center" prop="lotNo" />
+      <el-table-column label="记录的创建人,对应员工表中的 Id" align="center" prop="creator" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="记录的修改人,对应员工表中的 Id" align="center" prop="updater" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:storage-check-mat:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['heli:storage-check-mat:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <StorageCheckMatForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as StorageCheckMatApi from '@/api/heli/storagecheckmat'
+import StorageCheckMatForm from './StorageCheckMatForm.vue'
+
+defineOptions({ name: 'StorageCheckMat' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  id: undefined,
+  checkId: undefined,
+  matId: undefined,
+  whId: undefined,
+  rgId: undefined,
+  pnId: undefined,
+  storageOkQty: undefined,
+  matRest: undefined,
+  lotNo: undefined,
+  creator: undefined,
+  createTime: [],
+  updater: undefined,
+  updateTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StorageCheckMatApi.getStorageCheckMatPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StorageCheckMatApi.deleteStorageCheckMat(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StorageCheckMatApi.exportStorageCheckMat(queryParams)
+    download.excel(data, '盘点物料.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file

From 701c51173a2ec0d5db0d29573b1db3835e200a2c Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sun, 28 Jan 2024 21:50:19 +0800
Subject: [PATCH 27/64] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存盘点
---
 .../yunxi/mes/module/heli/enums/CodeEnum.java |   1 +
 .../storagecheck/vo/StorageCheckRespVO.java   |   5 +
 .../vo/StorageCheckSaveReqVO.java             | 114 +++----
 .../storagecheck/StorageCheckDO.java          |   2 +
 .../storagecheck/StorageCheckServiceImpl.java | 155 ++++-----
 .../src/api/heli/storagecheck/index.ts        |  95 +++---
 mes-ui/mes-ui-admin-vue3/src/utils/dict.ts    |   2 +
 .../heli/storagecheck/StorageCheckForm.vue    | 131 +++-----
 .../src/views/heli/storagecheck/index.vue     | 309 +++---------------
 9 files changed, 296 insertions(+), 518 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java
index 83269644..ffb1b6fb 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java
@@ -40,6 +40,7 @@ public enum CodeEnum {
     WAREHOUSE("仓库", "Wa", 4),
     STOCK_IN("入库单", "WI", 4, "yyyyMMdd"),
     STOCK_OUT("出库单", "WO", 4, "yyyyMMdd"),
+    STOCK_CHECK("盘点单据", "WC", 4, "yyyyMMdd"),
     PROJECT_ORDER("业务订单", 3, "yyyyMM"),
     PROJECT_DELIVERY_ORDER("发货单", "HL", 3, "yyyyMM"),
     ;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java
index 72027852..96a8a5ec 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java
@@ -86,4 +86,9 @@ public class StorageCheckRespVO {
     @ExcelProperty("作废时间")
     private LocalDateTime cancelTime;
 
+    @Schema(description = "盘点单据时间")
+    @ExcelProperty("盘点单据时间")
+    private LocalDateTime checkTime;
+
+
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java
index 2ed796cc..8c67e0f9 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java
@@ -1,56 +1,58 @@
-package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 入/出库盘点新增/修改 Request VO")
-@Data
-public class StorageCheckSaveReqVO {
-
-    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long id;
-
-    @Schema(description = "盘点单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "盘点单号不能为空")
-    private String stockNo;
-
-    @Schema(description = "盘点类型：1部分盘点2整体盘点")
-    private Integer checkType;
-
-    @Schema(description = "排除库存为0的物料：1是2否")
-    private Integer noZero;
-
-    @Schema(description = "备注")
-    private String description;
-
-    @Schema(description = "状态：1已保存；2已提交；3已删除")
-    private Integer status;
-
-    @Schema(description = "仓库Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "仓库Id，对应 wms_wh 表中的Id不能为空")
-    private Long whId;
-
-    @Schema(description = "入库人")
-    private Long keeper;
-
-    @Schema(description = "入库时间")
-    private LocalDateTime keeperTime;
-
-    @Schema(description = "出库人")
-    private Long outbound;
-
-    @Schema(description = "出库时间")
-    private LocalDateTime outboundTime;
-
-    @Schema(description = "作废人")
-    private Long cancel;
-
-    @Schema(description = "作废时间")
-    private LocalDateTime cancelTime;
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 入/出库盘点新增/修改 Request VO")
+@Data
+public class StorageCheckSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    @Schema(description = "盘点单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String stockNo;
+
+    @Schema(description = "盘点类型：1部分盘点2整体盘点")
+    private Integer checkType;
+
+    @Schema(description = "盘点开始时间")
+    private LocalDateTime checkTime;
+
+    @Schema(description = "排除库存为0的物料：1是2否")
+    private Integer noZero;
+
+    @Schema(description = "备注")
+    private String description;
+
+    @Schema(description = "状态：1已保存；2已提交；3已删除")
+    private Integer status;
+
+    @Schema(description = "仓库Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "仓库Id，对应 wms_wh 表中的Id不能为空")
+    private Long whId;
+
+    @Schema(description = "入库人")
+    private Long keeper;
+
+    @Schema(description = "入库时间")
+    private LocalDateTime keeperTime;
+
+    @Schema(description = "出库人")
+    private Long outbound;
+
+    @Schema(description = "出库时间")
+    private LocalDateTime outboundTime;
+
+    @Schema(description = "作废人")
+    private Long cancel;
+
+    @Schema(description = "作废时间")
+    private LocalDateTime cancelTime;
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java
index cc341263..f4da222f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java
@@ -85,4 +85,6 @@ public class StorageCheckDO extends BaseDO {
      */
     private LocalDateTime cancelTime;
 
+    private LocalDateTime checkTime;
+
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
index 5ab69dda..192e32ce 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
@@ -1,74 +1,81 @@
-package com.chanko.yunxi.mes.module.heli.service.storagecheck;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-
-import com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheck.StorageCheckMapper;
-
-import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
-
-/**
- * 入/出库盘点 Service 实现类
- *
- * @author 管理员
- */
-@Service
-@Validated
-public class StorageCheckServiceImpl implements StorageCheckService {
-
-    @Resource
-    private StorageCheckMapper storageCheckMapper;
-
-    @Override
-    public Long createStorageCheck(StorageCheckSaveReqVO createReqVO) {
-        // 插入
-        StorageCheckDO storageCheck = BeanUtils.toBean(createReqVO, StorageCheckDO.class);
-        storageCheckMapper.insert(storageCheck);
-        // 返回
-        return storageCheck.getId();
-    }
-
-    @Override
-    public void updateStorageCheck(StorageCheckSaveReqVO updateReqVO) {
-        // 校验存在
-        validateStorageCheckExists(updateReqVO.getId());
-        // 更新
-        StorageCheckDO updateObj = BeanUtils.toBean(updateReqVO, StorageCheckDO.class);
-        storageCheckMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteStorageCheck(Long id) {
-        // 校验存在
-        validateStorageCheckExists(id);
-        // 删除
-        storageCheckMapper.deleteById(id);
-    }
-
-    private void validateStorageCheckExists(Long id) {
-        if (storageCheckMapper.selectById(id) == null) {
-            throw exception(STORAGE_CHECK_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public StorageCheckDO getStorageCheck(Long id) {
-        return storageCheckMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<StorageCheckDO> getStorageCheckPage(StorageCheckPageReqVO pageReqVO) {
-        return storageCheckMapper.selectPage(pageReqVO);
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.storagecheck;
+
+import cn.hutool.core.lang.UUID;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheck.StorageCheckMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.STOCK_CHECK;
+import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.STOCK_IN;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 入/出库盘点 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class StorageCheckServiceImpl implements StorageCheckService {
+
+    @Resource
+    private StorageCheckMapper storageCheckMapper;
+
+    @Override
+    public Long createStorageCheck(StorageCheckSaveReqVO createReqVO) {
+        // 插入
+        StorageCheckDO storageCheck = BeanUtils.toBean(createReqVO, StorageCheckDO.class);
+        storageCheck.setStockNo(UUID.fastUUID().toString(true));
+        storageCheckMapper.insert(storageCheck);
+
+        storageCheck.setStockNo(STOCK_CHECK.getCode(storageCheck.getId().toString()));
+        storageCheckMapper.updateById(storageCheck);
+        // 返回
+        return storageCheck.getId();
+    }
+
+    @Override
+    public void updateStorageCheck(StorageCheckSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStorageCheckExists(updateReqVO.getId());
+        // 更新
+        StorageCheckDO updateObj = BeanUtils.toBean(updateReqVO, StorageCheckDO.class);
+        storageCheckMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteStorageCheck(Long id) {
+        // 校验存在
+        validateStorageCheckExists(id);
+        // 删除
+        storageCheckMapper.deleteById(id);
+    }
+
+    private void validateStorageCheckExists(Long id) {
+        if (storageCheckMapper.selectById(id) == null) {
+            throw exception(STORAGE_CHECK_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public StorageCheckDO getStorageCheck(Long id) {
+        return storageCheckMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<StorageCheckDO> getStorageCheckPage(StorageCheckPageReqVO pageReqVO) {
+        return storageCheckMapper.selectPage(pageReqVO);
+    }
+
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts
index 6eec5658..1a596650 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts
@@ -1,47 +1,48 @@
-import request from '@/config/axios'
-
-export interface StorageCheckVO {
-  id: number
-  stockNo: string
-  checkType: number
-  noZero: number
-  description: string
-  status: number
-  whId: number
-  keeper: number
-  keeperTime: Date
-  outbound: number
-  outboundTime: Date
-  cancel: number
-  cancelTime: Date
-}
-
-// 查询入/出库盘点分页
-export const getStorageCheckPage = async (params) => {
-  return await request.get({ url: `/heli/storage-check/page`, params })
-}
-
-// 查询入/出库盘点详情
-export const getStorageCheck = async (id: number) => {
-  return await request.get({ url: `/heli/storage-check/get?id=` + id })
-}
-
-// 新增入/出库盘点
-export const createStorageCheck = async (data: StorageCheckVO) => {
-  return await request.post({ url: `/heli/storage-check/create`, data })
-}
-
-// 修改入/出库盘点
-export const updateStorageCheck = async (data: StorageCheckVO) => {
-  return await request.put({ url: `/heli/storage-check/update`, data })
-}
-
-// 删除入/出库盘点
-export const deleteStorageCheck = async (id: number) => {
-  return await request.delete({ url: `/heli/storage-check/delete?id=` + id })
-}
-
-// 导出入/出库盘点 Excel
-export const exportStorageCheck = async (params) => {
-  return await request.download({ url: `/heli/storage-check/export-excel`, params })
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+export interface StorageCheckVO {
+  id: number
+  stockNo: string
+  checkType: number
+  checkTime: Date
+  noZero: number
+  description: string
+  status: number
+  whId: number
+  keeper: number
+  keeperTime: Date
+  outbound: number
+  outboundTime: Date
+  cancel: number
+  cancelTime: Date
+}
+
+// 查询入/出库盘点分页
+export const getStorageCheckPage = async (params) => {
+  return await request.get({ url: `/heli/storage-check/page`, params })
+}
+
+// 查询入/出库盘点详情
+export const getStorageCheck = async (id: number) => {
+  return await request.get({ url: `/heli/storage-check/get?id=` + id })
+}
+
+// 新增入/出库盘点
+export const createStorageCheck = async (data: StorageCheckVO) => {
+  return await request.post({ url: `/heli/storage-check/create`, data })
+}
+
+// 修改入/出库盘点
+export const updateStorageCheck = async (data: StorageCheckVO) => {
+  return await request.put({ url: `/heli/storage-check/update`, data })
+}
+
+// 删除入/出库盘点
+export const deleteStorageCheck = async (id: number) => {
+  return await request.delete({ url: `/heli/storage-check/delete?id=` + id })
+}
+
+// 导出入/出库盘点 Excel
+export const exportStorageCheck = async (params) => {
+  return await request.download({ url: `/heli/storage-check/export-excel`, params })
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
index 6eb36029..3a981dc0 100644
--- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
@@ -224,6 +224,8 @@ export enum DICT_TYPE {
   HELI_STORAGE_OUT_TYPE = 'heli_storage_out_type',//出库类型
   HELI_STORAGE_STATUS = 'heli_storage_status',//入库出库状态
   HELI_STORAGE_TYPE = 'heli_storage_type', // 入库类型
+  HELI_STORAGE_MAT_CHECK_TYPE = 'heli_storage_mat_check_type',//盘点类型
+  HELI_STORAGE_MAT_CHECK_STATUS = 'heli_storage_mat_check_status',//盘点状态
 
   HELI_PROJECT_ORDER_STATUS = 'heli_project_order_status', //项目订单状态
   HELI_DELIVERY_STATUS = 'heli_delivery_status', // 发货状态
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
index 2518bfd1..300758e6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
@@ -1,84 +1,42 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="盘点单号" prop="stockNo">
-        <el-input v-model="formData.stockNo" placeholder="请输入盘点单号" />
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="200px" v-loading="formLoading">
+      <el-form-item label="盘点单号" prop="stockNo"  class="!w-800px">
+        <el-input v-model="formData.stockNo" placeholder="系统自动生成" disabled/>
       </el-form-item>
-      <el-form-item label="盘点类型：1部分盘点2整体盘点" prop="checkType">
-        <el-select v-model="formData.checkType" placeholder="请选择盘点类型：1部分盘点2整体盘点">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+      <el-form-item label="单据状态" prop="status"  >
+        <el-select v-model="formData.status" placeholder="单据状态" disabled class="!w-600px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="排除库存为0的物料：1是2否" prop="noZero">
+      <el-form-item label="盘点类型" prop="checkType"  class="!w-800px">
+        <el-select v-model="formData.checkType" placeholder="盘点类型" class="!w-700px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排除库存为0的物料?" prop="noZero"  >
         <el-radio-group v-model="formData.noZero">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
-            :key="dict.value"
-            :label="dict.value"
-          >
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value"
+            :label="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="备注" prop="description">
-        <Editor v-model="formData.description" height="150px" />
-      </el-form-item>
-      <el-form-item label="状态：1已保存；2已提交；3已删除" prop="status">
-        <el-select v-model="formData.status" placeholder="请选择状态：1已保存；2已提交；3已删除">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+
+
+      <el-form-item label="盘点仓库" prop="whId"  >
+        <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-600px" >
+          <el-option v-for="dict in whList" :key="dict.id" :label="dict.wh_name"
+            :value="dict.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库Id，对应 wms_wh 表中的Id" prop="whId">
-        <el-input v-model="formData.whId" placeholder="请输入仓库Id，对应 wms_wh 表中的Id" />
-      </el-form-item>
-      <el-form-item label="入库人" prop="keeper">
-        <el-input v-model="formData.keeper" placeholder="请输入入库人" />
-      </el-form-item>
-      <el-form-item label="入库时间" prop="keeperTime">
-        <el-date-picker
-          v-model="formData.keeperTime"
-          type="date"
-          value-format="x"
-          placeholder="选择入库时间"
-        />
+      <el-form-item label="盘点开始时间" prop="checkTime"  class="!w-800px">
+        <el-date-picker v-model="formData.checkTime" type="date" value-format="x" placeholder="盘点开始时间" class="!w-700px" />
       </el-form-item>
-      <el-form-item label="出库人" prop="outbound">
-        <el-input v-model="formData.outbound" placeholder="请输入出库人" />
-      </el-form-item>
-      <el-form-item label="出库时间" prop="outboundTime">
-        <el-date-picker
-          v-model="formData.outboundTime"
-          type="date"
-          value-format="x"
-          placeholder="选择出库时间"
-        />
-      </el-form-item>
-      <el-form-item label="作废人" prop="cancel">
-        <el-input v-model="formData.cancel" placeholder="请输入作废人" />
-      </el-form-item>
-      <el-form-item label="作废时间" prop="cancelTime">
-        <el-date-picker
-          v-model="formData.cancelTime"
-          type="date"
-          value-format="x"
-          placeholder="选择作废时间"
-        />
+      <el-form-item label="备注" prop="description"  class="!w-800px">
+        <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -91,6 +49,8 @@
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as StorageCheckApi from '@/api/heli/storagecheck'
 
+import * as WarehouseApi from '@/api/heli/warehouse'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -102,29 +62,35 @@ const formData = ref({
   id: undefined,
   stockNo: undefined,
   checkType: undefined,
-  noZero: undefined,
+  checkTime: undefined,
+  noZero: 1,
   description: undefined,
   status: undefined,
   whId: undefined,
-  keeper: undefined,
-  keeperTime: undefined,
-  outbound: undefined,
-  outboundTime: undefined,
-  cancel: undefined,
-  cancelTime: undefined,
 })
 const formRules = reactive({
-  stockNo: [{ required: true, message: '盘点单号不能为空', trigger: 'blur' }],
-  whId: [{ required: true, message: '仓库Id，对应 wms_wh 表中的Id不能为空', trigger: 'blur' }],
+  //stockNo: [{ required: true, message: '盘点单号不能为空', trigger: 'blur' }],
+  whId: [{ required: true, message: '盘点仓库不能为空', trigger: 'blur' }],
+  checkType: [{ required: true, message: '盘点类型不能为空', trigger: 'blur' }],
+  checkTime: [{ required: true, message: '盘点开始时间不能为空', trigger: 'blur' }],
+  noZero: [{ required: true, message: '排除库存为0的物料不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
+
+const whList = ref([])
+//仓库列表
+const init_page_wh = (async ()=>{
+  whList.value = await WarehouseApi.getSimpList()
+})
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+
+  await init_page_wh()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -145,7 +111,9 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    
     const data = formData.value as unknown as StorageCheckApi.StorageCheckVO
+    data.status = 1
     if (formType.value === 'create') {
       await StorageCheckApi.createStorageCheck(data)
       message.success(t('common.createSuccess'))
@@ -167,16 +135,11 @@ const resetForm = () => {
     id: undefined,
     stockNo: undefined,
     checkType: undefined,
-    noZero: undefined,
+    checkTime: undefined,
+    noZero: 1,
     description: undefined,
     status: undefined,
     whId: undefined,
-    keeper: undefined,
-    keeperTime: undefined,
-    outbound: undefined,
-    outboundTime: undefined,
-    cancel: undefined,
-    cancelTime: undefined,
   }
   formRef.value?.resetFields()
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
index bbd6a5ad..7e9feee5 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
@@ -1,204 +1,39 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="主键id" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入主键id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="盘点单号" prop="stockNo">
-        <el-input
-          v-model="queryParams.stockNo"
-          placeholder="请输入盘点单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.stockNo" placeholder="盘点单号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="盘点类型：1部分盘点2整体盘点" prop="checkType">
-        <el-select
-          v-model="queryParams.checkType"
-          placeholder="请选择盘点类型：1部分盘点2整体盘点"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="盘点仓库" prop="whId">
+        <el-input v-model="queryParams.whId" placeholder="盘点仓库" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
-      <el-form-item label="排除库存为0的物料：1是2否" prop="noZero">
-        <el-select
-          v-model="queryParams.noZero"
-          placeholder="请选择排除库存为0的物料：1是2否"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+      <el-form-item label="盘点类型" prop="checkType">
+        <el-select v-model="queryParams.checkType" placeholder="盘点类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态：1已保存；2已提交；3已删除" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态：1已保存；2已提交；3已删除"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="单据状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库Id，对应 wms_wh 表中的Id" prop="whId">
-        <el-input
-          v-model="queryParams.whId"
-          placeholder="请输入仓库Id，对应 wms_wh 表中的Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="记录的创建人,对应员工表中的 Id" prop="creator">
-        <el-input
-          v-model="queryParams.creator"
-          placeholder="请输入记录的创建人,对应员工表中的 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="记录的修改人,对应员工表中的 Id" prop="updater">
-        <el-input
-          v-model="queryParams.updater"
-          placeholder="请输入记录的修改人,对应员工表中的 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
-        <el-date-picker
-          v-model="queryParams.updateTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="入库人" prop="keeper">
-        <el-input
-          v-model="queryParams.keeper"
-          placeholder="请输入入库人"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="入库时间" prop="keeperTime">
-        <el-date-picker
-          v-model="queryParams.keeperTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="出库人" prop="outbound">
-        <el-input
-          v-model="queryParams.outbound"
-          placeholder="请输入出库人"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="出库时间" prop="outboundTime">
-        <el-date-picker
-          v-model="queryParams.outboundTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="作废人" prop="cancel">
-        <el-input
-          v-model="queryParams.cancel"
-          placeholder="请输入作废人"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="作废时间" prop="cancelTime">
-        <el-date-picker
-          v-model="queryParams.cancelTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
+      <el-form-item label="盘点开始时间" prop="checkTime">
+        <el-date-picker v-model="queryParams.checkTime" value-format="YYYY-MM-DD" type="date" class="!w-240px" />
       </el-form-item>
+
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['heli:storage-check:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['heli:storage-check:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['heli:storage-check:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
       </el-form-item>
     </el-form>
@@ -207,93 +42,47 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键id" align="center" prop="id" />
       <el-table-column label="盘点单号" align="center" prop="stockNo" />
-      <el-table-column label="盘点类型：1部分盘点2整体盘点" align="center" prop="checkType">
+      <el-table-column label="盘点类型" align="center" prop="checkType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE" :value="scope.row.checkType" />
         </template>
       </el-table-column>
-      <el-table-column label="排除库存为0的物料：1是2否" align="center" prop="noZero">
+      <el-table-column label="盘点仓库" align="center" prop="whId">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.noZero" />
+          {{ whList.find((tag) => tag.id === scope.row.whId)?.wh_name }}
+        </template>
+      </el-table-column>
+      <el-table-column label="盘点开始时间" align="center" prop="checkTime"  width="180px">
+        <template #default="scope">
+          <span>{{ formatDate(scope.row.checkTime, 'YYYY-MM-DD') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column label="状态：1已保存；2已提交；3已删除" align="center" prop="status">
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
+      <el-table-column label="提交人" align="center" prop="keeper" />
+      <el-table-column label="提交时间" align="center" prop="keeperTime" :formatter="dateFormatter" width="180px" />
+      <el-table-column label="单据状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="仓库Id，对应 wms_wh 表中的Id" align="center" prop="whId" />
-      <el-table-column label="记录的创建人,对应员工表中的 Id" align="center" prop="creator" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="记录的修改人,对应员工表中的 Id" align="center" prop="updater" />
-      <el-table-column
-        label="更新时间"
-        align="center"
-        prop="updateTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="入库人" align="center" prop="keeper" />
-      <el-table-column
-        label="入库时间"
-        align="center"
-        prop="keeperTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="出库人" align="center" prop="outbound" />
-      <el-table-column
-        label="出库时间"
-        align="center"
-        prop="outboundTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="作废人" align="center" prop="cancel" />
-      <el-table-column
-        label="作废时间"
-        align="center"
-        prop="cancelTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['heli:storage-check:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:storage-check:update']">
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['heli:storage-check:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['heli:storage-check:delete']">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -302,10 +91,11 @@
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as StorageCheckApi from '@/api/heli/storagecheck'
 import StorageCheckForm from './StorageCheckForm.vue'
+import * as WarehouseApi from '@/api/heli/warehouse'
 
 defineOptions({ name: 'StorageCheck' })
 
@@ -338,7 +128,11 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-
+const whList = ref([])
+//仓库列表
+const init_page_wh = (async () => {
+  whList.value = await WarehouseApi.getSimpList()
+})
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -379,7 +173,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */
@@ -398,7 +192,8 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+  await init_page_wh()
+  await getList()
 })
 </script>
\ No newline at end of file

From 1025d2ef8facb2cf4cd20a04035b0c98cce2597b Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 29 Jan 2024 09:43:50 +0800
Subject: [PATCH 28/64] =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/projectorder/detail.vue            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 3764b68e..ee87fecd 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -530,7 +530,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="设备型号" min-width="150">
+                  <el-table-column label="设备型号" min-width="150" align="center">
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.deviceModel`"
@@ -545,7 +545,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column min-width="150">
+                  <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>数量 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
@@ -554,6 +554,7 @@
                         class="mb-0px!"
                       >
                         <el-input-number
+                          style="width: 100%"
                           :disabled="detailDisabled"
                           v-model="row.amount"
                           placeholder="请输入数量"
@@ -564,7 +565,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column min-width="150">
+                  <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>单位 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
@@ -588,7 +589,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column min-width="150">
+                  <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>材质 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
@@ -619,7 +620,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="备注" min-width="150">
+                  <el-table-column label="备注" min-width="150" align="center">
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.remark`"

From a9af2971e9ab9775826b8802155eb57535f83088 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 29 Jan 2024 09:45:35 +0800
Subject: [PATCH 29/64] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=20=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss  |   2 +-
 .../views/heli/hlvuestyle/publicDetail.vue    | 195 ++++++++++++++++++
 .../views/heli/hlvuestyle/warehouseFrom.vue   | 125 ++++++-----
 3 files changed, 254 insertions(+), 68 deletions(-)
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue

diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index de533acf..a7dc20bd 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -114,7 +114,7 @@
 }
 .hl-incard {
   box-shadow: none !important;
-  margin-bottom: 20px;
+  margin: 20px 0;
   padding: 0 20px;
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue
new file mode 100644
index 00000000..396d1da7
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue
@@ -0,0 +1,195 @@
+<template>
+  <el-card class="hl-card">
+    <template #header>
+      <span><span v-html="dialogTitle"></span>页</span>
+    </template>
+    <el-form label-width="120px" :model="formData" v-loading="formLoading">
+      <!-- 基础信息  3列 竖列布局 -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
+        </template>
+        <el-row>
+          <el-col :span="6">
+            <el-row>
+              <el-col>
+                <el-form-item label="项目名称" prop="name">
+                  {{ formData.name }}
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="项目编号" prop="code">
+                  <el-input
+                    disabled
+                    v-model="formData.code"
+                    class="!w-250px"
+                    placeholder="系统自动生成"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="6">
+            <el-row>
+              <el-col>
+                <el-form-item label="项目名称" prop="name">
+                  {{ formData.name }}
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="项目编号" prop="code">
+                  <el-input
+                    disabled
+                    v-model="formData.code"
+                    class="!w-250px"
+                    placeholder="系统自动生成"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="6">
+            <el-row>
+              <el-col>
+                <el-form-item label="项目名称" prop="name">
+                  {{ formData.name }}
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="项目编号" prop="code">
+                  <el-input
+                    disabled
+                    v-model="formData.code"
+                    class="!w-250px"
+                    placeholder="系统自动生成"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="6">
+            <el-row>
+              <el-col>
+                <el-form-item label="项目名称" prop="name">
+                  {{ formData.name }}
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="项目编号" prop="code">
+                  <el-input
+                    disabled
+                    v-model="formData.code"
+                    class="!w-250px"
+                    placeholder="系统自动生成"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+      </el-card>
+      <!-- 表格类信息 -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">表格类信息</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-table :data="formData.tablelist" class="hl-table">
+                <el-table-column label="序号" type="index" width="80" fixed />
+                <el-table-column label="名" prop="listname" />
+                <el-table-column label="码" prop="listcode" />
+
+                <el-table-column label="操作" align="center" width="240" fixed="right">
+                  <template #default="scope">
+                    <el-button
+                      link
+                      type="danger"
+                      size="small"
+                      @click.prevent="onDeleteItem(scope.$index)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+      <!-- 附件类信息 -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-table :data="formData.attachments" class="hl-table">
+                <el-table-column prop="name" label="文件名称" align="center" />
+                <el-table-column prop="businessFileType" label="文件类型" align="center">
+                  <template #default="scope">
+                    {{
+                      getDictLabel(DICT_TYPE.HELI_BUSINESS_FILE_TYPE, scope.row.businessFileType)
+                    }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="createTime"
+                  align="center"
+                  label="上传时间"
+                  :formatter="dateFormatter"
+                />
+                <el-table-column label="操作" align="center">
+                  <template #default="scope">
+                    <el-button
+                      link
+                      type="danger"
+                      size="small"
+                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
+                    >
+                      删除
+                    </el-button>
+                    <el-button
+                      v-if="!!scope.row.id"
+                      link
+                      type="primary"
+                      size="small"
+                      @click="downloadAttachment(scope.row.name, scope.row.url)"
+                    >
+                      下载
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-form>
+  </el-card>
+</template>
+<script setup lang="ts">
+// import {ref,reactive} from 'vue';
+const dialogTitle = ref('公共详情')
+const formData = ref({
+  name: 123,
+  code: undefined,
+  tablelist: [
+    {
+      listname: '123',
+      listcode: '123'
+    },
+    {
+      listname: '123',
+      listcode: '123'
+    }
+  ],
+  attachments: []
+})
+const onDeleteItem = (index) => {
+  formData.value.tablelist.splice(index, 1)
+}
+</script>
+<style scoped lang="less"></style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue
index f36c2633..e1c4d9fc 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 公共详情  -->
   <el-card class="hl-card">
     <template #header>
       <span>编辑页</span>
@@ -10,79 +11,69 @@
       label-width="100px"
       v-loading="formLoading"
     >
+      <!-- 基础信息 横向布局 -->
       <el-card class="hl-card-info">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
         </template>
         <el-row>
-          <el-col :span="8">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="level" label="入库类型">
-                  <el-select v-model="formData.level" clearable style="width: 100%">
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_CUSTOMER_LEVEL)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="name" label="入库单号" required>
-                  <el-input v-model="formData.name" disabled />
-                </el-form-item>
-              </el-col>
-            </el-row>
+          <el-col :span="6">
+            <el-form-item prop="level" label="类型">
+              <el-select v-model="formData.level" clearable style="width: 100%">
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.HELI_CUSTOMER_LEVEL)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="code" label="上游单号">
-                  <el-input v-model="formData.code" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="name" label="单号日期" required>
-                  <el-input v-model="formData.name" disabled />
-                </el-form-item>
-              </el-col>
-            </el-row>
+          <el-col :span="6">
+            <el-form-item prop="code" label="单号">
+              <el-input v-model="formData.code" />
+            </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="level" label="入库仓库">
-                  <el-select v-model="formData.level" clearable style="width: 100%">
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_CUSTOMER_LEVEL)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row>
-              <el-col :span="24">
-                <el-form-item prop="industry" label="单据状态">
-                  <el-input v-model="formData.industry" disabled />
-                </el-form-item>
-              </el-col>
-            </el-row>
+          <el-col :span="6">
+            <el-form-item prop="code" label="单号">
+              <el-input v-model="formData.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="code" label="单号">
+              <el-input v-model="formData.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="code" label="编码">
+              <el-input v-model="formData.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="code" label="编码">
+              <el-input v-model="formData.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="code" label="编码">
+              <el-input v-model="formData.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="code" label="编码">
+              <el-input v-model="formData.code" />
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="备注" prop="description">
-              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200"/>
+              <el-input
+                type="textarea"
+                v-model="formData.description"
+                show-word-limit
+                maxlength="200"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -90,7 +81,7 @@
 
       <el-card class="hl-card-info">
         <template #header>
-          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物料信息</span>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">表格信息</span>
         </template>
         <el-row>
           <el-col>
@@ -509,14 +500,14 @@ const handleBeforeUpload = (file: File) => {
   // 如果需要阻止默认上传行为，可以返回 false
   // return false;
 
-    // 创建新的文件对象并添加到 filelist 中
+  // 创建新的文件对象并添加到 filelist 中
   const newFile: any = {
     name: '',
     url: '', // 这里可以是实际上传后的URL，根据实际情况填写
-    uploadTimestamp: uploadTimestamp!,
-  };
+    uploadTimestamp: uploadTimestamp!
+  }
 
-  fileList.value.push(newFile);
+  fileList.value.push(newFile)
 }
 
 const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {

From 7f657e725373eee795c4159f4b8f59c699434779 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 09:57:48 +0800
Subject: [PATCH 30/64] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E3=80=91=E5=8F=91=E8=B4=A7=E5=8D=95=20=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/enums/OperateTypeEnum.java           |   4 +
 .../heli/enums/BusinessFileTypeEnum.java      |   3 +-
 .../deliverorder/DeliverOrderController.java  | 244 +++++++++--------
 .../vo/DeliverOrderSaveReqVO.java             |   7 +
 .../deliverorder/DeliverOrderDO.java          |   5 +
 .../deliverorder/DeliverOrderMapper.java      |  17 ++
 .../deliverorder/DeliverOrderService.java     | 133 ++++-----
 .../deliverorder/DeliverOrderServiceImpl.java | 257 ++++++++++--------
 8 files changed, 385 insertions(+), 285 deletions(-)

diff --git a/mes-framework/mes-spring-boot-starter-biz-operatelog/src/main/java/com/chanko/yunxi/mes/framework/operatelog/core/enums/OperateTypeEnum.java b/mes-framework/mes-spring-boot-starter-biz-operatelog/src/main/java/com/chanko/yunxi/mes/framework/operatelog/core/enums/OperateTypeEnum.java
index 70198a87..0f8a4259 100644
--- a/mes-framework/mes-spring-boot-starter-biz-operatelog/src/main/java/com/chanko/yunxi/mes/framework/operatelog/core/enums/OperateTypeEnum.java
+++ b/mes-framework/mes-spring-boot-starter-biz-operatelog/src/main/java/com/chanko/yunxi/mes/framework/operatelog/core/enums/OperateTypeEnum.java
@@ -68,6 +68,10 @@ public enum OperateTypeEnum {
     * 终止
     * */
     TERMINATE(13),
+    /*
+    * 发货
+    * */
+    DELIVER(14),
     /**
      * 其它
      *
diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinessFileTypeEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinessFileTypeEnum.java
index f210c61b..afb5f29f 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinessFileTypeEnum.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinessFileTypeEnum.java
@@ -11,7 +11,8 @@ import lombok.Getter;
 public enum BusinessFileTypeEnum {
 
     CONTRACT("合同"),
-    TECHNOLOGY_PROTOCOL("技术协议");
+    TECHNOLOGY_PROTOCOL("技术协议"),
+    ID_CARD("身份证照片");
 
     private String description;
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
index 4b0d5574..e55067df 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
@@ -1,106 +1,138 @@
-package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
-
-import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
-
-import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
-import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
-import com.chanko.yunxi.mes.module.heli.service.deliverorder.DeliverOrderService;
-
-@Tag(name = "管理后台 - 发货订单")
-@RestController
-@RequestMapping("/heli/deliver-order")
-@Validated
-public class DeliverOrderController {
-
-    @Resource
-    private DeliverOrderService deliverOrderService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建发货订单")
-    @PreAuthorize("@ss.hasPermission('heli:deliver-order:create')")
-    public CommonResult<Long> createDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO createReqVO) {
-        return success(deliverOrderService.createDeliverOrder(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新发货订单")
-    @PreAuthorize("@ss.hasPermission('heli:deliver-order:update')")
-    public CommonResult<Boolean> updateDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO updateReqVO) {
-        deliverOrderService.updateDeliverOrder(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除发货订单")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('heli:deliver-order:delete')")
-    public CommonResult<Boolean> deleteDeliverOrder(@RequestParam("id") Long id) {
-        deliverOrderService.deleteDeliverOrder(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得发货订单")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
-    public CommonResult<DeliverOrderRespVO> getDeliverOrder(@RequestParam("id") Long id) {
-        DeliverOrderDO deliverOrder = deliverOrderService.getDeliverOrder(id);
-        return success(BeanUtils.toBean(deliverOrder, DeliverOrderRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得发货订单分页")
-    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
-    public CommonResult<PageResult<DeliverOrderRespVO>> getDeliverOrderPage(@Valid DeliverOrderPageReqVO pageReqVO) {
-        PageResult<DeliverOrderDO> pageResult = deliverOrderService.getDeliverOrderPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DeliverOrderRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出发货订单 Excel")
-    @PreAuthorize("@ss.hasPermission('heli:deliver-order:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDeliverOrderExcel(@Valid DeliverOrderPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<DeliverOrderDO> list = deliverOrderService.getDeliverOrderPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "发货订单.xls", "数据", DeliverOrderRespVO.class,
-                        BeanUtils.toBean(list, DeliverOrderRespVO.class));
-    }
-
-    // ==================== 子表（发货订单子项） ====================
-
-    @GetMapping("/deliver-order-sub/list-by-delivery-order-id")
-    @Operation(summary = "获得发货订单子项列表")
-    @Parameter(name = "deliveryOrderId", description = "订单id")
-    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
-    public CommonResult<List<DeliverOrderSubDO>> getDeliverOrderSubListByDeliveryOrderId(@RequestParam("deliveryOrderId") Long deliveryOrderId) {
-        return success(deliverOrderService.getDeliverOrderSubListByDeliveryOrderId(deliveryOrderId));
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
+import com.chanko.yunxi.mes.framework.operatelog.core.service.OperateLogFrameworkService;
+import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderSaveReqVO;
+import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
+import com.chanko.yunxi.mes.module.heli.service.deliverorder.DeliverOrderService;
+
+@Tag(name = "管理后台 - 发货订单")
+@RestController
+@RequestMapping("/heli/deliver-order")
+@Validated
+public class DeliverOrderController {
+
+    @Resource
+    private DeliverOrderService deliverOrderService;
+
+    @Resource
+    private OperateLogFrameworkService operateLogFrameworkService;
+
+    @Resource
+    private HttpServletRequest request;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建发货订单")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:create')")
+    public CommonResult<Long> createDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO createReqVO) {
+        return success(deliverOrderService.createDeliverOrder(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新发货订单")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:update')")
+    public CommonResult<Boolean> updateDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO updateReqVO) {
+        deliverOrderService.updateDeliverOrder(updateReqVO);
+        return success(true);
+    }
+
+    @PostMapping("/operate")
+    @Operation(summary = "操作项目订单")
+    @PreAuthorize("@ss.hasPermission('heli:delivery-order:update')")
+    @OperateLog(enable = false)
+    @Transactional(rollbackFor = Exception.class)
+    public CommonResult<Long> operateProjectOrder(@Valid @RequestBody DeliverOrderSaveReqVO operateReqVO) {
+        LocalDateTime startTime = LocalDateTime.now();
+        deliverOrderService.operateProjectOrder(operateReqVO);
+
+        // 手动记录日志
+        operateLogFrameworkService.createOperateLog(request,
+                startTime,
+                BusinesTypeEnum.PROJECT_ORDER.name(),
+                operateReqVO.getId(),
+                OperateTypeEnum.valueOf(operateReqVO.getActive()).getType(),
+                operateReqVO.getActiveOpinion());
+
+        return success(operateReqVO.getId());
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除发货订单")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:delete')")
+    public CommonResult<Boolean> deleteDeliverOrder(@RequestParam("id") Long id) {
+        deliverOrderService.deleteDeliverOrder(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得发货订单")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
+    public CommonResult<DeliverOrderRespVO> getDeliverOrder(@RequestParam("id") Long id) {
+        DeliverOrderDO deliverOrder = deliverOrderService.getDeliverOrder(id);
+        return success(BeanUtils.toBean(deliverOrder, DeliverOrderRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得发货订单分页")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
+    public CommonResult<PageResult<DeliverOrderRespVO>> getDeliverOrderPage(@Valid DeliverOrderPageReqVO pageReqVO) {
+        PageResult<DeliverOrderDO> pageResult = deliverOrderService.getDeliverOrderPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, DeliverOrderRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出发货订单 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:export')")
+    @OperateLog(type = EXPORT)
+    public void exportDeliverOrderExcel(@Valid DeliverOrderPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<DeliverOrderDO> list = deliverOrderService.getDeliverOrderPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "发货订单.xls", "数据", DeliverOrderRespVO.class,
+                        BeanUtils.toBean(list, DeliverOrderRespVO.class));
+    }
+
+    // ==================== 子表（发货订单子项） ====================
+
+    @GetMapping("/deliver-order-sub/list-by-delivery-order-id")
+    @Operation(summary = "获得发货订单子项列表")
+    @Parameter(name = "deliveryOrderId", description = "订单id")
+    @PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
+    public CommonResult<List<DeliverOrderSubDO>> getDeliverOrderSubListByDeliveryOrderId(@RequestParam("deliveryOrderId") Long deliveryOrderId) {
+        return success(deliverOrderService.getDeliverOrderSubListByDeliveryOrderId(deliveryOrderId));
+    }
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
index 43158d4d..8bb0733e 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
@@ -82,6 +82,13 @@ public class DeliverOrderSaveReqVO {
     @NotEmpty(message = "收货详细地址不能为空")
     private String receiveAddress;
 
+    @Schema(description = "操作类型")
+    @NotBlank(message = "操作类型不能为空")
+    private String active;
+
+    @Schema(description = "操作意见")
+    private String activeOpinion;
+
     @Schema(description = "发货订单子项列表")
     private List<DeliverOrderSubDO> deliverOrderSubs;
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
index 8eaca3a7..9e746650 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
@@ -1,5 +1,6 @@
 package com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder;
 
+import com.chanko.yunxi.mes.module.heli.enums.DeliverOrderStatusEnum;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -119,4 +120,8 @@ public class DeliverOrderDO extends BaseDO {
 
     @TableField(exist = false)
     private String customerName;
+
+    public boolean canDeliver() {
+        return DeliverOrderStatusEnum.DEFAULT.getCode() == this.deliverStatus.intValue();
+    }
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
index f1b1029e..af785f1a 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
@@ -7,6 +7,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.Deliver
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +43,20 @@ public interface DeliverOrderMapper extends BaseMapperX<DeliverOrderDO> {
         return selectPage(reqVO, query);
     }
 
+    default DeliverOrderDO selectById(Long id) {
+        MPJLambdaWrapper<DeliverOrderDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(DeliverOrderDO.class)
+                .select("u.nickname as deliverPersonName", "e.name as customerName")
+                .select("GROUP_CONCAT(distinct p.code) as saleOrderCode", "GROUP_CONCAT(distinct p.mould_name) as mouldName"
+                        , "GROUP_CONCAT(distinct p.contract_no) as contractNo", "GROUP_CONCAT(distinct p.property) as property")
+                .leftJoin("project_sale_order p on FIND_IN_SET(p.id, t.sale_order_ids)")
+                .leftJoin(CustomerDO.class, "e", CustomerDO::getId, DeliverOrderDO::getCustomerId)
+                .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, DeliverOrderDO::getDeliverPerson)
+                .eq(DeliverOrderDO::getId, id)
+                .groupBy(DeliverOrderDO::getId)
+                .last("LIMIT 1")
+                .disableSubLogicDel();
+        return selectOne(query);
+    }
+
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java
index 7bb6476c..6b8b211c 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java
@@ -1,66 +1,67 @@
-package com.chanko.yunxi.mes.module.heli.service.deliverorder;
-
-import java.util.*;
-import javax.validation.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-
-/**
- * 发货订单 Service 接口
- *
- * @author 管理员
- */
-public interface DeliverOrderService {
-
-    /**
-     * 创建发货订单
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createDeliverOrder(@Valid DeliverOrderSaveReqVO createReqVO);
-
-    /**
-     * 更新发货订单
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateDeliverOrder(@Valid DeliverOrderSaveReqVO updateReqVO);
-
-    /**
-     * 删除发货订单
-     *
-     * @param id 编号
-     */
-    void deleteDeliverOrder(Long id);
-
-    /**
-     * 获得发货订单
-     *
-     * @param id 编号
-     * @return 发货订单
-     */
-    DeliverOrderDO getDeliverOrder(Long id);
-
-    /**
-     * 获得发货订单分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 发货订单分页
-     */
-    PageResult<DeliverOrderDO> getDeliverOrderPage(DeliverOrderPageReqVO pageReqVO);
-
-    // ==================== 子表（发货订单子项） ====================
-
-    /**
-     * 获得发货订单子项列表
-     *
-     * @param deliveryOrderId 订单id
-     * @return 发货订单子项列表
-     */
-    List<DeliverOrderSubDO> getDeliverOrderSubListByDeliveryOrderId(Long deliveryOrderId);
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.deliverorder;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+
+/**
+ * 发货订单 Service 接口
+ *
+ * @author 管理员
+ */
+public interface DeliverOrderService {
+
+    /**
+     * 创建发货订单
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createDeliverOrder(@Valid DeliverOrderSaveReqVO createReqVO);
+
+    /**
+     * 更新发货订单
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateDeliverOrder(@Valid DeliverOrderSaveReqVO updateReqVO);
+
+    /**
+     * 删除发货订单
+     *
+     * @param id 编号
+     */
+    void deleteDeliverOrder(Long id);
+
+    /**
+     * 获得发货订单
+     *
+     * @param id 编号
+     * @return 发货订单
+     */
+    DeliverOrderDO getDeliverOrder(Long id);
+
+    /**
+     * 获得发货订单分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 发货订单分页
+     */
+    PageResult<DeliverOrderDO> getDeliverOrderPage(DeliverOrderPageReqVO pageReqVO);
+
+    // ==================== 子表（发货订单子项） ====================
+
+    /**
+     * 获得发货订单子项列表
+     *
+     * @param deliveryOrderId 订单id
+     * @return 发货订单子项列表
+     */
+    List<DeliverOrderSubDO> getDeliverOrderSubListByDeliveryOrderId(Long deliveryOrderId);
+
+    void operateProjectOrder(DeliverOrderSaveReqVO operateReqVO);
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
index b6ddbe77..def73747 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
@@ -1,112 +1,145 @@
-package com.chanko.yunxi.mes.module.heli.service.deliverorder;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-
-import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper;
-import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverordersub.DeliverOrderSubMapper;
-
-import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
-
-/**
- * 发货订单 Service 实现类
- *
- * @author 管理员
- */
-@Service
-@Validated
-public class DeliverOrderServiceImpl implements DeliverOrderService {
-
-    @Resource
-    private DeliverOrderMapper deliverOrderMapper;
-    @Resource
-    private DeliverOrderSubMapper deliverOrderSubMapper;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Long createDeliverOrder(DeliverOrderSaveReqVO createReqVO) {
-        // 插入
-        DeliverOrderDO deliverOrder = BeanUtils.toBean(createReqVO, DeliverOrderDO.class);
-        deliverOrderMapper.insert(deliverOrder);
-
-        // 插入子表
-        createDeliverOrderSubList(deliverOrder.getId(), createReqVO.getDeliverOrderSubs());
-        // 返回
-        return deliverOrder.getId();
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void updateDeliverOrder(DeliverOrderSaveReqVO updateReqVO) {
-        // 校验存在
-        validateDeliverOrderExists(updateReqVO.getId());
-        // 更新
-        DeliverOrderDO updateObj = BeanUtils.toBean(updateReqVO, DeliverOrderDO.class);
-        deliverOrderMapper.updateById(updateObj);
-
-        // 更新子表
-        updateDeliverOrderSubList(updateReqVO.getId(), updateReqVO.getDeliverOrderSubs());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteDeliverOrder(Long id) {
-        // 校验存在
-        validateDeliverOrderExists(id);
-        // 删除
-        deliverOrderMapper.deleteById(id);
-
-        // 删除子表
-        deleteDeliverOrderSubByDeliveryOrderId(id);
-    }
-
-    private void validateDeliverOrderExists(Long id) {
-        if (deliverOrderMapper.selectById(id) == null) {
-            throw exception(DELIVER_ORDER_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public DeliverOrderDO getDeliverOrder(Long id) {
-        return deliverOrderMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<DeliverOrderDO> getDeliverOrderPage(DeliverOrderPageReqVO pageReqVO) {
-        return deliverOrderMapper.selectPage(pageReqVO);
-    }
-
-    // ==================== 子表（发货订单子项） ====================
-
-    @Override
-    public List<DeliverOrderSubDO> getDeliverOrderSubListByDeliveryOrderId(Long deliveryOrderId) {
-        return deliverOrderSubMapper.selectListByDeliveryOrderId(deliveryOrderId);
-    }
-
-    private void createDeliverOrderSubList(Long deliveryOrderId, List<DeliverOrderSubDO> list) {
-        list.forEach(o -> o.setDeliveryOrderId(deliveryOrderId));
-        deliverOrderSubMapper.insertBatch(list);
-    }
-
-    private void updateDeliverOrderSubList(Long deliveryOrderId, List<DeliverOrderSubDO> list) {
-        deleteDeliverOrderSubByDeliveryOrderId(deliveryOrderId);
-		list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
-        createDeliverOrderSubList(deliveryOrderId, list);
-    }
-
-    private void deleteDeliverOrderSubByDeliveryOrderId(Long deliveryOrderId) {
-        deliverOrderSubMapper.deleteByDeliveryOrderId(deliveryOrderId);
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.service.deliverorder;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
+import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
+import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper;
+import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverordersub.DeliverOrderSubMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 发货订单 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class DeliverOrderServiceImpl implements DeliverOrderService {
+
+    @Resource
+    private DeliverOrderMapper deliverOrderMapper;
+    @Resource
+    private DeliverOrderSubMapper deliverOrderSubMapper;
+    @Resource
+    private SerialNumberService serialNumberService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createDeliverOrder(DeliverOrderSaveReqVO createReqVO) {
+        // 插入
+        DeliverOrderDO deliverOrder = BeanUtils.toBean(createReqVO, DeliverOrderDO.class);
+        // 月度流水号
+        SerialNumberDO serialNumberDO = serialNumberService.getSerialNumber(BusinesTypeEnum.DELIVER_ORDER.name(), new SimpleDateFormat("yyyyMM").format(new Date()));
+        serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1);
+        deliverOrderMapper.insert(deliverOrder);
+
+        // 插入子表
+        if(createReqVO.getDeliverOrderSubs() != null && !createReqVO.getDeliverOrderSubs().isEmpty()){
+            createDeliverOrderSubList(deliverOrder.getId(), createReqVO.getDeliverOrderSubs());
+        }
+        // 回写序列记录
+        serialNumberService.updateSerialNumber(serialNumberDO);
+        // 返回
+        return deliverOrder.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateDeliverOrder(DeliverOrderSaveReqVO updateReqVO) {
+        // 校验存在
+        DeliverOrderDO oldDO = validateDeliverOrderExists(updateReqVO.getId());
+        if(!oldDO.canDeliver()){
+            throw exception(INVALID_OPERATE);
+        }
+        // 更新
+        DeliverOrderDO updateObj = BeanUtils.toBean(updateReqVO, DeliverOrderDO.class);
+        deliverOrderMapper.updateById(updateObj);
+
+        // 更新子表
+        updateDeliverOrderSubList(updateReqVO.getId(), updateReqVO.getDeliverOrderSubs());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDeliverOrder(Long id) {
+        // 校验存在
+        validateDeliverOrderExists(id);
+        // 删除
+        deliverOrderMapper.deleteById(id);
+
+        // 删除子表
+        deleteDeliverOrderSubByDeliveryOrderId(id);
+    }
+
+    private DeliverOrderDO validateDeliverOrderExists(Long id) {
+        DeliverOrderDO deliverOrderDO = deliverOrderMapper.selectOne(new LambdaQueryWrapper<DeliverOrderDO>() {{
+            eq(DeliverOrderDO::getId, id);
+            last("LIMIT 1 FOR UPDATE");
+        }});
+        if (deliverOrderDO == null) {
+            throw exception(DELIVER_ORDER_NOT_EXISTS);
+        }
+        return deliverOrderDO;
+    }
+
+    @Override
+    public DeliverOrderDO getDeliverOrder(Long id) {
+        return deliverOrderMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<DeliverOrderDO> getDeliverOrderPage(DeliverOrderPageReqVO pageReqVO) {
+        return deliverOrderMapper.selectPage(pageReqVO);
+    }
+
+    // ==================== 子表（发货订单子项） ====================
+
+    @Override
+    public List<DeliverOrderSubDO> getDeliverOrderSubListByDeliveryOrderId(Long deliveryOrderId) {
+        return deliverOrderSubMapper.selectListByDeliveryOrderId(deliveryOrderId);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void operateProjectOrder(DeliverOrderSaveReqVO operateReqVO) {
+        if(operateReqVO.getId() == null){
+            createDeliverOrder(operateReqVO);
+        }else{
+            updateDeliverOrder(operateReqVO);
+        }
+    }
+
+    private void createDeliverOrderSubList(Long deliveryOrderId, List<DeliverOrderSubDO> list) {
+        list.forEach(o -> o.setDeliveryOrderId(deliveryOrderId));
+        deliverOrderSubMapper.insertBatch(list);
+    }
+
+    private void updateDeliverOrderSubList(Long deliveryOrderId, List<DeliverOrderSubDO> list) {
+        deleteDeliverOrderSubByDeliveryOrderId(deliveryOrderId);
+		list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
+        createDeliverOrderSubList(deliveryOrderId, list);
+    }
+
+    private void deleteDeliverOrderSubByDeliveryOrderId(Long deliveryOrderId) {
+        deliverOrderSubMapper.deleteByDeliveryOrderId(deliveryOrderId);
+    }
+
+}

From 002bbd33fac54e663be40c8a4f0de3c3d1421908 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 29 Jan 2024 10:12:42 +0800
Subject: [PATCH 31/64] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9DB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存盘点DB
---
 .../heli/storagecheck/StorageCheckForm.vue    |  8 +-
 sql/v1.2.0/1.structure.sql                    | 82 +++++++++++++++++++
 2 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
index 300758e6..a98373ff 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
@@ -4,12 +4,12 @@
       <el-form-item label="盘点单号" prop="stockNo"  class="!w-800px">
         <el-input v-model="formData.stockNo" placeholder="系统自动生成" disabled/>
       </el-form-item>
-      <el-form-item label="单据状态" prop="status"  >
+      <!-- <el-form-item label="单据状态" prop="status"  >
         <el-select v-model="formData.status" placeholder="单据状态" disabled class="!w-600px">
           <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)" :key="dict.value"
             :label="dict.label" :value="dict.value" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="盘点类型" prop="checkType"  class="!w-800px">
         <el-select v-model="formData.checkType" placeholder="盘点类型" class="!w-700px">
           <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value"
@@ -65,7 +65,7 @@ const formData = ref({
   checkTime: undefined,
   noZero: 1,
   description: undefined,
-  status: undefined,
+  status: 1,
   whId: undefined,
 })
 const formRules = reactive({
@@ -138,7 +138,7 @@ const resetForm = () => {
     checkTime: undefined,
     noZero: 1,
     description: undefined,
-    status: undefined,
+    status: 1,
     whId: undefined,
   }
   formRef.value?.resetFields()
diff --git a/sql/v1.2.0/1.structure.sql b/sql/v1.2.0/1.structure.sql
index 4c9332b8..ecc5bec2 100644
--- a/sql/v1.2.0/1.structure.sql
+++ b/sql/v1.2.0/1.structure.sql
@@ -63,3 +63,85 @@ CREATE TABLE `project_deliver_order_sub` (
                                              `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
                                              PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB COMMENT='发货订单子项表';
+
+DROP TABLE IF EXISTS `wms_storage_check`;
+CREATE TABLE `wms_storage_check` (
+                                     `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+                                     `stock_no` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '盘点单号',
+                                     `check_type` tinyint(1) DEFAULT NULL COMMENT '盘点类型：1部分盘点2整体盘点',
+                                     `check_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '盘点开始时间',
+                                     `no_zero` tinyint(1) DEFAULT NULL COMMENT '排除库存为0的物料：1是2否',
+                                     `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
+                                     `status` tinyint(1) DEFAULT NULL COMMENT '状态：1已保存；2已提交；3已删除',
+                                     `wh_id` bigint(19) NOT NULL COMMENT '仓库Id，对应 wms_wh 表中的Id',
+                                     `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '逻辑删除 1.是,0.否',
+                                     `creator` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '记录的创建人,对应员工表中的 Id',
+                                     `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                     `updater` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '记录的修改人,对应员工表中的 Id',
+                                     `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                     `tenant_id` bigint(20) NOT NULL COMMENT '租户编号',
+                                     `keeper` bigint(20) DEFAULT NULL COMMENT '入库人',
+                                     `keeper_time` datetime DEFAULT NULL COMMENT '入库时间',
+                                     `outbound` bigint(20) DEFAULT NULL COMMENT '出库人',
+                                     `outbound_time` datetime DEFAULT NULL COMMENT '出库时间',
+                                     `cancel` bigint(20) DEFAULT NULL COMMENT '作废人',
+                                     `cancel_time` datetime DEFAULT NULL COMMENT '作废时间',
+                                     PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='入/出库盘点表';
+
+DROP TABLE IF EXISTS `wms_storage_check_mat`;
+CREATE TABLE `wms_storage_check_mat` (
+                                         `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+                                         `check_id` bigint(20) NOT NULL COMMENT '盘点Id',
+                                         `mat_id` bigint(19) NOT NULL COMMENT '物料 Id,对应 base_material表中的 Id 列',
+                                         `wh_id` bigint(19) NOT NULL COMMENT '仓库 Id，对应 wms_wh 表中的Id',
+                                         `rg_id` bigint(19) NOT NULL COMMENT '库区 Id，对应 wms_rg 表中的Id',
+                                         `pn_id` bigint(19) NOT NULL COMMENT '库区 Id，对应 wms_rg 表中的Id',
+                                         `storage_ok_qty` decimal(11,2) DEFAULT NULL COMMENT '盘点数量',
+                                         `mat_rest` decimal(10,2) DEFAULT NULL COMMENT '物料当前库存数量',
+                                         `lot_no` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '批次号',
+                                         `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '逻辑删除 1.是,0.否',
+                                         `creator` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '记录的创建人,对应员工表中的 Id',
+                                         `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                         `updater` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '记录的修改人,对应员工表中的 Id',
+                                         `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                         `tenant_id` bigint(20) NOT NULL COMMENT '租户编号',
+                                         PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=122 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='盘点物料表';
+
+CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_storage_material_log` AS
+select 0 AS `deleted`,`lg`.`id` AS `id`,`lg`.`creator` AS `creator`,`lg`.`create_time` AS `create_time`,`lg`.`updater` AS `updater`,`lg`.`update_time` AS `update_time`,
+       `lg`.`tenant_id` AS `tenant_id`,`lg`.`status` AS `status`,`mat`.`code` AS `mat_code`,`mat`.`name` AS `mat_name`,
+       (select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_material_type') and (`system_dict_data`.`value` = `mat`.`material_type`))) AS `mat_type`,
+       (case when (isnull(`mat`.`short_name`) = TRUE) then '' else `mat`.`short_name` end) AS `short_name`,
+       (case when (isnull(`mat`.`spec`) = TRUE) then '' else `mat`.`spec` end) AS `mat_spec`,
+       (case when (isnull(`mat`.`brand`) = TRUE) then '' else `mat`.`brand` end) AS `mat_brand`,
+       (select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_material_unit') and (`system_dict_data`.`value` = `mat`.`unit`))) AS `mat_unit`,
+       `st`.`stock_no` AS `stock_no`,`st`.`stock_type` AS `stock_type`,
+       (case when (`st`.`stock_type` = 1) then (select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_storage_in_type') and (`system_dict_data`.`value` = `st`.`stock_in_type`))) else (select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_storage_out_type') and (`system_dict_data`.`value` = `st`.`stock_in_type`))) end) AS `stock_type_name`,(case when (isnull(`st`.`header_no`) = TRUE) then '' else `st`.`header_no` end) AS `header_no`,
+       `wh`.`wh_name` AS `wh_name`,`rg`.`rg_name` AS `rg_name`,`pn`.`pn_name` AS `pn_name`,
+       (case when (isnull(`lg`.`lot_no`) = 1) then '' else `lg`.`lot_no` end) AS `lot_no`,(case when ((`st`.`stock_type` = 1) and (`lg`.`status` = 2)) then `lg`.`storage_ok_qty` when ((`st`.`stock_type` = 1) and (`lg`.`status` = 3)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 2)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 3)) then `lg`.`storage_ok_qty` else `lg`.`storage_ok_qty` end) AS `storage_ok_qty`
+from (((((`wms_storage_log` `lg`
+    left join `wms_storage` `st` on((`lg`.`stock_id` = `st`.`id`)))
+    left join `base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`)))
+    left join `wms_wh` `wh` on((`lg`.`wh_id` = `wh`.`id`)))
+    left join `wms_rg` `rg` on((`lg`.`rg_id` = `rg`.`id`)))
+    left join `wms_pn` `pn` on((`lg`.`pn_id` = `pn`.`id`)))
+where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0));
+
+CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_storage_material_now` AS
+select `t`.`deleted` AS `deleted`,`t`.`id` AS `id`,`t`.`creator` AS `creator`,`t`.`create_time` AS `create_time`,`t`.`updater` AS `updater`,`t`.`update_time` AS `update_time`,`t`.`tenant_id` AS `tenant_id`,
+       `t`.`mat_code` AS `mat_code`,`t`.`mat_name` AS `mat_name`,`t`.`mat_type` AS `mat_type`,`t`.`mat_spec` AS `mat_spec`,`t`.`mat_unit` AS `mat_unit`,`t`.`mat_brand` AS `mat_brand`,
+       `t`.`wh_id` AS `wh_id`,`t`.`wh_name` AS `wh_name`,`t`.`rg_id` AS `rg_id`,`t`.`rg_name` AS `rg_name`,`t`.`pn_id` AS `pn_id`,`t`.`pn_name` AS `pn_name`,`t`.`lot_no` AS `lot_no`,`t`.`short_name` AS `short_name`,
+       sum(`t`.`storage_ok_qty`) AS `storage_ok_qty`
+from (
+    select 0 AS `deleted`,`mat`.`id` AS `id`,`mat`.`creator` AS `creator`,`mat`.`create_time` AS `create_time`,`mat`.`updater` AS `updater`,`mat`.`update_time` AS `update_time`,`mat`.`tenant_id` AS `tenant_id`,
+           `mat`.`code` AS `mat_code`,`mat`.`name` AS `mat_name`,(select `mes-heli`.`system_dict_data`.`label`
+    from `mes-heli`.`system_dict_data`
+    where ((`mes-heli`.`system_dict_data`.`dict_type` = 'heli_material_type') and (`mes-heli`.`system_dict_data`.`value` = `mat`.`material_type`))) AS `mat_type`,
+        (case when (isnull(`mat`.`short_name`) = TRUE) then '' else `mat`.`short_name` end) AS `short_name`,(case when (isnull(`mat`.`spec`) = TRUE) then '' else `mat`.`spec` end) AS `mat_spec`,
+        (case when (isnull(`mat`.`brand`) = TRUE) then '' else `mat`.`brand` end) AS `mat_brand`,(select `mes-heli`.`system_dict_data`.`label` from `mes-heli`.`system_dict_data` where ((`mes-heli`.`system_dict_data`.`dict_type` = 'heli_material_unit') and (`mes-heli`.`system_dict_data`.`value` = `mat`.`unit`))) AS `mat_unit`,
+        `wh`.`id` AS `wh_id`,`wh`.`wh_name` AS `wh_name`,`rg`.`id` AS `rg_id`,`rg`.`rg_name` AS `rg_name`,`pn`.`id` AS `pn_id`,`pn`.`pn_name` AS `pn_name`,
+        (case when (isnull(`lg`.`lot_no`) = 1) then '' else `lg`.`lot_no` end) AS `lot_no`,(case when ((`st`.`stock_type` = 1) and (`lg`.`status` = 2)) then `lg`.`storage_ok_qty` when ((`st`.`stock_type` = 1) and (`lg`.`status` = 3)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 2)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 3)) then `lg`.`storage_ok_qty` else `lg`.`storage_ok_qty` end) AS `storage_ok_qty`
+        from (((((`mes-heli`.`wms_storage_log` `lg` left join `mes-heli`.`wms_storage` `st` on((`lg`.`stock_id` = `st`.`id`))) left join `mes-heli`.`base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`))) left join `mes-heli`.`wms_wh` `wh` on((`lg`.`wh_id` = `wh`.`id`))) left join `mes-heli`.`wms_rg` `rg` on((`lg`.`rg_id` = `rg`.`id`))) left join `mes-heli`.`wms_pn` `pn` on((`lg`.`pn_id` = `pn`.`id`))) where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0))) `t`
+group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`create_time`,`t`.`updater`,`t`.`update_time`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`mat_type`,`t`.`mat_spec`,`t`.`mat_unit`,`t`.`mat_brand`,`t`.`wh_id`,`t`.`wh_name`,`t`.`rg_id`,`t`.`rg_name`,`t`.`pn_id`,`t`.`pn_name`,`t`.`lot_no`,`t`.`short_name`;
\ No newline at end of file

From 8dfe8103c6296b0bdb3f86f04333e2f1cdae686b Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 29 Jan 2024 10:25:47 +0800
Subject: [PATCH 32/64] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E6=89=80=E4=BB=A5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/hlvuestyle/publicDetail.vue                  | 2 +-
 .../mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue   | 2 +-
 .../mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue   | 2 +-
 mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue  | 2 +-
 mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue
index 396d1da7..3b8f2e23 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue
@@ -4,7 +4,7 @@
       <span><span v-html="dialogTitle"></span>页</span>
     </template>
     <el-form label-width="120px" :model="formData" v-loading="formLoading">
-      <!-- 基础信息  3列 竖列布局 -->
+      <!-- 基础信息  竖列布局 -->
       <el-card class="hl-card-info">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
index ad5f95a1..e91d1100 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
@@ -69,7 +69,7 @@
       <el-form-item label="是否已变更" prop="hasAlter">
         <el-select
           v-model="queryParams.hasAlter"
-          placeholder="请选择是否有价格"
+          placeholder="请选择是否已变更"
           clearable
           class="!w-240px"
         >
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
index ec127c2c..30672389 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
@@ -67,7 +67,7 @@
       <el-form-item label="是否已变更" prop="hasAlter">
         <el-select
           v-model="queryParams.hasAlter"
-          placeholder="请选择是否有价格"
+          placeholder="请选择是否已变更"
           clearable
           class="!w-240px"
         >
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
index 284aab3c..1d259dc8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
@@ -67,7 +67,7 @@
       <el-form-item label="是否已变更" prop="hasAlter">
         <el-select
           v-model="queryParams.hasAlter"
-          placeholder="请选择是否有价格"
+          placeholder="请选择是否已变更"
           clearable
           class="!w-240px"
         >
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
index e5c21f65..104f706c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
@@ -67,7 +67,7 @@
         <el-form-item label="是否已变更" prop="hasAlter">
           <el-select
             v-model="queryParams.hasAlter"
-            placeholder="请选择是否有价格"
+            placeholder="请选择是否已变更"
             clearable
             class="!w-240px"
           >

From ac93990c07876f3ca114a4787743acfda913d9ec Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 10:43:20 +0800
Subject: [PATCH 33/64] =?UTF-8?q?=E3=80=90=E6=A1=86=E6=9E=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E7=9B=AE=E5=BD=95=E5=B1=95=E7=A4=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E4=BE=9D=E6=8D=AE=E5=8F=AA=E6=9D=A5=E6=BA=90=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/utils/routerHelper.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/routerHelper.ts b/mes-ui/mes-ui-admin-vue3/src/utils/routerHelper.ts
index d9fe42aa..00fa52be 100644
--- a/mes-ui/mes-ui-admin-vue3/src/utils/routerHelper.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/utils/routerHelper.ts
@@ -71,7 +71,6 @@ export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecord
       noCache: !route.keepAlive,
       alwaysShow:
         route.children &&
-        route.children.length === 1 &&
         (route.alwaysShow !== undefined ? route.alwaysShow : true)
     }
     // 路由地址转首字母大写驼峰，作为路由名称，适配keepAlive

From ec8baccd295c93bdf5d94b3389f497916618a7dd Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 11:12:35 +0800
Subject: [PATCH 34/64] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/projectorder/approve.vue     | 17 -----------------
 .../src/views/heli/projectorder/archive.vue     |  9 ---------
 .../src/views/heli/projectorder/audit.vue       | 17 -----------------
 3 files changed, 43 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
index e91d1100..05057c0a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
@@ -114,23 +114,6 @@
       <el-form-item>
         <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openDetail('create')"
-          v-hasPermi="['heli:project-order:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-<!--        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['heli:project-order:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>-->
       </el-form-item>
     </el-form>
   </ContentWrap>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
index 30672389..c1a756e5 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
@@ -112,15 +112,6 @@
       <el-form-item>
         <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-<!--        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['heli:project-order:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>-->
       </el-form-item>
     </el-form>
   </ContentWrap>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
index 1d259dc8..66a947fb 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
@@ -112,23 +112,6 @@
       <el-form-item>
         <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openDetail('create')"
-          v-hasPermi="['heli:project-order:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-<!--        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['heli:project-order:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>-->
       </el-form-item>
     </el-form>
   </ContentWrap>

From dc65cdaaf608de3ecdf534d81e26134a083ce685 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 11:20:38 +0800
Subject: [PATCH 35/64] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index ee87fecd..27f5e874 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -1379,9 +1379,9 @@ a {
   margin-right: 20px;
 }
 
-/* .hl-card .alter-class {
+.hl-card .alter-class {
   position: relative;
   border: solid 1px orange;
   outline: solid 1px orange;
-} */
+}
 </style>

From acfc28e035ec7edd803b37490f441642f642552d Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 12:46:22 +0800
Subject: [PATCH 36/64] =?UTF-8?q?=E3=80=90bug=E3=80=91=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E6=89=B9=E5=87=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue   | 2 +-
 mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
index 05057c0a..7bd8aea5 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
@@ -241,7 +241,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   code: undefined,
-  orderStatus: undefined,
+  orderStatus: 16,
   orderStatusList: [16, 32, 64],
   deliveryStatus: undefined,
   businessDeptId: undefined,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
index 66a947fb..dbff8531 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
@@ -231,7 +231,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   code: undefined,
-  orderStatus: undefined,
+  orderStatus: 8,
   orderStatusList: [8, 16, 32, 64],
   deliveryStatus: undefined,
   businessDeptId: undefined,

From 98ef23462383704991ba48caafdc0b848b9a0b7b Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 13:05:41 +0800
Subject: [PATCH 37/64] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=9A=E5=8A=A1=E5=91=98=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 27f5e874..b3082f1e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -1089,7 +1089,9 @@ const queryData = async (type: string, id?: number) => {
     compositionSelectList.value = compositionData.list
 
     // 绑定默认部门与业务员
-    formData.value.businessMan = useUserStore().getUser.id // 当前登录的编码
+    if(!formData.value.businessMan){
+      formData.value.businessMan = useUserStore().getUser.id // 当前登录的编码
+    }
     const userProfile = await getUserProfile(formData.value.businessMan)
     if (userProfile.dept) {
       formData.value.businessDeptId = userProfile.dept.id

From 4e05d46ed6e0cfbd4a7ff97cdb3344b3c7b7e920 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 29 Jan 2024 14:59:22 +0800
Subject: [PATCH 38/64] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/projectorder/detail.vue                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index b3082f1e..b7907f61 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -462,7 +462,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="有无图纸/数模" prop="hasBlueprint">
               <el-radio-group
                 :disabled="detailDisabled"
@@ -513,7 +513,7 @@
                 label-width="0"
               >
                 <el-table :data="formData.projectOrderSubs" class="hl-table">
-                  <el-table-column label="序号" type="index" width="100" />
+                  <el-table-column label="序号" type="index" width="80" />
                   <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>子项目名称 </template>
                     <template #default="{ row, $index }">
@@ -620,7 +620,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="备注" min-width="150" align="center">
+                  <el-table-column label="备注" min-width="180" align="center">
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.remark`"
@@ -636,7 +636,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="操作" align="center" width="240">
+                  <el-table-column label="操作" align="center" width="150">
                     <template #default="scope">
                       <el-button
                         v-if="'update,create'.indexOf(query.active) > -1 && !formData.hasAlter"

From 910f71577a2dbda62c9d55458d228d68e50449be Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 29 Jan 2024 16:02:43 +0800
Subject: [PATCH 39/64] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98=20?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=8F=98=E5=8A=A8=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/heli/storagelog/StorageLogForm.vue  |  39 ++--
 .../src/views/heli/storagelog/index.vue       | 199 +++++++++++-------
 2 files changed, 150 insertions(+), 88 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
index 900f3a4d..2fabda45 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
@@ -1,7 +1,11 @@
 <template>
-  <ContentWrap>
+<el-card class="hl-card">
+  <template #header>
+    <span>实时库存 </span>
+  </template>
+    <ContentWrap class="borderxx">
     <!-- 搜索工作栏 -->
-    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
       <el-form-item label="物料编码" prop="matCode">
         <el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
@@ -39,7 +43,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="handleQuery">
+        <el-button @click="handleQuery" type="primary">
           <Icon icon="ep:search" class="mr-5px" /> 搜索
         </el-button>
         <el-button @click="resetQuery">
@@ -51,24 +55,25 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="物料编码" align="center" prop="matCode" />
-      <el-table-column label="物料名称" align="center" prop="matName" />
-      <el-table-column label="物料类型" align="center" prop="matType" />
-      <el-table-column label="物料简称" align="center" prop="shortName" />
-      <el-table-column label="规格/型号" align="center" prop="matSpec" />
-      <el-table-column label="品牌" align="center" prop="matBrand" />
-      <el-table-column label="仓库" align="center" prop="whName" />
-      <el-table-column label="库区" align="center" prop="rgName" />
-      <el-table-column label="库位" align="center" prop="pnName" />
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="变动数量" align="center" prop="storageOkQty" />
-      <el-table-column label="库存单位" align="center" prop="matUnit" />
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
+      <el-table-column label="物料编码" align="center" prop="matCode" fixed min-width="120" />
+      <el-table-column label="物料名称" align="center" prop="matName" fixed min-width="120"/>
+      <el-table-column label="物料类型" align="center" prop="matType" min-width="120"/>
+      <el-table-column label="物料简称" align="center" prop="shortName" min-width="120"/>
+      <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
+      <el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
+      <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
+      <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
+      <el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
+      <el-table-column label="批次号" align="center" prop="lotNo" min-width="120"/>
+      <el-table-column label="库存数量" align="center" prop="storageOkQty" min-width="120"/>
+      <el-table-column label="库存单位" align="center" prop="matUnit" min-width="120"/>
     </el-table>
     <!-- 分页 -->
     <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
   </ContentWrap>
+</el-card>
 </template>
 
 <script setup lang="ts">
@@ -167,4 +172,4 @@ onMounted(async () => {
   await init_page_pn()
   await getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
index 350c6c3d..fd82a0ab 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
@@ -1,75 +1,132 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-      <el-form-item label="物料编码" prop="matCode">
-        <el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="matName">
-        <el-input v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="物料类型" prop="matType">
-        <el-select v-model="queryParams.matType" placeholder="下拉选择" clearable class="!w-240px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label"
-            :value="dict.label" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input v-model="queryParams.lotNo" placeholder="批次号" clearable @keyup.enter="handleQuery" class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="业务单据编号" prop="stockNo">
-        <el-input v-model="queryParams.stockNo" placeholder="业务单据编号" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="变动方向" prop="stockType">
-        <el-select v-model="queryParams.stockType" placeholder="下拉选择" clearable class="!w-240px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_TYPE)" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="上游单据编号" prop="headerNo">
-        <el-input v-model="queryParams.headerNo" placeholder="上游单据编号" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
+  <el-card class="hl-card">
+    <template #header>
+      <span>库存变动日志</span>
+    </template>
+    <ContentWrap class="borderxx">
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="120px"
+      >
+        <el-form-item label="物料编码" prop="matCode">
+          <el-input
+            v-model="queryParams.matCode"
+            placeholder="物料编码"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="matName">
+          <el-input
+            v-model="queryParams.matName"
+            placeholder="物料名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料类型" prop="matType">
+          <el-select
+            v-model="queryParams.matType"
+            placeholder="下拉选择"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)"
+              :key="dict.label"
+              :label="dict.label"
+              :value="dict.label"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="批次号" prop="lotNo">
+          <el-input
+            v-model="queryParams.lotNo"
+            placeholder="批次号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="业务单据编号" prop="stockNo">
+          <el-input
+            v-model="queryParams.stockNo"
+            placeholder="业务单据编号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="变动方向" prop="stockType">
+          <el-select
+            v-model="queryParams.stockType"
+            placeholder="下拉选择"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上游单据编号" prop="headerNo">
+          <el-input
+            v-model="queryParams.headerNo"
+            placeholder="上游单据编号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
 
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary">
+            <Icon icon="ep:search" class="mr-5px" /> 搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon icon="ep:refresh" class="mr-5px" /> 重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
 
-      <el-form-item>
-        <el-button @click="handleQuery">
-          <Icon icon="ep:search" class="mr-5px" /> 搜索
-        </el-button>
-        <el-button @click="resetQuery">
-          <Icon icon="ep:refresh" class="mr-5px" /> 重置
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="物料编码" align="center" prop="matCode" />
-      <el-table-column label="物料名称" align="center" prop="matName" />
-      <el-table-column label="物料类型" align="center" prop="matType" />
-      <el-table-column label="物料简称" align="center" prop="shortName" />
-      <el-table-column label="规格/型号" align="center" prop="matSpec" />
-      <el-table-column label="品牌" align="center" prop="matBrand" />
-      <el-table-column label="业务单据编号" align="center" prop="stockNo" />
-      <el-table-column label="业务单据类型" align="center" prop="stockTypeName" />
-      <el-table-column label="上游单据编号" align="center" prop="headerNo" />
-      <el-table-column label="仓库" align="center" prop="whName" />
-      <el-table-column label="库区" align="center" prop="rgName" />
-      <el-table-column label="库位" align="center" prop="pnName" />
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="变动数量" align="center" prop="storageOkQty" />
-      <el-table-column label="库存单位" align="center" prop="matUnit" />
-    </el-table>
-    <!-- 分页 -->
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
-  </ContentWrap>
-
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" class="hl-table">
+        <el-table-column label="物料编码" align="center" prop="matCode" min-width="120" fixed />
+        <el-table-column label="物料名称" align="center" prop="matName" min-width="120" fixed />
+        <el-table-column label="物料类型" align="center" prop="matType" min-width="120" />
+        <el-table-column label="物料简称" align="center" prop="shortName" min-width="120" />
+        <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
+        <el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
+        <el-table-column label="业务单据编号" align="center" prop="stockNo" min-width="120"/>
+        <el-table-column label="业务单据类型" align="center" prop="stockTypeName" min-width="120"/>
+        <el-table-column label="上游单据编号" align="center" prop="headerNo" min-width="120"/>
+        <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
+        <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
+        <el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
+        <el-table-column label="批次号" align="center" prop="lotNo" min-width="120"/>
+        <el-table-column label="变动数量" align="center" prop="storageOkQty" fixed="right" min-width="120"/>
+        <el-table-column label="库存单位" align="center" prop="matUnit" fixed="right" min-width="120"/>
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+  </el-card>
 </template>
 
 <script setup lang="ts">
@@ -104,7 +161,7 @@ const queryParams = reactive({
   pnId: undefined,
   stockNo: undefined,
   stockType: undefined,
-  headerNo: undefined,
+  headerNo: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -151,4 +208,4 @@ onMounted(async () => {
   // await init_page_pn()
   await getList()
 })
-</script>
\ No newline at end of file
+</script>

From 7394fb9ea728542e285287c568273f1a5030d32d Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 16:15:17 +0800
Subject: [PATCH 40/64] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E3=80=91=E5=8F=91=E8=B4=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9F=BA=E7=A1=80=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/heli/deliverorder/index.ts        |   5 +
 .../src/api/infra/file/index.ts               |   1 +
 mes-ui/mes-ui-admin-vue3/src/locales/en.ts    |   1 +
 mes-ui/mes-ui-admin-vue3/src/locales/zh-CN.ts |   1 +
 mes-ui/mes-ui-admin-vue3/src/utils/dict.ts    |   2 +
 .../components/DeliverOrderSubForm.vue        |  26 +-
 .../src/views/heli/deliverorder/detail.vue    | 744 ++++++++++++++++++
 .../src/views/heli/deliverorder/index.vue     |  14 +-
 8 files changed, 777 insertions(+), 17 deletions(-)
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue

diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
index aa567570..d84eaa08 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
@@ -20,6 +20,7 @@ export interface DeliverOrderVO {
   status: number
   receivePersonName: string
   receiveAddress: string
+  active: string
 }
 
 // 查询发货订单分页
@@ -58,3 +59,7 @@ export const exportDeliverOrder = async (params) => {
 export const getDeliverOrderSubListByDeliveryOrderId = async (deliveryOrderId) => {
   return await request.get({ url: `/heli/deliver-order/deliver-order-sub/list-by-delivery-order-id?deliveryOrderId=` + deliveryOrderId })
 }
+
+export async function operateDeliverOrder(data: DeliverOrderVO) {
+  return await request.post({ url: `/heli/deliver-order/operate`, data })
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/infra/file/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/infra/file/index.ts
index 478fb9fd..bb373cdf 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/infra/file/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/infra/file/index.ts
@@ -3,6 +3,7 @@ import request from '@/config/axios'
 export interface FilePageReqVO extends PageParam {
   path?: string
   type?: string
+  url: string
   createTime?: Date[]
   businessType: string
   businessId: number
diff --git a/mes-ui/mes-ui-admin-vue3/src/locales/en.ts b/mes-ui/mes-ui-admin-vue3/src/locales/en.ts
index fe33c512..82e78e79 100644
--- a/mes-ui/mes-ui-admin-vue3/src/locales/en.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/locales/en.ts
@@ -302,6 +302,7 @@ export default {
     terminate: 'Terminate',
     detailArchive: 'Detail',
     alter: 'Alter',
+    deliver: 'Deliver',
     typeCreate: 'Dict Type Create',
     typeUpdate: 'Dict Type Eidt',
     dataCreate: 'Dict Data Create',
diff --git a/mes-ui/mes-ui-admin-vue3/src/locales/zh-CN.ts b/mes-ui/mes-ui-admin-vue3/src/locales/zh-CN.ts
index c439d10d..7198bb94 100644
--- a/mes-ui/mes-ui-admin-vue3/src/locales/zh-CN.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/locales/zh-CN.ts
@@ -303,6 +303,7 @@ export default {
     terminate: '终止',
     detailArchive: '详情',
     alter: '变更',
+    deliver: '发货',
     typeCreate: '字典类型新增',
     typeUpdate: '字典类型编辑',
     dataCreate: '字典数据新增',
diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
index 3a981dc0..f401920c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
@@ -238,4 +238,6 @@ export enum DICT_TYPE {
   HELI_PROJECT_ORDER_APPROVE_STATUS = 'heli_project_order_approve_status', // 项目单据批准页状态
   HELI_PROJECT_ORDER_ALTER_STATUS = 'heli_project_order_alter_status', // 项目单据变更页状态
   HELI_DELIVER_ORDER_STATUS = 'heli_deliver_order_status', // 发货单状态
+  HELI_DELIVER_MODE = 'heli_deliver_mode', // 发货方式
+  HELI_DELIVER_MATERIAL_TYPE = 'heli_deliver_material_type', // 发货物料类型
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
index e75587cb..226f4ae4 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
@@ -2,7 +2,7 @@
   <el-form
     ref="formRef"
     :model="formData"
-    :rules="formRules"
+    :rules="subFormRules"
     v-loading="formLoading"
     label-width="0px"
     :inline-message="true"
@@ -11,7 +11,7 @@
       <el-table-column label="序号" type="index" width="100" />
        <el-table-column label="业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.category`" :rules="formRules.category" class="mb-0px!">
+          <el-form-item :prop="`${$index}.category`" :rules="subFormRules.category" class="mb-0px!">
             <el-select v-model="row.category" placeholder="请选择业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST">
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_LIST_TYPE)"
@@ -25,28 +25,28 @@
       </el-table-column>
       <el-table-column label="名称，唯一" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.name`" :rules="formRules.name" class="mb-0px!">
+          <el-form-item :prop="`${$index}.name`" :rules="subFormRules.name" class="mb-0px!">
             <el-input v-model="row.name" placeholder="请输入名称，唯一" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="图号" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.blueprintNo`" :rules="formRules.blueprintNo" class="mb-0px!">
+          <el-form-item :prop="`${$index}.blueprintNo`" :rules="subFormRules.blueprintNo" class="mb-0px!">
             <el-input v-model="row.blueprintNo" placeholder="请输入图号" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="数量" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.amount`" :rules="formRules.amount" class="mb-0px!">
+          <el-form-item :prop="`${$index}.amount`" :rules="subFormRules.amount" class="mb-0px!">
             <el-input v-model="row.amount" placeholder="请输入数量" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="单位" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.unit`" :rules="formRules.unit" class="mb-0px!">
+          <el-form-item :prop="`${$index}.unit`" :rules="subFormRules.unit" class="mb-0px!">
             <el-select v-model="row.unit" placeholder="请选择单位">
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)"
@@ -60,21 +60,21 @@
       </el-table-column>
       <el-table-column label="重量(T)" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.weight`" :rules="formRules.weight" class="mb-0px!">
+          <el-form-item :prop="`${$index}.weight`" :rules="subFormRules.weight" class="mb-0px!">
             <el-input v-model="row.weight" placeholder="请输入重量(T)" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="尺寸(米)" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.size`" :rules="formRules.size" class="mb-0px!">
+          <el-form-item :prop="`${$index}.size`" :rules="subFormRules.size" class="mb-0px!">
             <el-input v-model="row.size" placeholder="请输入尺寸(米)" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="子项类型" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.subType`" :rules="formRules.subType" class="mb-0px!">
+          <el-form-item :prop="`${$index}.subType`" :rules="subFormRules.subType" class="mb-0px!">
             <el-select v-model="row.subType" placeholder="请选择子项类型">
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MATERIAL_TYPE)"
@@ -88,14 +88,14 @@
       </el-table-column>
       <el-table-column label="备注" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.remark`" :rules="formRules.remark" class="mb-0px!">
+          <el-form-item :prop="`${$index}.remark`" :rules="subFormRules.remark" class="mb-0px!">
             <el-input v-model="row.remark" placeholder="请输入备注" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="状态,1表示正常，2表示禁用" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.status`" :rules="formRules.status" class="mb-0px!">
+          <el-form-item :prop="`${$index}.status`" :rules="subFormRules.status" class="mb-0px!">
             <el-radio-group v-model="row.status">
                 <el-radio label="1">请选择字典生成</el-radio>
             </el-radio-group>
@@ -122,7 +122,7 @@ const props = defineProps<{
 }>()
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
-const formRules = reactive({
+const subFormRules = reactive({
   deliveryOrderId: [{ required: true, message: '订单id不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST不能为空', trigger: 'change' }],
   name: [{ required: true, message: '名称，唯一不能为空', trigger: 'blur' }],
@@ -188,4 +188,4 @@ const getData = () => {
 }
 
 defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
new file mode 100644
index 00000000..91e62084
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
@@ -0,0 +1,744 @@
+<template>
+  <!-- 公共详情  -->
+  <el-card class="hl-card">
+    <template #header>
+      <span><span v-html="dialogTitle"></span>页</span>
+    </template>
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="140px"
+      v-loading="formLoading"
+    >
+      <!-- 基础信息 横向布局 -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
+        </template>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="发货单号" prop="code">
+              <el-input disabled v-model="formData.code" placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号" prop="saleOrderIds">
+              <el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号" >
+                <template #append><el-button :icon="Search" /></template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="contractNo" label="合同号">
+              <el-input v-model="formData.contractNo" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="property" label="性质">
+              <el-input v-model="formData.property" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="发货日期" prop="deliverDate">
+              <el-date-picker
+                v-model="formData.deliverDate"
+                type="date"
+                value-format="x"
+                placeholder="选择发货日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="customerId" label="客户名称">
+              <el-input v-model="formData.customerName" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item prop="mouldName" label="模具名称">
+              <el-input v-model="formData.mouldName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发货单状态" prop="deliverStatus">
+              {{getDictLabel(DICT_TYPE.HELI_DELIVER_ORDER_STATUS, formData.deliverStatus)}}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="发货备注" prop="remark">
+              <el-input
+                type="textarea"
+                v-model="formData.remark"
+                show-word-limit
+                maxlength="200"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">发货信息</span>
+        </template>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="发货人姓名" prop="deliverPerson">
+              <UserSelect v-model="formData.deliverPerson" @update:newValue="handleSelectedUser" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发货人电话" prop="deliverPersonMobile">
+              <el-input v-model="formData.deliverPersonMobile" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发货方式" prop="deliverMode">
+              <el-select v-model="formData.deliverMode" placeholder="请选择发货方式">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发货单位" prop="deliverCompany">
+              <el-input value="杭州合立机械有限公司" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">收货信息</span>
+        </template>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="收货人姓名" prop="receivePersonName">
+              <el-input v-model="formData.receivePersonName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="收货人电话" prop="receivePersonMobile">
+              <el-input v-model="formData.receivePersonMobile" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收货详细地址" prop="receiveAddress">
+              <el-input v-model="formData.receiveAddress" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物流信息</span>
+        </template>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="司机姓名" prop="transportDriverName">
+              <el-input v-model="formData.transportDriverName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="司机电话" prop="transportDriverMobile">
+              <el-input v-model="formData.transportDriverMobile" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="车牌号" prop="transportBusNumber">
+              <el-input v-model="formData.transportBusNumber" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="重量(T)" prop="transportWeight">
+              <el-input v-model="formData.transportWeight" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="位置(米)" prop="transportSize">
+              <el-input v-model="formData.transportSize" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">发货清单</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-form
+                ref="subFormRef"
+                :model="formData.deliverOrderSubs"
+                :rules="subFormRules"
+                v-loading="subFormLoading"
+                label-width="0"
+              >
+                <el-table
+                  :data="formData.deliverOrderSubs"
+                  class="hl-table"
+                >
+                  <el-table-column label="序号" type="index" width="100" />
+                  <el-table-column min-width="150" align="center">
+                    <template #header> <span class="hl-table_header">*</span>子项目名称 </template>
+                    <template #default="scope">
+                      {{scope.row.name}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="子项目图号" min-width="150">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.blueprintNo`" :rules="subFormRules.blueprintNo" class="mb-0px!">
+                        <el-input v-model="row.blueprintNo" placeholder="请输入子项目图号" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="本次发货数量" min-width="150">
+                    <template #header> <span class="hl-table_header">*</span>本次发货数量 </template>
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.amount`" :rules="subFormRules.amount" class="mb-0px!">
+                        <el-input v-model="row.amount" placeholder="请输入本次发货数量" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="单位" min-width="150">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.unit`" :rules="subFormRules.unit" class="mb-0px!">
+                        {{getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, row.unit)}}
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="重量(T)" min-width="150">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.weight`" class="mb-0px!">
+                        <el-input v-model="row.weight" placeholder="请输入重量(T)" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="尺寸(米)" min-width="150">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.size`" class="mb-0px!">
+                        <el-input v-model="row.size" placeholder="请输入尺寸(米)" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="备注" min-width="150">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
+                        <el-input v-model="row.remark" placeholder="请输入备注" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" align="center" width="240">
+                    <template #default="scope">
+                      <el-button
+                        link
+                        type="danger"
+                        size="small"
+                        @click.prevent="onDeleteItem(scope.$index)"
+                      >
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">其他物料清单</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem2"
+            >新增</el-button
+            >
+          </el-col>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-form
+                ref="otherSubFormRef"
+                :model="formData.deliverOrderOtherSubs"
+                :rules="subFormRules"
+                v-loading="subFormLoading"
+                label-width="0"
+              >
+                <el-table
+                  :data="formData.deliverOrderOtherSubs"
+                  class="hl-table"
+                >
+                  <el-table-column label="序号" type="index" width="100" />
+                  <el-table-column min-width="150" align="center">
+                    <template #header> <span class="hl-table_header">*</span>名称 </template>
+                    <template #default="scope">
+                      {{scope.row.name}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="所属类型" min-width="150">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.subType`" :rules="subFormRules.subType" class="mb-0px!">
+                        <el-select v-model="row.subType" placeholder="请选择子项类型">
+                          <el-option
+                            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MATERIAL_TYPE)"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="本次发货数量" min-width="150">
+                    <template #header> <span class="hl-table_header">*</span>本次发货数量 </template>
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.amount`" :rules="subFormRules.amount" class="mb-0px!">
+                        <el-input v-model="row.amount" placeholder="请输入本次发货数量" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="单位" min-width="150">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.unit`" :rules="subFormRules.unit" class="mb-0px!">
+                        <el-select v-model="row.unit" placeholder="请选择单位">
+                          <el-option
+                            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="备注" min-width="150">
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
+                        <el-input v-model="row.remark" placeholder="请输入备注" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" align="center" width="240">
+                    <template #default="scope">
+                      <el-button
+                        link
+                        type="danger"
+                        size="small"
+                        @click.prevent="onDeleteItem2(scope.$index)"
+                      >
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-upload
+              ref="attachmentUploadRef"
+              multiple
+              :limit="10"
+              :action="uploadUrl"
+              :headers="uploadHeaders"
+              name="files"
+              :show-file-list="false"
+              :auto-upload="false"
+              :data="uploadData"
+              :on-change="attachmentUploadChange"
+              class="upload-file-uploader"
+            >
+              <el-button type="primary"><Icon icon="ep:upload-filled" />上传</el-button>
+            </el-upload>
+          </el-col>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-table :data="formData.attachments" class="hl-table">
+                <el-table-column prop="name" label="文件名称" align="center" />
+                <el-table-column
+                  prop="createTime"
+                  align="center"
+                  label="上传时间"
+                  :formatter="dateFormatter"
+                />
+                <el-table-column label="操作" align="center">
+                  <template #default="scope">
+                    <el-button
+                      link
+                      type="danger"
+                      size="small"
+                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
+                    >
+                      删除
+                    </el-button>
+                    <el-button
+                      v-if="!!scope.row.id"
+                      link
+                      type="primary"
+                      size="small"
+                      @click="downloadAttachment(scope.row.name, scope.row.url)"
+                    >
+                      下载
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-form>
+    <div class="text-center hl-footer">
+      <el-button @click="goback" size="large">取 消</el-button>
+      <el-button @click="submitForm('SAVE')" type="success" :disabled="formLoading" size="large"
+        >保 存</el-button
+      >
+      <el-button @click="submitForm('DELIVER')" type="primary" :disabled="formLoading" size="large"
+        >发 货</el-button
+      >
+    </div>
+  </el-card>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+import type { UploadProps, UploadUserFile } from 'element-plus'
+import {getStrDictOptions, DICT_TYPE, getIntDictOptions, getDictLabel} from '@/utils/dict'
+import * as DeliverOrderApi from '@/api/heli/deliverorder'
+import {getOperateLogPage} from "@/api/system/operatelog";
+import {deleteFileLogic, downloadFile, getFilePage} from "@/api/infra/file";
+import {Search, Plus} from "@element-plus/icons-vue";
+import UserSelect from "@/views/heli/hlvuestyle/userSelect.vue";
+import {getAccessToken, getTenantId} from "@/utils/auth";
+import {dateFormatter} from "@/utils/formatTime";
+import download from "@/utils/download";
+import { inject } from 'vue'
+const reload = inject('reload')
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const router = useRouter()
+const { query } = useRoute()
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  code: undefined,
+  saleOrderIds: undefined,
+  saleOrderCode: undefined,
+  contractNo: undefined,
+  property: undefined,
+  customerId: undefined,
+  customerName: undefined,
+  mouldName: undefined,
+  deliverDate: undefined,
+  deliverStatus: 1,
+  deliverPerson: undefined,
+  deliverPersonMobile: undefined,
+  deliverMode: undefined,
+  receivePersonMobile: undefined,
+  transportDriverName: undefined,
+  transportDriverMobile: undefined,
+  transportBusNumber: undefined,
+  transportWeight: undefined,
+  transportSize: undefined,
+  remark: undefined,
+  status: undefined,
+  receivePersonName: undefined,
+  receiveAddress: undefined,
+  deliverOrderSubs: [],
+  deliverOrderOtherSubs: [],
+  attachments: [],
+  operateLogs: [],
+  idcard1: undefined,
+  idcard2: undefined,
+  active: undefined,
+})
+const formRules = reactive({
+  saleOrderIds: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  property: [{ required: true, message: '性质不能为空', trigger: 'blur' }],
+  mouldName: [{ required: true, message: '模具名称不能为空', trigger: 'blur' }],
+  customerId: [{ required: true, message: '客户id不能为空', trigger: 'blur' }],
+  deliverCompany: [{ required: true, message: '发货单位不能为空', trigger: 'blur' }],
+  deliverDate: [{ required: true, message: '发货日期不能为空', trigger: 'blur' }],
+  deliverStatus: [{ required: true, message: '发货单状态不能为空', trigger: 'change' }],
+  deliverPerson: [{ required: true, message: '发货人不能为空', trigger: 'blur' }],
+  deliverPersonMobile: [{ required: true, message: '发货人电话不能为空', trigger: 'blur' }],
+  deliverMode: [{ required: true, message: '发货方式不能为空', trigger: 'change' }],
+  receivePersonMobile: [{ required: true, message: '收货人电话不能为空', trigger: 'blur' }],
+  receivePersonName: [{ required: true, message: '收货人姓名不能为空', trigger: 'blur' }],
+  receiveAddress: [{ required: true, message: '收货详细地址不能为空', trigger: 'blur' }],
+})
+const subFormLoading = ref(false) // 子表单的加载中
+const subFormRules = reactive({
+  deliveryOrderId: [{ required: true, message: '订单id不能为空', trigger: 'blur' }],
+  subType: [{ required: true, message: '所属类型不能为空', trigger: 'change' }],
+  name: [{ required: true, message: '名称，唯一不能为空', trigger: 'blur' }],
+  amount: [{ required: true, message: '本次发货数量不能为空', trigger: 'blur' }],
+  unit: [{ required: true, message: '单位不能为空', trigger: 'change' }],
+})
+const formRef = ref() // 表单 Ref
+/** 子表的表单 */
+const subFormRef = ref()
+const otherSubFormRef = ref()
+const submitForm = async (active) => {
+  // 校验表单
+  formData.value.active = active
+  await formRef.value.validate()
+  // 校验子表单
+  try {
+    await subFormRef.value.validate()
+    await otherSubFormRef.value.validate()
+  } catch (e) {
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as DeliverOrderApi.DeliverOrderVO
+
+    const orderId = await DeliverOrderApi.operateDeliverOrder(data)
+    message.success(t('common.operationSuccess'))
+    // 上传附件
+    if(attachmentUploadFiles.value.length > 0){
+      uploadData.value.businessId = orderId
+      attachmentUploadRef.value!.submit()
+    }
+    // 如身份证照片不为空 更新信息
+    if(formData.value.idcard1){
+      let fileParams = {
+        pageNo: 1,
+        pageSize: 1,
+        url: formData.value.idcard1
+      }
+      const idcard1FileRet = await getFilePage(fileParams);
+    }
+
+    // 如非保存 返回列表页
+    if (active != 'SAVE') {
+      goback()
+    } else {
+      // 成功后刷新
+      query.active = 'update'
+      query.id = orderId
+      reload()
+    }
+  } finally {
+    formLoading.value = false
+  }
+}
+const goback = () => {
+  resetForm()
+  router.back()
+}
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    saleOrderIds: undefined,
+    saleOrderCode: undefined,
+    contractNo: undefined,
+    property: undefined,
+    customerId: undefined,
+    customerName: undefined,
+    mouldName: undefined,
+    deliverDate: undefined,
+    deliverStatus: 1,
+    deliverPerson: undefined,
+    deliverPersonMobile: undefined,
+    deliverMode: undefined,
+    receivePersonMobile: undefined,
+    transportDriverName: undefined,
+    transportDriverMobile: undefined,
+    transportBusNumber: undefined,
+    transportWeight: undefined,
+    transportSize: undefined,
+    remark: undefined,
+    status: undefined,
+    receivePersonName: undefined,
+    receiveAddress: undefined,
+    deliverOrderSubs: [],
+    deliverOrderOtherSubs: [],
+    attachments: [],
+    operateLogs: [],
+    idcard1: undefined,
+    idcard2: undefined,
+    active: undefined,
+  }
+  formRef.value?.resetFields()
+}
+
+const onAddItem2 = () => {
+  const row = {
+    id: undefined,
+    deliveryOrderId: undefined,
+    category: "OTHER_LIST",
+    name: undefined,
+    blueprintNo: undefined,
+    amount: undefined,
+    unit: undefined,
+    weight: undefined,
+    size: undefined,
+    subType: undefined,
+    remark: undefined,
+    status: undefined,
+  }
+  row.deliveryOrderId = formData.value.id
+  formData.value.deliverOrderOtherSubs.push(row)
+}
+
+//接收职工传递的数据
+const handleSelectedUser = (newValue: any) => {
+  formData.value.deliverPerson = newValue.id
+}
+
+const attachmentUploadRef = ref()
+const attachmentUploadFiles = ref<UploadUserFile[]>([])
+
+const idcardBusinessFileType = ref('ID_CARD')
+
+const businessType = ref('DELIVER_ORDER')
+const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL)
+const idCardUploadData = ref({
+  businessType: businessType.value,
+  businessId: formData.value.id,
+  businessFileType: idcardBusinessFileType.value
+})
+const uploadData = ref({
+  businessType: businessType.value,
+  businessId: formData.value.id
+})
+const uploadHeaders = ref({
+  Authorization: 'Bearer ' + getAccessToken(),
+  'tenant-id': getTenantId()
+})
+
+const attachmentUploadChange = (file, files) => {
+  attachmentUploadFiles.value = files
+
+  formData.value.attachments = formData.value.attachments.filter((value, index, array) => {
+    return value.id
+  })
+  for (let i = 0; i < files.length; i++) {
+    let file = files[i]
+    file.createTime = new Date()
+    formData.value.attachments.push(file)
+  }
+  // 排序
+  formData.value.attachments.sort((v1, v2) => {
+    return v1.createTime - v2.createTime > 0
+  })
+}
+
+/** 删除子项操作 */
+const onDeleteItem = (index) => {
+  formData.value.deliverOrderSubs.splice(index, 1)
+}
+
+const onDeleteItem2 = (index) => {
+  formData.value.deliverOrderOtherSubs.splice(index, 1)
+}
+
+// 删除附件
+const handleDeleteAttachment = async (index, type) => {
+  const deletedAttachments = formData.value.attachments.splice(index, 1)
+  for (let i = 0; i < deletedAttachments.length; i++) {
+    const attachment = deletedAttachments[i]
+    if (attachment.id) {
+      // 清理已上传文件
+      await deleteFileLogic(attachment.id)
+    }
+    // 清理待上传文件
+    attachmentUploadFiles.value = attachmentUploadFiles.value.filter((file1) => {
+      return file1.name != attachment.name
+    })
+  }
+}
+
+// 下载文件
+const downloadAttachment = async (name, url) => {
+  const data = await downloadFile(url)
+  download.any(data, name)
+}
+
+/** 打开弹窗 */
+const queryData = async (type: string, id?: number) => {
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  formLoading.value = true
+  try {
+    if (id) {
+      formData.value = await DeliverOrderApi.getDeliverOrder(id)
+      // 子项列表
+      formData.value.deliverOrderSubs =
+        await DeliverOrderApi.getDeliverOrderSubListByDeliveryOrderId(id)
+
+      // 操作日志
+      let logParams = {
+        pageNo: 1,
+        pageSize: 99,
+        businessId: id,
+        businessType: businessType.value
+      }
+      formData.value.operateLogs = (await getOperateLogPage(logParams)).list
+
+      // 附件信息
+      let attParams = {
+        pageNo: 1,
+        pageSize: 99,
+        businessId: id,
+        businessType: businessType.value
+      }
+      const fileList = (await getFilePage(attParams)).list
+      // 分类赋值 区分身份证照片与附件
+      if(fileList && fileList.length > 0){
+        const idcardFiles = fileList.filter((file) => file.businessFileType == idcardBusinessFileType.value);
+        if(idcardFiles && idcardFiles.length > 0){
+          formData.value.idcard1 = idcardFiles[0].url;
+          formData.value.idcard2 = idcardFiles.length > 1 ? idcardFiles[1].url : undefined;
+        }
+        formData.value.attachments = fileList.filter((file) => file.businessFileType != idcardBusinessFileType.value);
+      }
+    }
+  } finally {
+    formLoading.value = false
+  }
+}
+
+onMounted(() => {
+  queryData(query.active, query.id)
+})
+</script>
+<style>
+a {
+  color: #409eff;
+  text-decoration: none;
+}
+</style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
index 67629b68..ae933052 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
@@ -76,7 +76,7 @@
         <el-button
           type="primary"
           plain
-          @click="openForm('create')"
+          @click="openDetail('create')"
           v-hasPermi="['heli:deliver-order:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
@@ -170,6 +170,7 @@ defineOptions({ name: 'DeliverOrder' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
+const router = useRouter()
 
 const loading = ref(true) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -225,9 +226,14 @@ const resetQuery = () => {
 }
 
 /** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const openDetail = (type: string, id?: number) => {
+  router.push({
+    name: 'DeliverOrderDetail',
+    query: {
+      active: type,
+      id: id
+    }
+  })
 }
 
 /** 删除按钮操作 */

From 95c5b1eacddabeb4fee37b8051caf7624a31aa78 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 16:59:09 +0800
Subject: [PATCH 41/64] =?UTF-8?q?=E3=80=90bug=E3=80=91=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=80=A7=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/module/heli/service/material/MaterialServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java
index aa22fdbe..b499428b 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java
@@ -42,7 +42,7 @@ public class MaterialServiceImpl implements MaterialService {
     private void validateMaterialRepeat(String code, Long id) {
         Long repeat = materialMapper.selectCount(new LambdaQueryWrapper<MaterialDO>() {{
             eq(MaterialDO::getCode, code);
-            eq(id != null, MaterialDO::getId, id);
+            ne(id != null, MaterialDO::getId, id);
             last("LIMIT 1");
         }});
         if(repeat != null && repeat.longValue() > 0){

From 13bfc164f5215e8f18ae8082ccb945bd57023ee5 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 29 Jan 2024 17:21:11 +0800
Subject: [PATCH 42/64] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/heli/projectorder/startprint.vue    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
index ca2d9119..f8734bf8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
@@ -13,9 +13,9 @@
             <td colspan="6">
               <span style="font-size: 20px; font-weight: 700">开发项目启动单</span>
             </td>
-            <td colspan="2">
-              <div style="border-bottom: 1px solid #666">项目编号</div>
-              <div>{{ formData.code }}</div>
+            <td colspan="2" style="padding: none">
+              <div style="border-bottom: 1px solid #666; padding-bottom: 10px">项目编号</div>
+              <div style="padding-top: 10px">{{ formData.code }}</div>
             </td>
           </tr>
         </tbody>
@@ -108,7 +108,7 @@
             <td class="xh"> 序号 </td>
             <td colspan="2"> 名称 </td>
             <td> 设备型号 </td>
-            <td> 简称 </td>
+            <td style="width:10%"> 简称 </td>
             <td> 数量 </td>
             <td> 主要材料 </td>
             <td colspan="3"> 子项目编号 </td>
@@ -139,19 +139,19 @@
         </tbody>
         <tbody>
           <tr>
-            <td colspan="3"> 编制/日期 </td>
-            <td colspan="3"> 审核/日期 </td>
-            <td colspan="4"> 批准/日期 </td>
+            <td colspan="4" style="width:33%"> 编制/日期 </td>
+            <td colspan="3" style="width:33%"> 审核/日期 </td>
+            <td colspan="3" style="width:33%"> 批准/日期 </td>
           </tr>
           <tr>
-            <td colspan="3">{{formData.creatorName}}</td>
+            <td colspan="4">{{formData.creatorName}}</td>
             <td colspan="3">{{formData.auditUserName}}</td>
-            <td colspan="4">{{formData.approveUserName}}</td>
+            <td colspan="3">{{formData.approveUserName}}</td>
           </tr>
           <tr>
-            <td colspan="3">{{formatDate(new Date(formData.createTime), 'YYYY-MM-DD')}}</td>
+            <td colspan="4">{{formatDate(new Date(formData.createTime), 'YYYY-MM-DD')}}</td>
             <td colspan="3">{{formatDate(new Date(formData.auditTime), 'YYYY-MM-DD')}}</td>
-            <td colspan="4">{{formatDate(new Date(formData.approveTime), 'YYYY-MM-DD')}}</td>
+            <td colspan="3">{{formatDate(new Date(formData.approveTime), 'YYYY-MM-DD')}}</td>
           </tr>
         </tbody>
       </table>

From 6ed9814af5f7f2b7678bc90ec68adafc16f58273 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 29 Jan 2024 17:28:50 +0800
Subject: [PATCH 43/64] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9DB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存盘点DB
---
 .../views/heli/storagecheck/checkdetail.vue   | 825 ++++++++++++++++++
 .../src/views/heli/storagecheck/index.vue     |  15 +-
 sql/v1.2.0/1.structure.sql                    |  19 +-
 3 files changed, 851 insertions(+), 8 deletions(-)
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
new file mode 100644
index 00000000..130951bb
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
@@ -0,0 +1,825 @@
+<template>
+  <!-- 出库 -->
+  <el-card class="hl-card" style="position: relative">
+    <template #header>
+      <span v-text="dialogTitle"></span>
+    </template>
+    <div class="abstatus">
+      <img src="/src/assets/imgs/status/status2.png" v-if="formData.status == 2" alt="" />
+      <img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
+      <span v-else></span>
+    </div>
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="200px" v-loading="formLoading"
+      v-bind:disabled="isShowBtnOther">
+      <!--  基础信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
+        </template>
+        <el-row>
+          <el-col :span="8">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="stockNo" label="盘点单号">
+                  <el-input v-model="formData.stockNo" disabled placeholder="系统自动生成" class="!w-400px" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="whId" label="盘点仓库" required>
+                  <el-select v-model="formData.whId" placeholder="下拉选择" clearable disabled class="!w-400px"
+                    @change="handleWh">
+                    <el-option v-for="dict in whList" :key="dict.id" :label="dict.whName" :value="dict.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="status" label="单据状态">
+                  <el-select v-model="formData.status" placeholder="下拉选择" clearable class="!w-400px" disabled>
+                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)"
+                      :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="checkType" label="盘点类型">
+                  <el-select v-model="formData.checkType" clearable class="!w-400px" disabled>
+                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value"
+                      :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="排除库存为0的物料?" prop="noZero">
+                  <el-radio-group v-model="formData.noZero" disabled>
+                    <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value"
+                      :label="dict.value">
+                      {{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="盘点开始日期" prop="checkTime">
+                  <el-date-picker v-model="formData.checkTime" value-format="YYYY-MM-DD" type="date" disabled class="!w-220px" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="备注" prop="description">
+              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <!--  物料信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物料信息</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-col>
+                <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem">新增</el-button>
+              </el-col>
+              <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules"
+                v-loading="subFormLoading" label-width="0">
+                <el-table :data="formData.matItemDOList" class="hl-table">
+                  <el-table-column prop="cid" label="序号" :width="80" />
+                  <el-table-column prop="matId" min-width="140" align="center">
+                    <template #header> <span class="hl-table_header">*</span>物料名称 </template>
+                    <template #default="scope">
+                      <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
+                        <el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatCodeSearch"
+                          remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading"
+                          @change="(val) => handleMatCode(scope, val)" class="!w-180px">
+                          <el-option v-for="item in matList" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
+                  <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
+                    <template #default="scope">
+                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType"
+                        v-if="scope.row.matType ? true : false" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
+
+                  <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
+                    <template #default="scope">
+                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit"
+                        v-if="scope.row.matUnit ? true : false" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="rgId" min-width="120" align="center">
+                    <template #header> <span class="hl-table_header">*</span>出库库区 </template>
+                    <template #default="scope">
+                      <el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
+                        <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="handleRg(scope)"
+                          disabled="">
+                          <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rgName" :value="dict.id" />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="pnId" min-width="140" align="center">
+                    <template #header> <span class="hl-table_header">*</span>出库库位 </template>
+                    <template #default="scope">
+                      <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
+                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
+                          <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pnName"
+                            :value="dict.id" />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="matRest" label="库存数量" min-width="120" align="center" />
+                  <el-table-column prop="storageOkQty" min-width="120" align="center">
+                    <template #header> <span class="hl-table_header">*</span>出库数量</template>
+                    <template #default="scope">
+                      <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty"
+                        class="mb-0px!">
+                        <el-input v-model="scope.row.storageOkQty" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
+                  <el-table-column prop="description" min-width="180" label="备注" align="center">
+                    <template #default="scope">
+                      <el-input v-model="scope.row.description" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" align="center" width="240">
+                    <template #default="scope">
+                      <!-- <el-button v-if="!scope.row.editable" type="primary" size="small" link
+                        @click="handleEdit(scope.$index)">
+                        编辑
+                      </el-button>
+                      <el-button link v-else type="success" size="small" @click="handleSave(scope.$index)">
+                        保存
+                      </el-button>
+
+                      <el-button link type="primary" @click="handlefuke(scope.$index, scope.row)">复制</el-button> -->
+                      <el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)"
+                        v-if="isShowBtnDelete">
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+      <!--  附件信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-col>
+                <el-upload ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="uploadUrl"
+                  :headers="{
+                    Authorization: 'Bearer ' + getAccessToken(),
+                    'tenant-id': getTenantId()
+                  }" name="files" :show-file-list="false" :auto-upload="false" :data="matUploadData"
+                  :on-change="matUploadChange" class="upload-file-uploader">
+                  <el-button type="primary">
+                    <Icon icon="ep:upload-filled" />上传
+                  </el-button>
+                </el-upload>
+              </el-col>
+              <el-table :data="formData.attachments" class="hl-table">
+                <el-table-column prop="name" label="文件名称" align="center">
+                  <!-- <template #default="scope">
+                    <a :href="scope.row.url" target="_blank" style="color: #409eff">{{ scope.row.name }} </a>
+                  </template> -->
+                </el-table-column>
+
+                <el-table-column prop="createTime" align="center" label="上传日期" :formatter="dateFormatter" />
+
+                <el-table-column label="操作" align="center">
+                  <template #default="scope">
+                    <el-button link type="danger" size="small" v-if="isShowBtnDelete"
+                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)">
+                      删除
+                    </el-button>
+                    <el-button link type="primary" size="small"
+                      @click="downloadAttachment(scope.row.name, scope.row.url)">
+                      下载
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
+      <!--  系统信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
+        </template>
+
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="creator" label="创建人">
+              {{ userList.find((user) => user.id == formData.creator)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="createTime" label="创建时间">
+              {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="outbound" label="出库人">
+              {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="outboundTime" label="出库时间">
+              {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="cancel" label="作废人">
+              {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="cancelTime" label="作废时间">
+              {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-form>
+    <div class="text-center hl-footer">
+      <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
+      <el-button @click="submitForm" v-if="isShowBtnGroup" type="success" :disabled="formLoading" size="large">保
+        存</el-button>
+      <el-button @click="handleStatus(2)" v-if="isShowBtnGroup" type="primary" :disabled="formLoading" size="large">提
+        交</el-button>
+      <el-button @click="handleStatus(3)" v-if="isShowBtnCancel" type="danger" :disabled="formLoading" size="large">删
+        除</el-button>
+    </div>
+  </el-card>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useRoute } from 'vue-router'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
+
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import { useUserStore } from '@/store/modules/user'
+
+import * as CheckApi from '@/api/heli/storagecheck'
+import * as CheckMatApi from '@/api/heli/storagecheckmat'
+
+import * as UserApi from '@/api/system/user'
+import * as MatApi from '@/api/heli/material'
+import * as WhApi from '@/api/heli/warehouse'
+import * as RgApi from '@/api/heli/rg'
+import * as PnApi from '@/api/heli/pn'
+
+import type { UploadUserFile } from 'element-plus'
+import { deleteFile, downloadFile, getFilePage } from '@/api/infra/file'
+import download from '@/utils/download'
+
+const reload = inject('reload')
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { query } = useRoute()
+const router = useRouter()
+
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  stockNo: undefined,
+  checkType: undefined,
+  checkTime: undefined,
+  status:undefined,
+  noZero: undefined,
+  whId: undefined,
+  description: undefined,
+  creator: undefined,
+  createTime: undefined,
+  keeper: undefined,
+  keeperTime: undefined,
+  outbound: undefined,
+  outboundTime: undefined,
+  cancel: undefined,
+  cancelTime: undefined,
+  matItemDOList: [],
+  attachments: []
+})
+
+const formRules = reactive({
+  // name: [{ required: true, message: '模具类型不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }],
+  stockInType: [{ required: true, message: '出库类型不能为空', trigger: 'blur' }],
+  whId: [{ required: true, message: '出库仓库不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const matSubFormRef = ref() //子表单 Ref
+
+const subFormLoading = ref(false) // 子表单的加载中
+const subFormRules = reactive({
+  matId: [{ required: true, message: '物料不能为空', trigger: 'blur' }],
+  rgId: [{ required: true, message: '库区不能为空', trigger: 'blur' }],
+  pnId: [{ required: true, message: '库位不能为空', trigger: 'blur' }],
+  storageOkQty: [{ required: true, message: '盘点数量不能为空', trigger: 'blur' }]
+})
+const handleStatus = async (num) => {
+  // 校验表单
+  await formRef.value.validate()
+  if (formData.value.matItemDOList.length === 0) {
+    message.alertWarning('请添加物料信息!')
+    return
+  }
+  // 校验子表单
+  try {
+    await matSubFormRef.value.validate()
+  } catch (e) {
+    return
+  }
+  //保存表单数据
+  await saveFormData()
+
+  formData.value.status = num
+
+  const dataUpdate = formData.value as unknown as CheckApi.StorageVO
+  if (num == 2) {
+    dataUpdate.outbound = useUserStore().getUser.id
+  } else {
+    dataUpdate.cancel = useUserStore().getUser.id
+  }
+  await CheckApi.updateStorageStatus(dataUpdate)
+
+  message.success(t('common.updateSuccess'))
+
+  switch (num) {
+    case 1:
+      isShowBtnGroup.value = true
+      isShowBtnCancel.value = false
+      isShowBtnOther.value = true
+      isShowBtnDelete.value = true
+      break
+    case 2:
+      isShowBtnGroup.value = false
+      isShowBtnCancel.value = true
+      isShowBtnOther.value = false
+      isShowBtnDelete.value = false
+      break
+    case 3:
+      isShowBtnGroup.value = false
+      isShowBtnCancel.value = false
+      isShowBtnOther.value = false
+      isShowBtnDelete.value = false
+      break
+    default:
+      break
+  }
+  //查看页面不可以编辑
+  if (query.type === 'review') {
+    isShowBtnGroup.value = false
+    isShowBtnCancel.value = false
+    isShowBtnOther.value = false
+    isShowBtnDelete.value = false
+  }
+  query.id = storageid.value
+  query.type = 'update'
+  reload()
+}
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+
+// ====================附件信息 开始=======================================
+const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL)
+const matUploadRef = ref()
+const matUploadFiles = ref<UploadUserFile[]>([])
+const matUploadData = ref({
+  businessType: 'STORAGECHECK',
+  businessId: formData.value.id,
+  businessFileType: ''
+})
+const matUploadChange = (file, files) => {
+  matUploadFiles.value = files
+  refreshAttachments(files, '')
+}
+
+const refreshAttachments = (files, type) => {
+  formData.value.attachments = formData.value.attachments.filter((value, index, array) => {
+    return value.id
+  })
+  for (let i = 0; i < files.length; i++) {
+    let file = files[i]
+    file.businessFileType = type
+    file.createTime = new Date()
+    formData.value.attachments.push(file)
+  }
+  // 排序
+  formData.value.attachments.sort((v1, v2) => {
+    return v1.createTime - v2.createTime > 0
+  })
+}
+// 删除附件
+const handleDeleteAttachment = async (index, type) => {
+  const deletedAttachments = formData.value.attachments.splice(index, 1)
+  for (let i = 0; i < deletedAttachments.length; i++) {
+    const attachment = deletedAttachments[i]
+    if (attachment.id) {
+      // 清理已上传文件
+      await deleteFile(attachment.id)
+    }
+    // 清理待上传文件
+    matUploadFiles.value = matUploadFiles.value.filter((file1) => {
+      return file1.name != attachment.name || file1.businessFileType != type
+    })
+  }
+}
+// 下载文件
+const downloadAttachment = async (name, url) => {
+  if (url) {
+    const data = await downloadFile(url)
+    download.any(data, name)
+  }
+}
+// ====================附件信息 结束=======================================
+
+const storageid = ref()
+var commonResult = ''
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+
+const saveFormData = async () => {
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    //物料信息保存
+    formData.value.matItemDOList.forEach((item) => {
+      item.stockId = storageid.value
+      item.whId = formData.value.whId
+    })
+    const dataMats = formData.value.matItemDOList as unknown as CheckMatApi.StorageCheckMatVO[]
+    await CheckMatApi.createStorageMatBatch(dataMats, storageid.value)
+
+    if (formData.value.matItemDOList.length > 0) {
+      //附件信息保存
+      matUploadData.value.businessId = storageid
+      matUploadRef.value!.submit()
+    }
+    message.success(t(commonResult))
+  } finally {
+    formLoading.value = false
+  }
+}
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  if (formData.value.matItemDOList.length === 0) {
+    message.alertWarning('请添加物料信息!')
+    return
+  }
+  // 校验子表单
+  try {
+    await matSubFormRef.value.validate()
+  } catch (e) {
+    return
+  }
+  //保存表单数据
+  await saveFormData()
+  // 成功后刷新
+  query.id = storageid.value
+  query.type = 'update'
+  reload()
+}
+
+var matCount = 1
+const onAddItem = () => {
+  if (formData.value.whId) {
+    const newData = {
+      // 新数据的属性
+      cid: matCount,
+      stockId: 0,
+      matId: '',
+      matName: '',
+      matCode: '',
+      matType: '',
+      matSpec: '',
+      matUnit: '',
+      whId: '',
+      rgId: '',
+      pnId: '',
+      pnlist: ref([]),
+      storageOkQty: '',
+      lotNo: '',
+      description: '',
+      productBomItemValueDOList: []
+    }
+    matCount = matCount + 1
+
+    formData.value.matItemDOList.push(newData)
+  } else {
+    message.alertWarning('请选择出库仓库')
+  }
+}
+
+//删除新增物料信息
+const handleDelete2 = (index: number) => {
+  formData.value.matItemDOList.splice(index, 1)
+}
+
+//仓库全数据
+const warehouseList = ref([])
+//库区全数据
+var rgList = ref([])
+//库位全数据
+var pnList = ref([])
+const handleWh = async (wid) => {
+  //-------------------库区全数据
+  const queryParamsRg = reactive({
+    pageNo: 1,
+    pageSize: 99,
+    whId: wid
+  })
+  const dataRg = await RgApi.getRgPage(queryParamsRg)
+
+  rgList.value = []
+  pnList.value = []
+  rgList.value = dataRg.list
+
+  const matLastRemoteData = await CheckMatApi.getStorageMatList()
+
+  let matParams = {
+    pageNo: 1,
+    pageSize: 99,
+    status: '1'
+  }
+  const dataMat = await MatApi.getMaterialPage(matParams)
+  matList.value = []
+  matList.value = dataMat.list.filter(
+    (item) =>
+      matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
+  )
+
+  formData.value.matItemDOList = []
+  // formData.value.matItemDOList.forEach(item => {
+  //   item.rgId = ''
+  //   item.pnId = ''
+  //   item.pnlist.value = []
+  // })
+  //-------------------
+}
+const handleRg = async (scope) => {
+  //-------------------库位全数据
+  const queryParamsRPn = reactive({
+    pageNo: 1,
+    pageSize: 99,
+    rgId: scope.row.rgId,
+    pnStatus: 1
+  })
+  const dataPn = await PnApi.getPnPage(queryParamsRPn)
+  scope.row.pnid = ''
+  scope.row.pnlist = dataPn.list
+  //-------------------
+}
+
+const matList = ref<MatApi.MaterialVO[]>([]) // 物料列表
+const matSelectLoading = ref(false)
+const remoteMatCodeSearch = async (name) => {
+  matSelectLoading.value = true
+  // 获得用户列表
+  let matParams = {
+    pageNo: 1,
+    pageSize: 10,
+    name: name,
+    status: '1'
+  }
+
+  const matLastRemoteData = await CheckMatApi.getStorageMatList()
+
+  const dataMat = await MatApi.getMaterialPage(matParams)
+  matList.value = []
+  matList.value = dataMat.list.filter(
+    (item) =>
+      matLastRemoteData.find(
+        (fish) => fish.matId === item.id && fish.whId == formData.value.whId
+      ) !== undefined
+  )
+  matSelectLoading.value = false
+}
+
+const handleMatCode = async (scope, matid) => {
+  if (matid && matLastData.value.find((item) => item.matId === matid)) {
+    const matVo = matLastData.value.find((item) => item.matId === matid)
+    scope.row.matId = matVo.matId
+    scope.row.matName = matVo.matName
+    scope.row.matCode = matVo.matCode
+    scope.row.matSpec = matVo.matSpec
+    scope.row.matType = matVo.materialType
+    scope.row.matUnit = matVo.matUnit
+    scope.row.rgId = matVo.rgId
+    scope.row.pnId = matVo.pnId
+    scope.row.matRest = matVo.matRest
+    scope.row.storageOkQty = matVo.storageOkQty
+    scope.row.lotNo = matVo.lotNo
+    scope.row.description = matVo.description
+
+    const queryParamsRPn = reactive({
+      pageNo: 1,
+      pageSize: 99,
+      rgId: scope.row.rgId,
+      pnStatus: 1
+    })
+    const dataPn = await PnApi.getPnPage(queryParamsRPn)
+    scope.row.pnlist = dataPn.list
+  } else {
+    scope.row.matId = ''
+    scope.row.matName = ''
+    scope.row.matCode = ''
+    scope.row.matSpec = ''
+    scope.row.matType = ''
+    scope.row.matUnit = ''
+    scope.row.rgId = ''
+    scope.row.pnId = ''
+    scope.row.matRest = ''
+    scope.row.storageOkQty = ''
+    scope.row.lotNo = ''
+    scope.row.description = ''
+    scope.row.pnlist = []
+  }
+}
+
+const isShowBtnGroup = ref(true)
+const isShowBtnCancel = ref(false)
+const isShowBtnOther = ref(false)
+const isShowBtnDelete = ref(true)
+const btnWhClickable = ref(false)
+const matLastData = ref([])
+/** 初始化 **/
+onMounted(async () => {
+  btnWhClickable.value = query.type === 'update' ? true : false
+
+  matLastData.value = await CheckMatApi.getStorageMatList()
+
+  // 获得物料列表
+  let matParams = {
+    pageNo: 1,
+    pageSize: 99,
+    status: '1'
+  }
+  const dataMat = await MatApi.getMaterialPage(matParams)
+  matList.value = []
+  matList.value = dataMat.list
+
+  dialogTitle.value = t('action.' + query.type)
+  dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
+
+  //-------------------仓库全数据
+  const data = await WhApi.getWarehouseSimpList()
+  warehouseList.value = data
+  //-------------------
+  if (query.id) {
+    //获取库存信息
+    formData.value = await CheckApi.getStorage(query.id)
+
+    switch (formData.value.status) {
+      case 1:
+        isShowBtnGroup.value = true
+        isShowBtnCancel.value = false
+        isShowBtnDelete.value = true
+        break
+      case 2:
+        isShowBtnGroup.value = false
+        isShowBtnCancel.value = true
+        isShowBtnOther.value = false
+        isShowBtnDelete.value = false
+        break
+      case 3:
+        isShowBtnGroup.value = false
+        isShowBtnCancel.value = false
+        isShowBtnOther.value = false
+        isShowBtnDelete.value = false
+        break
+      default:
+        break
+    }
+    //查看页面不可以编辑
+    if (query.type === 'review') {
+      isShowBtnGroup.value = false
+      isShowBtnCancel.value = false
+      isShowBtnOther.value = false
+      isShowBtnDelete.value = false
+    }
+
+    //获得库区列表
+    const queryParamsRg = reactive({
+      pageNo: 1,
+      pageSize: 99,
+      status: 1,
+      whId: formData.value.whId
+    })
+    const dataRg = await RgApi.getRgPage(queryParamsRg)
+
+    rgList.value = []
+    rgList.value = dataRg.list
+    //获得库区列表
+    const queryParamsPn = reactive({
+      pageNo: 1,
+      pageSize: 99
+    })
+    const dataPn = await PnApi.getPnPage(queryParamsPn)
+
+    pnList.value = []
+    pnList.value = dataPn.list
+
+    //获取库存物料列表信息
+    const queryParamsMat = reactive({
+      pageNo: 1,
+      pageSize: 99,
+      stockId: query.id
+    })
+    const dataMats = await CheckMatApi.getStorageMatPage(queryParamsMat)
+    formData.value.matItemDOList = dataMats.list
+
+    //获取原始物料信息
+    const queryParamsMat2 = reactive({
+      pageNo: 1,
+      pageSize: 99,
+      status: 1
+    })
+    const matVos = await MatApi.getMaterialPage(queryParamsMat2)
+
+    formData.value.matItemDOList.forEach((item) => {
+      item.cid = matCount
+      item.matId = matVos.list.find((record) => record.id === item.matId)?.id
+      //item.matCode = matVos.list.find( (record) => record.id === item.matId)?.id
+      item.matCode = matVos.list.find((record) => record.id == item.matId)?.code
+      item.matSpec = matVos.list.find((record) => record.id == item.matId)?.spec
+      item.matType = matVos.list.find((record) => record.id == item.matId)?.materialType
+      item.matUnit = matVos.list.find((record) => record.id == item.matId)?.unit
+      item.pnlist = pnList.value.filter((pn) => pn.rgId == item.rgId)
+      item.matRest = matLastData.value.find(
+        (rest) => rest.rgId == item.rgId && rest.pnId == item.pnId
+      )?.matRest
+      item.matRest = item.matRest == undefined ? 0 : item.matRest
+      matCount = matCount + 1
+
+      // item = matLastData.value.find((rest) => rest.rgId === item.rgId && rest.pnId === item.pnId)
+      // item.pnlist = pnList.value.filter((pn) => pn.rgId === item.rgId)
+      // item.cid = matCount
+      // matCount = matCount + 1
+    })
+
+    // 附件信息
+    let attParams = {
+      pageNo: 1,
+      pageSize: 99,
+      businessId: query.id,
+      businessType: 'STORAGE'
+    }
+    formData.value.attachments = (await getFilePage(attParams)).list
+  }
+
+  //用户信息
+  userList.value = await UserApi.getSimpleUserList()
+})
+</script>
+<style>
+a {
+  color: #409eff;
+  text-decoration: none;
+}
+</style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
index 7e9feee5..4b3d4786 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
@@ -53,7 +53,7 @@
           {{ whList.find((tag) => tag.id === scope.row.whId)?.wh_name }}
         </template>
       </el-table-column>
-      <el-table-column label="盘点开始时间" align="center" prop="checkTime"  width="180px">
+      <el-table-column label="盘点开始时间" align="center" prop="checkTime" width="180px">
         <template #default="scope">
           <span>{{ formatDate(scope.row.checkTime, 'YYYY-MM-DD') }}</span>
         </template>
@@ -70,12 +70,11 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button link type="primary" @click="openForm('update', scope.row.id)"
-            v-hasPermi="['heli:storage-check:update']">
+          <el-button link type="primary" @click="openDetail('update', scope.row.id)">
             编辑
           </el-button>
-          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['heli:storage-check:delete']">
-            删除
+          <el-button link type="primary" @click="openDetail('review', scope.row.id)">
+            查看
           </el-button>
         </template>
       </el-table-column>
@@ -99,6 +98,7 @@ import * as WarehouseApi from '@/api/heli/warehouse'
 
 defineOptions({ name: 'StorageCheck' })
 
+const router = useRouter() // 路由
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -163,6 +163,11 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
+/** 详情操作 新增/查看 */
+const openDetail = (active: string, id?: number) => {
+  router.push({ path: '/inventory/check', query: { type: active, id: id } })
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
diff --git a/sql/v1.2.0/1.structure.sql b/sql/v1.2.0/1.structure.sql
index ecc5bec2..92672206 100644
--- a/sql/v1.2.0/1.structure.sql
+++ b/sql/v1.2.0/1.structure.sql
@@ -109,7 +109,7 @@ CREATE TABLE `wms_storage_check_mat` (
                                          PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=122 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='盘点物料表';
 
-CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_storage_material_log` AS
+CREATE OR REPLACE VIEW v_storage_material_log AS
 select 0 AS `deleted`,`lg`.`id` AS `id`,`lg`.`creator` AS `creator`,`lg`.`create_time` AS `create_time`,`lg`.`updater` AS `updater`,`lg`.`update_time` AS `update_time`,
        `lg`.`tenant_id` AS `tenant_id`,`lg`.`status` AS `status`,`mat`.`code` AS `mat_code`,`mat`.`name` AS `mat_name`,
        (select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_material_type') and (`system_dict_data`.`value` = `mat`.`material_type`))) AS `mat_type`,
@@ -129,7 +129,7 @@ from (((((`wms_storage_log` `lg`
     left join `wms_pn` `pn` on((`lg`.`pn_id` = `pn`.`id`)))
 where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0));
 
-CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_storage_material_now` AS
+CREATE OR REPLACE VIEW v_storage_material_now AS
 select `t`.`deleted` AS `deleted`,`t`.`id` AS `id`,`t`.`creator` AS `creator`,`t`.`create_time` AS `create_time`,`t`.`updater` AS `updater`,`t`.`update_time` AS `update_time`,`t`.`tenant_id` AS `tenant_id`,
        `t`.`mat_code` AS `mat_code`,`t`.`mat_name` AS `mat_name`,`t`.`mat_type` AS `mat_type`,`t`.`mat_spec` AS `mat_spec`,`t`.`mat_unit` AS `mat_unit`,`t`.`mat_brand` AS `mat_brand`,
        `t`.`wh_id` AS `wh_id`,`t`.`wh_name` AS `wh_name`,`t`.`rg_id` AS `rg_id`,`t`.`rg_name` AS `rg_name`,`t`.`pn_id` AS `pn_id`,`t`.`pn_name` AS `pn_name`,`t`.`lot_no` AS `lot_no`,`t`.`short_name` AS `short_name`,
@@ -144,4 +144,17 @@ from (
         `wh`.`id` AS `wh_id`,`wh`.`wh_name` AS `wh_name`,`rg`.`id` AS `rg_id`,`rg`.`rg_name` AS `rg_name`,`pn`.`id` AS `pn_id`,`pn`.`pn_name` AS `pn_name`,
         (case when (isnull(`lg`.`lot_no`) = 1) then '' else `lg`.`lot_no` end) AS `lot_no`,(case when ((`st`.`stock_type` = 1) and (`lg`.`status` = 2)) then `lg`.`storage_ok_qty` when ((`st`.`stock_type` = 1) and (`lg`.`status` = 3)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 2)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 3)) then `lg`.`storage_ok_qty` else `lg`.`storage_ok_qty` end) AS `storage_ok_qty`
         from (((((`mes-heli`.`wms_storage_log` `lg` left join `mes-heli`.`wms_storage` `st` on((`lg`.`stock_id` = `st`.`id`))) left join `mes-heli`.`base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`))) left join `mes-heli`.`wms_wh` `wh` on((`lg`.`wh_id` = `wh`.`id`))) left join `mes-heli`.`wms_rg` `rg` on((`lg`.`rg_id` = `rg`.`id`))) left join `mes-heli`.`wms_pn` `pn` on((`lg`.`pn_id` = `pn`.`id`))) where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0))) `t`
-group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`create_time`,`t`.`updater`,`t`.`update_time`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`mat_type`,`t`.`mat_spec`,`t`.`mat_unit`,`t`.`mat_brand`,`t`.`wh_id`,`t`.`wh_name`,`t`.`rg_id`,`t`.`rg_name`,`t`.`pn_id`,`t`.`pn_name`,`t`.`lot_no`,`t`.`short_name`;
\ No newline at end of file
+group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`create_time`,`t`.`updater`,`t`.`update_time`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`mat_type`,`t`.`mat_spec`,`t`.`mat_unit`,`t`.`mat_brand`,`t`.`wh_id`,`t`.`wh_name`,`t`.`rg_id`,`t`.`rg_name`,`t`.`pn_id`,`t`.`pn_name`,`t`.`lot_no`,`t`.`short_name`;
+
+
+CREATE OR REPLACE  VIEW v_storage_material_amount AS
+select `t`.`tenant_id` AS `tenant_id`,`t`.`mat_id` AS `mat_id`,`t`.`mat_name` AS `mat_name`,`t`.`mat_code` AS `mat_code`,`t`.`wh_id` AS `wh_id`,`t`.`rg_id` AS `rg_id`,`t`.`pn_id` AS `pn_id`,
+       `t`.`spec` AS `spec`,`t`.`unit` AS `unit`,`t`.`material_type` AS `material_type`,`t`.`lot_no` AS `lot_no`,'' AS `storage_ok_qty`,sum(`t`.`storage_ok_qty`) AS `mat_rest`
+from (
+         select `st`.`stock_type` AS `stock_type`,`mat`.`tenant_id` AS `tenant_id`,`mat`.`mat_id` AS `mat_id`,`bm`.`code` AS `mat_code`,`bm`.`name` AS `mat_name`,`mat`.`wh_id` AS `wh_id`,`mat`.`rg_id` AS `rg_id`,`mat`.`pn_id` AS `pn_id`,`mat`.`lot_no` AS `lot_no`,`bm`.`spec` AS `spec`,`bm`.`unit` AS `unit`,`bm`.`material_type` AS `material_type`,
+                (case when ((`st`.`status` = 2) and (`st`.`stock_type` = 1)) then `mat`.`storage_ok_qty` when ((`st`.`status` = 3) and (`st`.`stock_type` = 1)) then (-(1) * `mat`.`storage_ok_qty`) when ((`st`.`status` = 2) and (`st`.`stock_type` = 2)) then (-(1) * `mat`.`storage_ok_qty`) when ((`st`.`status` = 3) and (`st`.`stock_type` = 2)) then `mat`.`storage_ok_qty` else 0 end) AS `storage_ok_qty`
+         from ((`mes-heli`.`wms_storage_mat` `mat`
+             left join `mes-heli`.`wms_storage` `st` on((`mat`.`stock_id` = `st`.`id`)))
+             left join `mes-heli`.`base_material` `bm` on((`mat`.`mat_id` = `bm`.`id`)))
+         where ((`mat`.`deleted` = 0) and (`st`.`status` <> 1) and (`st`.`deleted` = 0) and (`bm`.`deleted` = 0) and (`bm`.`status` = 1))
+     ) `t` group by `t`.`mat_id`;
\ No newline at end of file

From 9bcc75500490a87e72e1b8fe498450e79c17b784 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 29 Jan 2024 17:49:10 +0800
Subject: [PATCH 44/64] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=86=85=E5=AD=97=E5=85=B8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index a7dc20bd..cefdfaf9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -244,3 +244,8 @@
   background-color: transparent;
   border: none;
 }
+.sizestylenone{
+  background-color: transparent;
+  border: none;
+  color: var(--el-table-text-color);
+}
\ No newline at end of file

From a350f19ecce26042432bf8f7eaf6994803dc7166 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 29 Jan 2024 18:08:33 +0800
Subject: [PATCH 45/64] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E3=80=91=E5=8F=91=E8=B4=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A1=B9=E7=9B=AE=E5=BC=B9=E7=AA=97=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectorder/ProjectOrderMapper.java      |   1 +
 .../heli/deliverorder/DeliverOrderForm.vue    | 227 ---------------
 .../components/DeliverOrderSubForm.vue        | 191 -------------
 .../src/views/heli/deliverorder/detail.vue    |  13 +-
 .../src/views/heli/deliverorder/index.vue     |   3 -
 .../heli/deliverorder/projectOrderDialog.vue  | 266 ++++++++++++++++++
 6 files changed, 279 insertions(+), 422 deletions(-)
 delete mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/DeliverOrderForm.vue
 delete mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
index be4bde63..6d28c27f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
@@ -33,6 +33,7 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
                 .like(!StringUtils.isEmpty(reqVO.getCustomerName()), "e.name", reqVO.getCustomerName())
                 .like(!StringUtils.isEmpty(reqVO.getBusinessManName()), "u.nickname", reqVO.getBusinessManName())
                 .like(!StringUtils.isEmpty(reqVO.getMouldName()), ProjectOrderDO::getMouldName, reqVO.getMouldName())
+                .like(!StringUtils.isEmpty(reqVO.getContractNo()), ProjectOrderDO::getContractNo, reqVO.getContractNo())
                 .eq(reqVO.getHasPrice() != null, ProjectOrderDO::getHasPrice, reqVO.getHasPrice())
                 .eq(reqVO.getOrderStatus() != null, ProjectOrderDO::getOrderStatus, reqVO.getOrderStatus())
                 .eq(reqVO.getDeliveryStatus() != null, ProjectOrderDO::getDeliveryStatus, reqVO.getDeliveryStatus())
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/DeliverOrderForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/DeliverOrderForm.vue
deleted file mode 100644
index 4131e688..00000000
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/DeliverOrderForm.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="编号，唯一" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入编号，唯一" />
-      </el-form-item>
-      <el-form-item label="销售订单id列表 多个用英文逗号分割" prop="saleOrderIds">
-        <el-input v-model="formData.saleOrderIds" placeholder="请输入销售订单id列表 多个用英文逗号分割" />
-      </el-form-item>
-      <el-form-item label="客户id" prop="customerId">
-        <el-input v-model="formData.customerId" placeholder="请输入客户id" />
-      </el-form-item>
-      <el-form-item label="发货日期" prop="deliverDate">
-        <el-date-picker
-          v-model="formData.deliverDate"
-          type="date"
-          value-format="x"
-          placeholder="选择发货日期"
-        />
-      </el-form-item>
-      <el-form-item label="发货单状态 已保存/已发货" prop="deliverStatus">
-        <el-select v-model="formData.deliverStatus" placeholder="请选择发货单状态 已保存/已发货">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DELIVER_ORDER_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="发货人" prop="deliverPerson">
-        <el-input v-model="formData.deliverPerson" placeholder="请输入发货人" />
-      </el-form-item>
-      <el-form-item label="发货人电话" prop="deliverPersonMobile">
-        <el-input v-model="formData.deliverPersonMobile" placeholder="请输入发货人电话" />
-      </el-form-item>
-      <el-form-item label="发货方式" prop="deliverMode">
-        <el-select v-model="formData.deliverMode" placeholder="请选择发货方式">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="收货人电话" prop="receivePersonMobile">
-        <el-input v-model="formData.receivePersonMobile" placeholder="请输入收货人电话" />
-      </el-form-item>
-      <el-form-item label="司机姓名" prop="transportDriverName">
-        <el-input v-model="formData.transportDriverName" placeholder="请输入司机姓名" />
-      </el-form-item>
-      <el-form-item label="司机电话" prop="transportDriverMobile">
-        <el-input v-model="formData.transportDriverMobile" placeholder="请输入司机电话" />
-      </el-form-item>
-      <el-form-item label="车牌号" prop="transportBusNumber">
-        <el-input v-model="formData.transportBusNumber" placeholder="请输入车牌号" />
-      </el-form-item>
-      <el-form-item label="重量(T)" prop="transportWeight">
-        <el-input v-model="formData.transportWeight" placeholder="请输入重量(T)" />
-      </el-form-item>
-      <el-form-item label="位置(米)" prop="transportSize">
-        <el-input v-model="formData.transportSize" placeholder="请输入位置(米)" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
-      </el-form-item>
-      <el-form-item label="状态,1表示正常，2表示禁用" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio label="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="收货人姓名" prop="receivePersonName">
-        <el-input v-model="formData.receivePersonName" placeholder="请输入收货人姓名" />
-      </el-form-item>
-      <el-form-item label="收货详细地址" prop="receiveAddress">
-        <el-input v-model="formData.receiveAddress" placeholder="请输入收货详细地址" />
-      </el-form-item>
-    </el-form>
-    <!-- 子表的表单 -->
-    <el-tabs v-model="subTabsName">
-      <el-tab-pane label="发货订单子项" name="deliverOrderSub">
-        <DeliverOrderSubForm ref="deliverOrderSubFormRef" :delivery-order-id="formData.id" />
-      </el-tab-pane>
-    </el-tabs>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import {getStrDictOptions, DICT_TYPE, getIntDictOptions} from '@/utils/dict'
-import * as DeliverOrderApi from '@/api/heli/deliverorder'
-import DeliverOrderSubForm from './components/DeliverOrderSubForm.vue'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  code: undefined,
-  saleOrderIds: undefined,
-  customerId: undefined,
-  deliverDate: undefined,
-  deliverStatus: undefined,
-  deliverPerson: undefined,
-  deliverPersonMobile: undefined,
-  deliverMode: undefined,
-  receivePersonMobile: undefined,
-  transportDriverName: undefined,
-  transportDriverMobile: undefined,
-  transportBusNumber: undefined,
-  transportWeight: undefined,
-  transportSize: undefined,
-  remark: undefined,
-  status: undefined,
-  receivePersonName: undefined,
-  receiveAddress: undefined,
-})
-const formRules = reactive({
-  code: [{ required: true, message: '编号，唯一不能为空', trigger: 'blur' }],
-  saleOrderIds: [{ required: true, message: '销售订单id列表 多个用英文逗号分割不能为空', trigger: 'blur' }],
-  customerId: [{ required: true, message: '客户id不能为空', trigger: 'blur' }],
-  deliverDate: [{ required: true, message: '发货日期不能为空', trigger: 'blur' }],
-  deliverStatus: [{ required: true, message: '发货单状态 已保存/已发货不能为空', trigger: 'change' }],
-  deliverPerson: [{ required: true, message: '发货人不能为空', trigger: 'blur' }],
-  deliverPersonMobile: [{ required: true, message: '发货人电话不能为空', trigger: 'blur' }],
-  deliverMode: [{ required: true, message: '发货方式不能为空', trigger: 'change' }],
-  receivePersonMobile: [{ required: true, message: '收货人电话不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
-  receivePersonName: [{ required: true, message: '收货人姓名不能为空', trigger: 'blur' }],
-  receiveAddress: [{ required: true, message: '收货详细地址不能为空', trigger: 'blur' }],
-})
-const formRef = ref() // 表单 Ref
-
-/** 子表的表单 */
-const subTabsName = ref('deliverOrderSub')
-const deliverOrderSubFormRef = ref()
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await DeliverOrderApi.getDeliverOrder(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 校验子表单
-  try {
-    await deliverOrderSubFormRef.value.validate()
-  } catch (e) {
-    subTabsName.value = 'deliverOrderSub'
-    return
-  }
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as DeliverOrderApi.DeliverOrderVO
-    // 拼接子表的数据
-    data.deliverOrderSubs = deliverOrderSubFormRef.value.getData()
-    if (formType.value === 'create') {
-      await DeliverOrderApi.createDeliverOrder(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await DeliverOrderApi.updateDeliverOrder(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    code: undefined,
-    saleOrderIds: undefined,
-    customerId: undefined,
-    deliverDate: undefined,
-    deliverStatus: undefined,
-    deliverPerson: undefined,
-    deliverPersonMobile: undefined,
-    deliverMode: undefined,
-    receivePersonMobile: undefined,
-    transportDriverName: undefined,
-    transportDriverMobile: undefined,
-    transportBusNumber: undefined,
-    transportWeight: undefined,
-    transportSize: undefined,
-    remark: undefined,
-    status: undefined,
-    receivePersonName: undefined,
-    receiveAddress: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
deleted file mode 100644
index 226f4ae4..00000000
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/components/DeliverOrderSubForm.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
-  <el-form
-    ref="formRef"
-    :model="formData"
-    :rules="subFormRules"
-    v-loading="formLoading"
-    label-width="0px"
-    :inline-message="true"
-  >
-    <el-table :data="formData" class="-mt-10px">
-      <el-table-column label="序号" type="index" width="100" />
-       <el-table-column label="业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.category`" :rules="subFormRules.category" class="mb-0px!">
-            <el-select v-model="row.category" placeholder="请选择业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_LIST_TYPE)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-            </el-select>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="名称，唯一" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.name`" :rules="subFormRules.name" class="mb-0px!">
-            <el-input v-model="row.name" placeholder="请输入名称，唯一" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="图号" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.blueprintNo`" :rules="subFormRules.blueprintNo" class="mb-0px!">
-            <el-input v-model="row.blueprintNo" placeholder="请输入图号" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="数量" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.amount`" :rules="subFormRules.amount" class="mb-0px!">
-            <el-input v-model="row.amount" placeholder="请输入数量" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.unit`" :rules="subFormRules.unit" class="mb-0px!">
-            <el-select v-model="row.unit" placeholder="请选择单位">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-            </el-select>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="重量(T)" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.weight`" :rules="subFormRules.weight" class="mb-0px!">
-            <el-input v-model="row.weight" placeholder="请输入重量(T)" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="尺寸(米)" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.size`" :rules="subFormRules.size" class="mb-0px!">
-            <el-input v-model="row.size" placeholder="请输入尺寸(米)" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="子项类型" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.subType`" :rules="subFormRules.subType" class="mb-0px!">
-            <el-select v-model="row.subType" placeholder="请选择子项类型">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MATERIAL_TYPE)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-            </el-select>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.remark`" :rules="subFormRules.remark" class="mb-0px!">
-            <el-input v-model="row.remark" placeholder="请输入备注" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态,1表示正常，2表示禁用" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.status`" :rules="subFormRules.status" class="mb-0px!">
-            <el-radio-group v-model="row.status">
-                <el-radio label="1">请选择字典生成</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" fixed="right" label="操作" width="60">
-        <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-form>
-  <el-row justify="center" class="mt-3">
-    <el-button @click="handleAdd" round>+ 添加发货订单子项</el-button>
-  </el-row>
-</template>
-<script setup lang="ts">
-import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as DeliverOrderApi from '@/api/heli/deliverorder'
-
-const props = defineProps<{
-  deliveryOrderId: undefined // 订单id（主表的关联字段）
-}>()
-const formLoading = ref(false) // 表单的加载中
-const formData = ref([])
-const subFormRules = reactive({
-  deliveryOrderId: [{ required: true, message: '订单id不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST不能为空', trigger: 'change' }],
-  name: [{ required: true, message: '名称，唯一不能为空', trigger: 'blur' }],
-  amount: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
-  unit: [{ required: true, message: '单位不能为空', trigger: 'change' }],
-  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
-})
-const formRef = ref() // 表单 Ref
-
-/** 监听主表的关联字段的变化，加载对应的子表数据 */
-watch(
-  () => props.deliveryOrderId,
-  async (val) => {
-    // 1. 重置表单
-    formData.value = []
-    // 2. val 非空，则加载数据
-    if (!val) {
-      return;
-    }
-    try {
-      formLoading.value = true
-      formData.value = await DeliverOrderApi.getDeliverOrderSubListByDeliveryOrderId(val)
-    } finally {
-      formLoading.value = false
-    }
-  },
-  { immediate: true }
-)
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  const row = {
-    id: undefined,
-    deliveryOrderId: undefined,
-    category: undefined,
-    name: undefined,
-    blueprintNo: undefined,
-    amount: undefined,
-    unit: undefined,
-    weight: undefined,
-    size: undefined,
-    subType: undefined,
-    remark: undefined,
-    status: undefined,
-  }
-  row.deliveryOrderId = props.deliveryOrderId
-  formData.value.push(row)
-}
-
-/** 删除按钮操作 */
-const handleDelete = (index) => {
-  formData.value.splice(index, 1)
-}
-
-/** 表单校验 */
-const validate = () => {
-  return formRef.value.validate()
-}
-
-/** 表单值 */
-const getData = () => {
-  return formData.value
-}
-
-defineExpose({ validate, getData })
-</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
index 91e62084..786c6934 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
@@ -25,7 +25,7 @@
           <el-col :span="6">
             <el-form-item label="项目编号" prop="saleOrderIds">
               <el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号" >
-                <template #append><el-button :icon="Search" /></template>
+                <template #append><el-button @click="openProjectOrderDialog" :icon="Search" /></template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -418,6 +418,7 @@
       >
     </div>
   </el-card>
+  <ProjectOrderDialog ref="projectOrderDialog" @success="handleSelectedProjectOrder" />
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
@@ -434,6 +435,7 @@ import {getAccessToken, getTenantId} from "@/utils/auth";
 import {dateFormatter} from "@/utils/formatTime";
 import download from "@/utils/download";
 import { inject } from 'vue'
+import {ProjectOrderVO} from "@/api/heli/projectorder";
 const reload = inject('reload')
 
 const { t } = useI18n() // 国际化
@@ -732,6 +734,15 @@ const queryData = async (type: string, id?: number) => {
   }
 }
 
+const projectOrderDialog = ref()
+const openProjectOrderDialog = () => {
+  projectOrderDialog.value.open()
+}
+
+const handleSelectedProjectOrder = (val: ProjectOrderVO[]) => {
+  console.log(val)
+}
+
 onMounted(() => {
   queryData(query.active, query.id)
 })
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
index ae933052..254a4eda 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
@@ -155,8 +155,6 @@
     />
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <DeliverOrderForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
@@ -164,7 +162,6 @@ import {getStrDictOptions, DICT_TYPE, getIntDictOptions} from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as DeliverOrderApi from '@/api/heli/deliverorder'
-import DeliverOrderForm from './DeliverOrderForm.vue'
 
 defineOptions({ name: 'DeliverOrder' })
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue
new file mode 100644
index 00000000..2e3f5373
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue
@@ -0,0 +1,266 @@
+<template>
+  <Dialog :title="dialogTitle" width="80%" v-model="dialogVisible" center>
+    <ContentWrap class="borderxx">
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="108px"
+      >
+        <el-form-item label="项目编号" prop="code">
+          <el-input
+            v-model="queryParams.code"
+            placeholder="请输入项目编号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="合同号" prop="contractNo">
+          <el-input
+            v-model="queryParams.contractNo"
+            placeholder="请输入项目编号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="客户名称" prop="customerName">
+          <el-input
+            v-model="queryParams.customerName"
+            placeholder="请输入客户名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary"
+          ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
+          >
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+    <el-card class="hl-card">
+      <!-- 列表 -->
+      <ContentWrap>
+        <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          class="hl-table"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column fixed type="selection" width="40"/>
+          <el-table-column fixed label="序号" type="index" width="60" />
+          <el-table-column fixed label="项目编号" align="center" prop="code" width="240" />
+          <el-table-column
+            fixed
+            label="订单日期"
+            align="center"
+            prop="orderTime"
+            :formatter="dateFormatter2"
+            width="180"
+          />
+          <el-table-column label="提出部门" align="center" prop="businessDeptName" width="150" />
+          <el-table-column label="业务员" align="center" prop="businessManName" width="150" />
+          <el-table-column label="客户名称" align="center" prop="customerName" width="240" />
+          <el-table-column label="合同编号" align="center" prop="contractNo" width="180" />
+          <el-table-column label="模具名称" align="center" prop="mouldName" width="180" />
+          <el-table-column label="所属业务线" align="center" prop="businessLine" width="150">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_BUSINESS_LINE" :value="scope.row.businessLine" />
+            </template>
+          </el-table-column>
+          <el-table-column label="是否有价格" align="center" prop="hasPrice" width="150">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.hasPrice" />
+            </template>
+          </el-table-column>
+          <el-table-column label="价格（元）" align="center" prop="price" width="150" />
+          <el-table-column label="币种" align="center" prop="currency" width="150">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_CURRENCY" :value="scope.row.currency" />
+            </template>
+          </el-table-column>
+          <el-table-column label="是否紧急" align="center" prop="isUrgency" width="150">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.isUrgency" />
+            </template>
+          </el-table-column>
+          <el-table-column label="性质" align="center" prop="property" width="120">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_PROJECT_PROPERTY" :value="scope.row.property" />
+            </template>
+          </el-table-column>
+          <el-table-column label="起止日期" align="center" prop="projectStartTime" width="260">
+            <template #default="scope">
+              {{
+                formatDate(scope.row.projectStartTime, 'YYYY-MM-DD') +
+                '~' +
+                formatDate(scope.row.projectEndTime, 'YYYY-MM-DD')
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="是否已变更" align="center" prop="hasAlter" width="150">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.hasAlter" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="单据状态"
+            align="center"
+            prop="orderStatus"
+            fixed="right"
+            width="120"
+          >
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_PROJECT_ORDER_STATUS" :value="scope.row.orderStatus" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="发货状态"
+            align="center"
+            prop="deliveryStatus"
+            fixed="right"
+            width="120"
+          >
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_DELIVERY_STATUS" :value="scope.row.deliveryStatus" />
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页 -->
+        <Pagination
+          :total="total"
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </ContentWrap>
+    </el-card>
+    <template #footer>
+      <el-button @click="dialogVisible=false" size="large">取 消</el-button>
+      <el-button @click="submitForm" type="success" size="large">保 存</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter, dateFormatter2, formatDate } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ProjectOrderApi from '@/api/heli/projectorder'
+import {ref} from "vue";
+import {ProjectOrderVO} from "@/api/heli/projectorder";
+
+defineOptions({ name: 'ProjectOrder' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const router = useRouter()
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  contractNo: undefined,
+  code: undefined,
+  orderStatus: undefined,
+  deliveryStatus: undefined,
+  businessDeptId: undefined,
+  customerName: undefined,
+  mouldName: undefined,
+  businessLine: undefined,
+  blueprintNo: undefined,
+  hasPrice: undefined,
+  price: undefined,
+  currency: undefined,
+  projectStartTime: [],
+  projectEndTime: [],
+  isUrgency: undefined,
+  property: undefined,
+  referenceTechnology: undefined,
+  hasAlter: undefined,
+  lastAlterTime: [],
+  qualityRequirement: undefined,
+  remark: undefined,
+  hasContract: undefined,
+  hasTechnologyProtocol: undefined,
+  hasBlueprint: undefined,
+  blueprintRemark: undefined,
+  status: undefined,
+  createTime: [],
+  businessManName: undefined,
+  isSnapshot: 0,
+  snapshotId: undefined,
+  snapshotCode: undefined,
+  orderTime: [],
+  snapshotOrderTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProjectOrderApi.getProjectOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const multipleSelection = ref<ProjectOrderVO[]>([])
+const handleSelectionChange = (val: ProjectOrderVO[]) => {
+  multipleSelection.value = val
+}
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = () => {
+  if(!multipleSelection.value || multipleSelection.value.length <= 0){
+    message.warning(t('common.selectText'))
+    return
+  }
+  // 必须为统一客户
+  const customerId = multipleSelection.value[0].customerId;
+  const hasExceptionCustomer = multipleSelection.value.some(order => customerId != order.customerId);
+  if(hasExceptionCustomer){
+    message.warning("只能选择同一客户订单")
+    return;
+  }
+  dialogVisible.value = false
+  // 发送操作成功的事件
+  emit('success', multipleSelection.value)
+}
+
+/** 打开弹窗 */
+const open = async () => {
+  dialogVisible.value = true
+  handleQuery()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
+

From 413d0adf4ecc244f2f0b92375aef347fe4b210a8 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 29 Jan 2024 18:18:25 +0800
Subject: [PATCH 46/64] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存盘点
---
 .../views/heli/storagecheck/checkdetail.vue   | 356 +++---------------
 1 file changed, 54 insertions(+), 302 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
index 130951bb..f6730b73 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
@@ -74,7 +74,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="盘点开始日期" prop="checkTime">
-                  <el-date-picker v-model="formData.checkTime" value-format="YYYY-MM-DD" type="date" disabled class="!w-220px" />
+                  <el-date-picker v-model="formData.checkTime" value-format="YYYY-MM-DD" type="date" disabled
+                    class="!w-220px" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -103,46 +104,24 @@
                 v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.matItemDOList" class="hl-table">
                   <el-table-column prop="cid" label="序号" :width="80" />
-                  <el-table-column prop="matId" min-width="140" align="center">
-                    <template #header> <span class="hl-table_header">*</span>物料名称 </template>
-                    <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
-                        <el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatCodeSearch"
-                          remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading"
-                          @change="(val) => handleMatCode(scope, val)" class="!w-180px">
-                          <el-option v-for="item in matList" :key="item.id" :label="item.name" :value="item.id" />
-                        </el-select>
-                      </el-form-item>
-                    </template>
-                  </el-table-column>
                   <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
-                  <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
-                    <template #default="scope">
-                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType"
-                        v-if="scope.row.matType ? true : false" />
-                    </template>
-                  </el-table-column>
+                  <el-table-column prop="matName" label="物料名称" min-width="140" align="center" />
+                  <el-table-column prop="matType" label="物料类型" min-width="120" align="center" />
+                  <el-table-column prop="shortName" label="物料简称" min-width="120" align="center" />
                   <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
-
-                  <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
-                    <template #default="scope">
-                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit"
-                        v-if="scope.row.matUnit ? true : false" />
-                    </template>
-                  </el-table-column>
+                  <el-table-column prop="matBrand" label="品牌" min-width="120" align="center" />
                   <el-table-column prop="rgId" min-width="120" align="center">
-                    <template #header> <span class="hl-table_header">*</span>出库库区 </template>
+                    <template #header> <span class="hl-table_header">*</span>库区 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
-                        <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="handleRg(scope)"
-                          disabled="">
+                        <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="handleRg(scope)">
                           <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rgName" :value="dict.id" />
                         </el-select>
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column prop="pnId" min-width="140" align="center">
-                    <template #header> <span class="hl-table_header">*</span>出库库位 </template>
+                    <template #header> <span class="hl-table_header">*</span>库位 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
                         <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
@@ -152,9 +131,10 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
+                  <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
                   <el-table-column prop="matRest" label="库存数量" min-width="120" align="center" />
                   <el-table-column prop="storageOkQty" min-width="120" align="center">
-                    <template #header> <span class="hl-table_header">*</span>出库数量</template>
+                    <template #header> <span class="hl-table_header">*</span>盘点数量</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty"
                         class="mb-0px!">
@@ -162,27 +142,14 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
-                  <el-table-column prop="description" min-width="180" label="备注" align="center">
-                    <template #default="scope">
-                      <el-input v-model="scope.row.description" />
-                    </template>
-                  </el-table-column>
+                  <el-table-column prop="matUnit" label="库存单位" min-width="120" align="center" />
                   <el-table-column label="操作" align="center" width="240">
                     <template #default="scope">
-                      <!-- <el-button v-if="!scope.row.editable" type="primary" size="small" link
-                        @click="handleEdit(scope.$index)">
-                        编辑
-                      </el-button>
-                      <el-button link v-else type="success" size="small" @click="handleSave(scope.$index)">
-                        保存
-                      </el-button>
-
-                      <el-button link type="primary" @click="handlefuke(scope.$index, scope.row)">复制</el-button> -->
                       <el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)"
                         v-if="isShowBtnDelete">
                         删除
                       </el-button>
+                      <el-button link type="primary" @click="handleCopy(scope.$index, scope.row)">复制</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -328,7 +295,7 @@ const formData = ref({
   stockNo: undefined,
   checkType: undefined,
   checkTime: undefined,
-  status:undefined,
+  status: undefined,
   noZero: undefined,
   whId: undefined,
   description: undefined,
@@ -417,7 +384,7 @@ const handleStatus = async (num) => {
     isShowBtnOther.value = false
     isShowBtnDelete.value = false
   }
-  query.id = storageid.value
+  query.id = formData.value.id
   query.type = 'update'
   reload()
 }
@@ -476,7 +443,6 @@ const downloadAttachment = async (name, url) => {
 }
 // ====================附件信息 结束=======================================
 
-const storageid = ref()
 var commonResult = ''
 
 /** 提交表单 */
@@ -489,15 +455,15 @@ const saveFormData = async () => {
   try {
     //物料信息保存
     formData.value.matItemDOList.forEach((item) => {
-      item.stockId = storageid.value
+      item.stockId = formData.value.id
       item.whId = formData.value.whId
     })
     const dataMats = formData.value.matItemDOList as unknown as CheckMatApi.StorageCheckMatVO[]
-    await CheckMatApi.createStorageMatBatch(dataMats, storageid.value)
+    await CheckMatApi.createStorageMatBatch(dataMats, formData.value.id)
 
     if (formData.value.matItemDOList.length > 0) {
       //附件信息保存
-      matUploadData.value.businessId = storageid
+      matUploadData.value.businessId = formData.value.id
       matUploadRef.value!.submit()
     }
     message.success(t(commonResult))
@@ -521,87 +487,56 @@ const submitForm = async () => {
   //保存表单数据
   await saveFormData()
   // 成功后刷新
-  query.id = storageid.value
+  query.id = formData.value.id
   query.type = 'update'
   reload()
 }
 
 var matCount = 1
 const onAddItem = () => {
-  if (formData.value.whId) {
-    const newData = {
-      // 新数据的属性
-      cid: matCount,
-      stockId: 0,
-      matId: '',
-      matName: '',
-      matCode: '',
-      matType: '',
-      matSpec: '',
-      matUnit: '',
-      whId: '',
-      rgId: '',
-      pnId: '',
-      pnlist: ref([]),
-      storageOkQty: '',
-      lotNo: '',
-      description: '',
-      productBomItemValueDOList: []
-    }
-    matCount = matCount + 1
-
-    formData.value.matItemDOList.push(newData)
-  } else {
-    message.alertWarning('请选择出库仓库')
+  const newData = {
+    // 新数据的属性
+    cid: matCount,
+    isCopy: 0,
+    stockId: 0,
+    matId: '',
+    matName: '',
+    matCode: '',
+    matType: '',
+    matSpec: '',
+    matUnit: '',
+    matRest: '',
+    whId: '',
+    rgId: '',
+    pnId: '',
+    pnlist: ref([]),
+    storageOkQty: '',
+    lotNo: '',
+    description: '',
+    productBomItemValueDOList: []
   }
+  matCount = matCount + 1
+
+  formData.value.matItemDOList.push(newData)
 }
 
 //删除新增物料信息
 const handleDelete2 = (index: number) => {
-  formData.value.matItemDOList.splice(index, 1)
+  var itemDelteing = formData.value.matItemDOList[index]
+  if (itemDelteing.isCopy == 0) {
+    message.alertWarning("原始物料不能删除")
+  } else {
+    formData.value.matItemDOList.splice(index, 1)
+  }
 }
 
 //仓库全数据
-const warehouseList = ref([])
+const whList = ref([])
 //库区全数据
 var rgList = ref([])
 //库位全数据
 var pnList = ref([])
-const handleWh = async (wid) => {
-  //-------------------库区全数据
-  const queryParamsRg = reactive({
-    pageNo: 1,
-    pageSize: 99,
-    whId: wid
-  })
-  const dataRg = await RgApi.getRgPage(queryParamsRg)
-
-  rgList.value = []
-  pnList.value = []
-  rgList.value = dataRg.list
 
-  const matLastRemoteData = await CheckMatApi.getStorageMatList()
-
-  let matParams = {
-    pageNo: 1,
-    pageSize: 99,
-    status: '1'
-  }
-  const dataMat = await MatApi.getMaterialPage(matParams)
-  matList.value = []
-  matList.value = dataMat.list.filter(
-    (item) =>
-      matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
-  )
-
-  formData.value.matItemDOList = []
-  // formData.value.matItemDOList.forEach(item => {
-  //   item.rgId = ''
-  //   item.pnId = ''
-  //   item.pnlist.value = []
-  // })
-  //-------------------
-}
 const handleRg = async (scope) => {
   //-------------------库位全数据
   const queryParamsRPn = reactive({
@@ -616,203 +551,20 @@ const handleRg = async (scope) => {
   //-------------------
 }
 
-const matList = ref<MatApi.MaterialVO[]>([]) // 物料列表
-const matSelectLoading = ref(false)
-const remoteMatCodeSearch = async (name) => {
-  matSelectLoading.value = true
-  // 获得用户列表
-  let matParams = {
-    pageNo: 1,
-    pageSize: 10,
-    name: name,
-    status: '1'
-  }
-
-  const matLastRemoteData = await CheckMatApi.getStorageMatList()
-
-  const dataMat = await MatApi.getMaterialPage(matParams)
-  matList.value = []
-  matList.value = dataMat.list.filter(
-    (item) =>
-      matLastRemoteData.find(
-        (fish) => fish.matId === item.id && fish.whId == formData.value.whId
-      ) !== undefined
-  )
-  matSelectLoading.value = false
-}
-
-const handleMatCode = async (scope, matid) => {
-  if (matid && matLastData.value.find((item) => item.matId === matid)) {
-    const matVo = matLastData.value.find((item) => item.matId === matid)
-    scope.row.matId = matVo.matId
-    scope.row.matName = matVo.matName
-    scope.row.matCode = matVo.matCode
-    scope.row.matSpec = matVo.matSpec
-    scope.row.matType = matVo.materialType
-    scope.row.matUnit = matVo.matUnit
-    scope.row.rgId = matVo.rgId
-    scope.row.pnId = matVo.pnId
-    scope.row.matRest = matVo.matRest
-    scope.row.storageOkQty = matVo.storageOkQty
-    scope.row.lotNo = matVo.lotNo
-    scope.row.description = matVo.description
-
-    const queryParamsRPn = reactive({
-      pageNo: 1,
-      pageSize: 99,
-      rgId: scope.row.rgId,
-      pnStatus: 1
-    })
-    const dataPn = await PnApi.getPnPage(queryParamsRPn)
-    scope.row.pnlist = dataPn.list
-  } else {
-    scope.row.matId = ''
-    scope.row.matName = ''
-    scope.row.matCode = ''
-    scope.row.matSpec = ''
-    scope.row.matType = ''
-    scope.row.matUnit = ''
-    scope.row.rgId = ''
-    scope.row.pnId = ''
-    scope.row.matRest = ''
-    scope.row.storageOkQty = ''
-    scope.row.lotNo = ''
-    scope.row.description = ''
-    scope.row.pnlist = []
-  }
-}
-
 const isShowBtnGroup = ref(true)
 const isShowBtnCancel = ref(false)
 const isShowBtnOther = ref(false)
 const isShowBtnDelete = ref(true)
-const btnWhClickable = ref(false)
-const matLastData = ref([])
 /** 初始化 **/
 onMounted(async () => {
-  btnWhClickable.value = query.type === 'update' ? true : false
-
-  matLastData.value = await CheckMatApi.getStorageMatList()
-
-  // 获得物料列表
-  let matParams = {
+  // 附件信息
+  let attParams = {
     pageNo: 1,
     pageSize: 99,
-    status: '1'
+    businessId: query.id,
+    businessType: 'STORAGECHECK'
   }
-  const dataMat = await MatApi.getMaterialPage(matParams)
-  matList.value = []
-  matList.value = dataMat.list
-
-  dialogTitle.value = t('action.' + query.type)
-  dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
-
-  //-------------------仓库全数据
-  const data = await WhApi.getWarehouseSimpList()
-  warehouseList.value = data
-  //-------------------
-  if (query.id) {
-    //获取库存信息
-    formData.value = await CheckApi.getStorage(query.id)
-
-    switch (formData.value.status) {
-      case 1:
-        isShowBtnGroup.value = true
-        isShowBtnCancel.value = false
-        isShowBtnDelete.value = true
-        break
-      case 2:
-        isShowBtnGroup.value = false
-        isShowBtnCancel.value = true
-        isShowBtnOther.value = false
-        isShowBtnDelete.value = false
-        break
-      case 3:
-        isShowBtnGroup.value = false
-        isShowBtnCancel.value = false
-        isShowBtnOther.value = false
-        isShowBtnDelete.value = false
-        break
-      default:
-        break
-    }
-    //查看页面不可以编辑
-    if (query.type === 'review') {
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-    }
-
-    //获得库区列表
-    const queryParamsRg = reactive({
-      pageNo: 1,
-      pageSize: 99,
-      status: 1,
-      whId: formData.value.whId
-    })
-    const dataRg = await RgApi.getRgPage(queryParamsRg)
-
-    rgList.value = []
-    rgList.value = dataRg.list
-    //获得库区列表
-    const queryParamsPn = reactive({
-      pageNo: 1,
-      pageSize: 99
-    })
-    const dataPn = await PnApi.getPnPage(queryParamsPn)
-
-    pnList.value = []
-    pnList.value = dataPn.list
-
-    //获取库存物料列表信息
-    const queryParamsMat = reactive({
-      pageNo: 1,
-      pageSize: 99,
-      stockId: query.id
-    })
-    const dataMats = await CheckMatApi.getStorageMatPage(queryParamsMat)
-    formData.value.matItemDOList = dataMats.list
-
-    //获取原始物料信息
-    const queryParamsMat2 = reactive({
-      pageNo: 1,
-      pageSize: 99,
-      status: 1
-    })
-    const matVos = await MatApi.getMaterialPage(queryParamsMat2)
-
-    formData.value.matItemDOList.forEach((item) => {
-      item.cid = matCount
-      item.matId = matVos.list.find((record) => record.id === item.matId)?.id
-      //item.matCode = matVos.list.find( (record) => record.id === item.matId)?.id
-      item.matCode = matVos.list.find((record) => record.id == item.matId)?.code
-      item.matSpec = matVos.list.find((record) => record.id == item.matId)?.spec
-      item.matType = matVos.list.find((record) => record.id == item.matId)?.materialType
-      item.matUnit = matVos.list.find((record) => record.id == item.matId)?.unit
-      item.pnlist = pnList.value.filter((pn) => pn.rgId == item.rgId)
-      item.matRest = matLastData.value.find(
-        (rest) => rest.rgId == item.rgId && rest.pnId == item.pnId
-      )?.matRest
-      item.matRest = item.matRest == undefined ? 0 : item.matRest
-      matCount = matCount + 1
-
-      // item = matLastData.value.find((rest) => rest.rgId === item.rgId && rest.pnId === item.pnId)
-      // item.pnlist = pnList.value.filter((pn) => pn.rgId === item.rgId)
-      // item.cid = matCount
-      // matCount = matCount + 1
-    })
-
-    // 附件信息
-    let attParams = {
-      pageNo: 1,
-      pageSize: 99,
-      businessId: query.id,
-      businessType: 'STORAGE'
-    }
-    formData.value.attachments = (await getFilePage(attParams)).list
-  }
-
+  formData.value.attachments = (await getFilePage(attParams)).list
   //用户信息
   userList.value = await UserApi.getSimpleUserList()
 })

From 66bb7d59596c42bb2e8afb5a4913577279d4c544 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 29 Jan 2024 22:13:59 +0800
Subject: [PATCH 47/64] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存盘点编辑
---
 .../src/views/heli/storage/StorageForm.vue    |   2 +-
 .../src/views/heli/storage/StorageOut.vue     |   2 +-
 .../views/heli/storagecheck/checkdetail.vue   | 110 +++++++-----------
 .../src/views/heli/storagecheck/index.vue     |  17 ++-
 4 files changed, 59 insertions(+), 72 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index 0ad19f5d..23d980ba 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -667,7 +667,7 @@ const saveFormData = async () => {
     const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
     await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
 
-    if (formData.value.matItemDOList.length > 0) {
+    if (formData.value.attachments!=undefined &&  formData.value.attachments.length > 0) {
       //附件信息保存
       matUploadData.value.businessId = storageid
       matUploadRef.value!.submit()
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 3b8340de..faa083a6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -662,7 +662,7 @@ const saveFormData = async () => {
     const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
     await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
 
-    if (formData.value.matItemDOList.length > 0) {
+    if (formData.value.attachments!=undefined &&  formData.value.attachments.length > 0) {
       //附件信息保存
       matUploadData.value.businessId = storageid
       matUploadRef.value!.submit()
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
index f6730b73..a97e04c6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
@@ -30,7 +30,7 @@
                 <el-form-item prop="whId" label="盘点仓库" required>
                   <el-select v-model="formData.whId" placeholder="下拉选择" clearable disabled class="!w-400px"
                     @change="handleWh">
-                    <el-option v-for="dict in whList" :key="dict.id" :label="dict.whName" :value="dict.id" />
+                    <el-option v-for="dict in whList" :key="dict.id" :label="dict.wh_name" :value="dict.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -62,7 +62,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="排除库存为0的物料?" prop="noZero">
-                  <el-radio-group v-model="formData.noZero" disabled>
+                  <el-radio-group v-model="formData.noZero" >
                     <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value"
                       :label="dict.value">
                       {{ dict.label }}
@@ -74,7 +74,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="盘点开始日期" prop="checkTime">
-                  <el-date-picker v-model="formData.checkTime" value-format="YYYY-MM-DD" type="date" disabled
+                  <el-date-picker v-model="formData.checkTime" value-format="x" placeholder="盘点开始时间" 
                     class="!w-220px" />
                 </el-form-item>
               </el-col>
@@ -84,7 +84,7 @@
         <el-row>
           <el-col :span="20">
             <el-form-item label="备注" prop="description">
-              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" disabled />
+              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200"  />
             </el-form-item>
           </el-col>
         </el-row>
@@ -250,11 +250,11 @@
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
-      <el-button @click="submitForm" v-if="isShowBtnGroup" type="success" :disabled="formLoading" size="large">保
+      <el-button @click="submitForm"  type="success" :disabled="formLoading" size="large">保
         存</el-button>
-      <el-button @click="handleStatus(2)" v-if="isShowBtnGroup" type="primary" :disabled="formLoading" size="large">提
+      <el-button @click="handleStatus(2)"  type="primary" :disabled="formLoading" size="large">提
         交</el-button>
-      <el-button @click="handleStatus(3)" v-if="isShowBtnCancel" type="danger" :disabled="formLoading" size="large">删
+      <el-button @click="handleStatus(3)"  type="danger" :disabled="formLoading" size="large">删
         除</el-button>
     </div>
   </el-card>
@@ -272,7 +272,6 @@ import * as CheckApi from '@/api/heli/storagecheck'
 import * as CheckMatApi from '@/api/heli/storagecheckmat'
 
 import * as UserApi from '@/api/system/user'
-import * as MatApi from '@/api/heli/material'
 import * as WhApi from '@/api/heli/warehouse'
 import * as RgApi from '@/api/heli/rg'
 import * as PnApi from '@/api/heli/pn'
@@ -340,52 +339,6 @@ const handleStatus = async (num) => {
   } catch (e) {
     return
   }
-  //保存表单数据
-  await saveFormData()
-
-  formData.value.status = num
-
-  const dataUpdate = formData.value as unknown as CheckApi.StorageVO
-  if (num == 2) {
-    dataUpdate.outbound = useUserStore().getUser.id
-  } else {
-    dataUpdate.cancel = useUserStore().getUser.id
-  }
-  await CheckApi.updateStorageStatus(dataUpdate)
-
-  message.success(t('common.updateSuccess'))
-
-  switch (num) {
-    case 1:
-      isShowBtnGroup.value = true
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = true
-      isShowBtnDelete.value = true
-      break
-    case 2:
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = true
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-      break
-    case 3:
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-      break
-    default:
-      break
-  }
-  //查看页面不可以编辑
-  if (query.type === 'review') {
-    isShowBtnGroup.value = false
-    isShowBtnCancel.value = false
-    isShowBtnOther.value = false
-    isShowBtnDelete.value = false
-  }
-  query.id = formData.value.id
-  query.type = 'update'
   reload()
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
@@ -453,15 +406,26 @@ const saveFormData = async () => {
   // 提交请求
   formLoading.value = true
   try {
+
+    const data = formData.value as unknown as CheckApi.StorageCheckVO
+    await CheckApi.updateStorageCheck(data)
     //物料信息保存
-    formData.value.matItemDOList.forEach((item) => {
-      item.stockId = formData.value.id
-      item.whId = formData.value.whId
-    })
+    if( formData.value.matItemDOList){
+      formData.value.matItemDOList.forEach((item) => {
+        item.stockId = formData.value.id
+        item.whId = formData.value.whId
+      })
+    }
     const dataMats = formData.value.matItemDOList as unknown as CheckMatApi.StorageCheckMatVO[]
-    await CheckMatApi.createStorageMatBatch(dataMats, formData.value.id)
+    //await CheckMatApi.createStorageMatBatch(dataMats, formData.value.id)
 
-    if (formData.value.matItemDOList.length > 0) {
+    if (formData.value.matItemDOList !=undefined &&formData.value.matItemDOList.length > 0) {
+      //附件信息保存
+      matUploadData.value.businessId = formData.value.id
+      matUploadRef.value!.submit()
+    }
+
+    if (formData.value.attachments!=undefined &&  formData.value.attachments.length > 0) {
       //附件信息保存
       matUploadData.value.businessId = formData.value.id
       matUploadRef.value!.submit()
@@ -474,10 +438,10 @@ const saveFormData = async () => {
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  if (formData.value.matItemDOList.length === 0) {
-    message.alertWarning('请添加物料信息!')
-    return
-  }
+  // if (formData.value.matItemDOList ==undefined || formData.value.matItemDOList.length === 0) {
+  //   message.alertWarning('请添加物料信息!')
+  //   return
+  // }
   // 校验子表单
   try {
     await matSubFormRef.value.validate()
@@ -487,8 +451,6 @@ const submitForm = async () => {
   //保存表单数据
   await saveFormData()
   // 成功后刷新
-  query.id = formData.value.id
-  query.type = 'update'
   reload()
 }
 
@@ -551,12 +513,24 @@ const handleRg = async (scope) => {
   //-------------------
 }
 
-const isShowBtnGroup = ref(true)
-const isShowBtnCancel = ref(false)
 const isShowBtnOther = ref(false)
 const isShowBtnDelete = ref(true)
+
+//仓库列表
+const init_page_wh = (async ()=>{
+  whList.value = await WhApi.getSimpList()
+})
+//库区列表
+const init_page_rg = (async ()=>{
+  rgList.value = await RgApi.getSimpList()
+})
 /** 初始化 **/
 onMounted(async () => {
+
+  await init_page_wh()
+  await init_page_rg()
+  formData.value = await CheckApi.getStorageCheck(query.id)
+
   // 附件信息
   let attParams = {
     pageNo: 1,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
index 4b3d4786..f6d39306 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
@@ -59,9 +59,17 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="创建人" align="center" prop="creator">
+        <template #default="scope">
+          {{ userList.find((user) => user.id == scope.row.creator)?.nickname }}
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
-      <el-table-column label="提交人" align="center" prop="keeper" />
+      <el-table-column label="提交人" align="center" prop="keeper" >
+        <template #default="scope">
+          {{ userList.find((user) => user.id == scope.row.keeper)?.nickname }}
+        </template>
+      </el-table-column>
       <el-table-column label="提交时间" align="center" prop="keeperTime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="单据状态" align="center" prop="status">
         <template #default="scope">
@@ -95,6 +103,7 @@ import download from '@/utils/download'
 import * as StorageCheckApi from '@/api/heli/storagecheck'
 import StorageCheckForm from './StorageCheckForm.vue'
 import * as WarehouseApi from '@/api/heli/warehouse'
+import * as UserApi from '@/api/system/user'
 
 defineOptions({ name: 'StorageCheck' })
 
@@ -128,6 +137,7 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const whList = ref([])
 //仓库列表
 const init_page_wh = (async () => {
@@ -137,6 +147,8 @@ const init_page_wh = (async () => {
 const getList = async () => {
   loading.value = true
   try {
+    //用户信息
+    userList.value = await UserApi.getSimpleUserList()
     const data = await StorageCheckApi.getStorageCheckPage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -198,6 +210,7 @@ const handleExport = async () => {
 
 /** 初始化 **/
 onMounted(async () => {
+
   await init_page_wh()
   await getList()
 })

From 2cb51857fa0c0f8252616f5dc960e2b9394847dc Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Tue, 30 Jan 2024 09:12:36 +0800
Subject: [PATCH 48/64] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/deliverorder/projectOrderDialog.vue         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue
index 2e3f5373..016a413e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue
@@ -153,13 +153,10 @@
 <script setup lang="ts">
 import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter, dateFormatter2, formatDate } from '@/utils/formatTime'
-import download from '@/utils/download'
 import * as ProjectOrderApi from '@/api/heli/projectorder'
 import {ref} from "vue";
 import {ProjectOrderVO} from "@/api/heli/projectorder";
 
-defineOptions({ name: 'ProjectOrder' })
-
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const router = useRouter()

From 27daafed8b21175b04d56256f56f969aa0e7ad90 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Tue, 30 Jan 2024 12:39:56 +0800
Subject: [PATCH 49/64] =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=8C=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

入库，出库问题修正
---
 .../storagecheck/StorageCheckController.java  | 222 +++++----
 .../src/views/heli/pn/PnForm.vue              |  43 +-
 .../src/views/heli/rg/RgForm.vue              |  29 +-
 .../src/views/heli/storage/StorageForm.vue    | 435 +++++-------------
 .../src/views/heli/storage/StorageOut.vue     | 399 +++++-----------
 .../src/views/heli/storagelog/index.vue       |   2 +-
 6 files changed, 402 insertions(+), 728 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
index 80dafe22..b2cab75e 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
@@ -1,95 +1,129 @@
-package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
 import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
-
-import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
-
-import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
-import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
-import com.chanko.yunxi.mes.module.heli.service.storagecheck.StorageCheckService;
-
-@Tag(name = "管理后台 - 入/出库盘点")
-@RestController
-@RequestMapping("/heli/storage-check")
-@Validated
-public class StorageCheckController {
-
-    @Resource
-    private StorageCheckService storageCheckService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建入/出库盘点")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:create')")
-    public CommonResult<Long> createStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO createReqVO) {
-        return success(storageCheckService.createStorageCheck(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新入/出库盘点")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:update')")
-    public CommonResult<Boolean> updateStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) {
-        storageCheckService.updateStorageCheck(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除入/出库盘点")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:delete')")
-    public CommonResult<Boolean> deleteStorageCheck(@RequestParam("id") Long id) {
-        storageCheckService.deleteStorageCheck(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得入/出库盘点")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
-    public CommonResult<StorageCheckRespVO> getStorageCheck(@RequestParam("id") Long id) {
-        StorageCheckDO storageCheck = storageCheckService.getStorageCheck(id);
-        return success(BeanUtils.toBean(storageCheck, StorageCheckRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得入/出库盘点分页")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
-    public CommonResult<PageResult<StorageCheckRespVO>> getStorageCheckPage(@Valid StorageCheckPageReqVO pageReqVO) {
-        PageResult<StorageCheckDO> pageResult = storageCheckService.getStorageCheckPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, StorageCheckRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出入/出库盘点 Excel")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:export')")
-    @OperateLog(type = EXPORT)
-    public void exportStorageCheckExcel(@Valid StorageCheckPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<StorageCheckDO> list = storageCheckService.getStorageCheckPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "入/出库盘点.xls", "数据", StorageCheckRespVO.class,
-                        BeanUtils.toBean(list, StorageCheckRespVO.class));
-    }
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.StorageSaveReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
+import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
+import com.chanko.yunxi.mes.module.heli.service.storagecheck.StorageCheckService;
+
+@Tag(name = "管理后台 - 入/出库盘点")
+@RestController
+@RequestMapping("/heli/storage-check")
+@Validated
+public class StorageCheckController {
+
+    @Resource
+    private StorageCheckService storageCheckService;
+
+    @Resource
+    private StorageCheckMatService storageCheckMatService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建入/出库盘点")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:create')")
+    public CommonResult<Long> createStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO createReqVO) {
+        return success(storageCheckService.createStorageCheck(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新入/出库盘点")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:update')")
+    public CommonResult<Boolean> updateStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) {
+        storageCheckService.updateStorageCheck(updateReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/update-status")
+    @Operation(summary = "更新盘点状态")
+    @PreAuthorize("@ss.hasPermission('heli:storage:update')")
+    public CommonResult<Boolean> updateStorageCheckStatus(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) {
+
+        // 提交或者删除时记录相关操作人
+        LocalDateTime currTime = LocalDateTime.now();
+        if(updateReqVO.getStatus().equals(2)){
+            // 已提交时间更新
+            updateReqVO.setKeeperTime(currTime);
+        } else if(updateReqVO.getStatus().equals(3)){
+            // 已删除时间更新
+            updateReqVO.setCancelTime(currTime);
+        }
+        // 盘点信息保存
+        storageCheckService.updateStorageCheck(updateReqVO);
+
+        // TODO保存物料列表信息
+
+        // TODO生成入库/出库单据
+
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除入/出库盘点")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:delete')")
+    public CommonResult<Boolean> deleteStorageCheck(@RequestParam("id") Long id) {
+        storageCheckService.deleteStorageCheck(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得入/出库盘点")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
+    public CommonResult<StorageCheckRespVO> getStorageCheck(@RequestParam("id") Long id) {
+        StorageCheckDO storageCheck = storageCheckService.getStorageCheck(id);
+        return success(BeanUtils.toBean(storageCheck, StorageCheckRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得入/出库盘点分页")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
+    public CommonResult<PageResult<StorageCheckRespVO>> getStorageCheckPage(@Valid StorageCheckPageReqVO pageReqVO) {
+        PageResult<StorageCheckDO> pageResult = storageCheckService.getStorageCheckPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, StorageCheckRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出入/出库盘点 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStorageCheckExcel(@Valid StorageCheckPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<StorageCheckDO> list = storageCheckService.getStorageCheckPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "入/出库盘点.xls", "数据", StorageCheckRespVO.class,
+                        BeanUtils.toBean(list, StorageCheckRespVO.class));
+    }
+
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue
index ad9e6b88..ea4ef7a8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue
@@ -1,18 +1,6 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="108px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="库位编码" prop="pnNo">
-        <el-input v-model="formData.pnNo" placeholder="库位编码" class="!w-500px" />
-      </el-form-item>
-      <el-form-item label="库位名称" prop="pnName">
-        <el-input v-model="formData.pnName" placeholder="请库位名称" class="!w-500px" />
-      </el-form-item>
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="108px" v-loading="formLoading">
       <el-form-item label="所属仓库" prop="whId">
         <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-500px" @change="handleWhChange">
           <el-option v-for="dict in whList" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -23,16 +11,19 @@
           <el-option v-for="dict in rgSelected" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="库位编码" prop="pnNo">
+        <el-input v-model="formData.pnNo" placeholder="库位编码" class="!w-500px" />
+      </el-form-item>
+      <el-form-item label="库位名称" prop="pnName">
+        <el-input v-model="formData.pnName" placeholder="请库位名称" class="!w-500px" />
+      </el-form-item>
+
       <el-form-item label="描述" prop="descr">
-        <el-input v-model="formData.descr" placeholder="描述" type="textarea"  />
+        <el-input v-model="formData.descr" placeholder="描述" type="textarea" />
       </el-form-item>
       <el-form-item label="启用状态" prop="pnStatus">
         <el-radio-group v-model="formData.pnStatus">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)" :key="dict.value" :label="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
@@ -80,7 +71,7 @@ const rgSelected = ref([])
 
 const handleWhChange = (data) => {
   rgSelected.value = []
-  
+
   if (data !== undefined || data !== "") {
     rgList.value.forEach(element => {
       if (element.whId === data) {
@@ -97,7 +88,7 @@ const open = async (type: string, id?: number) => {
   const queryParamsWh = reactive({
     pageNo: 1,
     pageSize: 99,
-    whStatus : 1
+    whStatus: 1
   })
   const dataWh = await WarehouseApi.getWarehousePage(queryParamsWh)
 
@@ -112,7 +103,7 @@ const open = async (type: string, id?: number) => {
   const queryParamsRg = reactive({
     pageNo: 1,
     pageSize: 99,
-    rgStatus : 1
+    rgStatus: 1
   })
   const dataRg = await RgApi.getRgPage(queryParamsRg)
 
@@ -135,10 +126,10 @@ const open = async (type: string, id?: number) => {
 
       rgSelected.value = []
       rgList.value.forEach(element => {
-      if (element.whId === formData.value.whId) {
-        rgSelected.value.push(element)
-      }
-    });
+        if (element.whId === formData.value.whId) {
+          rgSelected.value.push(element)
+        }
+      });
 
     } finally {
       formLoading.value = false
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue
index ad280287..9ed67983 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue
@@ -1,30 +1,21 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="108px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="库区编码" prop="rgNo">
-        <el-input v-model="formData.rgNo" placeholder="库区编码" required class="!w-500px" />
-      </el-form-item>
-      <el-form-item label="库区名称" prop="rgName">
-        <el-input v-model="formData.rgName" placeholder="库区名称" required class="!w-500px"/>
-      </el-form-item>
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="108px" v-loading="formLoading">
       <el-form-item label="所属仓库" prop="whId">
         <el-select v-model="formData.whId" clearable class="!w-500px">
           <el-option v-for="dict in warehouseList" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="库区编码" prop="rgNo">
+        <el-input v-model="formData.rgNo" placeholder="库区编码" required class="!w-500px" />
+      </el-form-item>
+      <el-form-item label="库区名称" prop="rgName">
+        <el-input v-model="formData.rgName" placeholder="库区名称" required class="!w-500px" />
+      </el-form-item>
+
       <el-form-item label="状态" prop="rgStatus">
         <el-radio-group v-model="formData.rgStatus">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)" :key="dict.value" :label="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
@@ -70,7 +61,7 @@ const open = async (type: string, id?: number) => {
   const queryParamsWarehouse = reactive({
     pageNo: 1,
     pageSize: 99,
-    whStatus : 1
+    whStatus: 1
   })
   const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse)
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index 23d980ba..51cec357 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -9,14 +9,7 @@
       <img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
       <span v-else></span>
     </div>
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-      v-bind:disabled="isShowBtnOther"
-    >
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading" >
       <!--  基础信息   -->
       <el-card class="hl-card-info">
         <template #header>
@@ -34,13 +27,9 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="stockInType" label="入库类型">
-                  <el-select v-model="formData.stockInType" clearable style="width: 100%">
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_IN_TYPE)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
+                  <el-select v-model="formData.stockInType" clearable style="width: 100%" @change="handleStockType" v-bind:disabled="btnView || btnSave">
+                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_IN_TYPE)" :key="dict.value"
+                      :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -50,19 +39,9 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="industry" label="单据状态">
-                  <el-select
-                    v-model="formData.status"
-                    placeholder="下拉选择"
-                    clearable
-                    class="!w-700px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
+                  <el-select v-model="formData.status" placeholder="下拉选择" clearable class="!w-700px" disabled>
+                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)" :key="dict.value"
+                      :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -70,7 +49,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="headerNo" label="上游单号">
-                  <el-input v-model="formData.headerNo" />
+                  <el-input v-model="formData.headerNo" class="!w-700px" v-bind:disabled="btnView || btnSave || enableHeadNo" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -79,26 +58,17 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="单据日期" prop="createTime">
-                  {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm:ss') }}
+                  <!-- {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm:ss') }} -->
+                  <el-date-picker v-model="formData.createTime" value-format="x" placeholder="单据日期" disabled
+                    class="!w-400px" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="whId" label="入库仓库">
-                  <el-select
-                    v-model="formData.whId"
-                    placeholder="下拉选择"
-                    clearable
-                    class="!w-400px"
-                    @change="handleWh"
-                  >
-                    <el-option
-                      v-for="dict in warehouseList"
-                      :key="dict.id"
-                      :label="dict.whName"
-                      :value="dict.id"
-                    />
+                  <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-400px" @change="handleWh" v-bind:disabled="btnView || btnSave">
+                    <el-option v-for="dict in warehouseList" :key="dict.id" :label="dict.whName" :value="dict.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -108,12 +78,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="description">
-              <el-input
-                type="textarea"
-                v-model="formData.description"
-                show-word-limit
-                maxlength="200"
-              />
+              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" v-bind:disabled="btnView || btnSave" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -127,108 +92,45 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
-                  >新增</el-button
-                >
+                <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem" v-bind:disabled="btnView || btnSave">新增</el-button>
               </el-col>
-              <el-form
-                ref="matSubFormRef"
-                :model="formData.matItemDOList"
-                :rules="subFormRules"
-                v-loading="subFormLoading"
-                label-width="0"
-              >
+              <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules"
+                v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.matItemDOList" class="hl-table">
                   <el-table-column prop="cid" label="序号" min-width="80" align="center" fixed />
                   <el-table-column prop="matId" min-width="140" align="center">
                     <template #header> <span class="hl-table_header">*</span> 物料编码 </template>
                     <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.matId`"
-                        :rules="subFormRules.matId"
-                        class="mb-0px!"
-                      >
-                        <el-select
-                          v-model="scope.row.matId"
-                          placeholder="物料编码"
-                          :remote-method="remoteMatCodeSearch"
-                          remote-show-suffix
-                          remote
-                          clearable
-                          reserve-keyword
-                          filterable
-                          :loading="matSelectLoading"
-                          @change="(val) => handleMatCode(scope, val)"
-                          class="!w-180px"
-                        >
-                          <el-option
-                            v-for="item in matList"
-                            :key="item.id"
-                            :label="item.code"
-                            :value="item.id"
-                          />
+                      <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
+                        <el-select v-model="scope.row.matId" placeholder="物料编码" :remote-method="remoteMatCodeSearch" v-bind:disabled="btnView || btnSave"
+                          remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading"
+                          @change="(val) => handleMatCode(scope, val)" class="!w-180px">
+                          <el-option v-for="item in matList" :key="item.id" :label="item.code" :value="item.id" />
                         </el-select>
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="matName" label="物料名称" min-width="120" align="center">
-                    <!-- <template #default="scope">
-                      <el-input v-model="scope.row.matName" 
-                        :disabled="!scope.row.editable" />
-
-                      <el-select v-model="scope.row.matName" placeholder="物料名称" :remote-method="remoteMatSearch"
-                        remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading" @click="handleMatName"
-                        class="!w-180px">
-                        <el-option v-for="item in matList" :key="item.id" :label="item.name" :value="item.id" />
-                      </el-select>
-
-                    </template> -->
-                  </el-table-column>
+                  <el-table-column prop="matName" label="物料名称" min-width="120" align="center" />
                   <el-table-column prop="matType" label="物料类型" align="center" min-width="120">
                     <template #default="scope">
-                      <dict-tag
-                        :type="DICT_TYPE.HELI_MATERIAL_TYPE"
-                        :value="scope.row.matType"
-                        v-if="scope.row.matType ? true : false"
-                      />
+                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType"
+                        v-if="scope.row.matType ? true : false" />
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    prop="matSpec"
-                    label="规格/型号"
-                    align="center"
-                    min-width="120"
-                  />
+                  <el-table-column prop="matSpec" label="规格/型号" align="center" min-width="120" />
 
                   <el-table-column prop="matUnit" label="系统单位" align="center" min-width="120">
                     <template #default="scope">
-                      <dict-tag
-                        :type="DICT_TYPE.HELI_MATERIAL_UNIT"
-                        :value="scope.row.matUnit"
-                        v-if="scope.row.matUnit ? true : false"
-                      />
+                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit"
+                        v-if="scope.row.matUnit ? true : false" />
                     </template>
                   </el-table-column>
                   <el-table-column prop="rgId" align="center" min-width="120">
                     <template #header> <span class="hl-table_header">*</span> 入库库区 </template>
                     <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.rgId`"
-                        :rules="subFormRules.rgId"
-                        class="mb-0px!"
-                      >
-                        <el-select
-                          v-model="scope.row.rgId"
-                          placeholder=""
-                          style="width: 100%"
-                          @change="handleRg(scope)"
-                        >
-                          <el-option
-                            v-for="dict in rgList"
-                            :key="dict.id"
-                            :label="dict.rgName"
-                            :value="dict.id"
-                          />
+                      <el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
+                        <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="handleRg(scope)" v-bind:disabled="btnView || btnSave">
+                          <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rgName" :value="dict.id" />
                         </el-select>
                       </el-form-item>
                     </template>
@@ -236,18 +138,10 @@
                   <el-table-column prop="pnId" align="center" min-width="120">
                     <template #header> <span class="hl-table_header">*</span> 入库库位 </template>
                     <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.pnId`"
-                        :rules="subFormRules.pnId"
-                        class="mb-0px!"
-                      >
-                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
-                          <el-option
-                            v-for="dict in scope.row.pnlist"
-                            :key="dict.id"
-                            :label="dict.pnName"
-                            :value="dict.id"
-                          />
+                      <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
+                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%" v-bind:disabled="btnView || btnSave">
+                          <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pnName"
+                            :value="dict.id" />
                         </el-select>
                       </el-form-item>
                     </template>
@@ -255,53 +149,31 @@
                   <el-table-column prop="storageOkQty" align="center" min-width="120">
                     <template #header> <span class="hl-table_header">*</span> 入库数量 </template>
                     <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.storageOkQty`"
-                        :rules="subFormRules.storageOkQty"
-                        class="mb-0px!"
-                      >
-                        <el-input v-model="scope.row.storageOkQty" />
+                      <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty"
+                        class="mb-0px!">
+                        <el-input v-model="scope.row.storageOkQty" v-bind:disabled="btnView || btnSave"/>
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column prop="lotNo" label="批次号" align="center" min-width="120">
                     <template #default="scope">
-                      <el-input v-model="scope.row.lotNo" />
+                      <el-input v-model="scope.row.lotNo" v-bind:disabled="btnView || btnSave"/>
                     </template>
                   </el-table-column>
 
-                  <el-table-column
-                    prop="projectNo"
-                    label="子项目编号"
-                    align="center"
-                    min-width="120"
-                  >
+                  <el-table-column prop="projectNo" label="子项目编号" align="center" min-width="120">
                     <template #default="scope">
-                      <el-input v-model="scope.row.projectNo" />
+                      <el-input v-model="scope.row.projectNo" v-bind:disabled="btnView || btnSave"/>
                     </template>
                   </el-table-column>
                   <el-table-column prop="description" label="备注" align="center" min-width="180">
                     <template #default="scope">
-                      <el-input v-model="scope.row.description" />
+                      <el-input v-model="scope.row.description" v-bind:disabled="btnView || btnSave" />
                     </template>
                   </el-table-column>
                   <el-table-column label="操作" align="center" min-width="120" fixed="right">
                     <template #default="scope">
-                      <!-- <el-button v-if="!scope.row.editable" type="primary" size="small" link
-                        @click="handleEdit(scope.$index)">
-                        编辑
-                      </el-button>
-                      <el-button link v-else type="success" size="small" @click="handleSave(scope.$index)">
-                        保存
-                      </el-button>
-
-                      <el-button link type="primary" @click="handlefuke(scope.$index, scope.row)">复制</el-button> -->
-                      <el-button
-                        link
-                        type="danger"
-                        @click.prevent="handleDelete2(scope.$index)"
-                        v-if="isShowBtnDelete"
-                      >
+                      <el-button link type="danger" @click.prevent="handleDelete2(scope.$index)" v-bind:disabled="btnView || btnDelete">
                         删除
                       </el-button>
                     </template>
@@ -321,24 +193,15 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-upload
-                  ref="matUploadRef"
-                  :file-list="matUploadFiles"
-                  multiple
-                  :limit="10"
-                  :action="uploadUrl"
+                <el-upload ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="uploadUrl"
                   :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
-                  }"
-                  name="files"
-                  :show-file-list="false"
-                  :auto-upload="false"
-                  :data="matUploadData"
-                  :on-change="matUploadChange"
-                  class="upload-file-uploader"
-                >
-                  <el-button type="primary"> <Icon icon="ep:upload-filled" />上传 </el-button>
+                  }" name="files" :show-file-list="false" :auto-upload="false" :data="matUploadData"
+                  :on-change="matUploadChange" class="upload-file-uploader">
+                  <el-button type="primary" v-bind:disabled="btnView || btnSave">
+                    <Icon icon="ep:upload-filled" />上传
+                  </el-button>
                 </el-upload>
               </el-col>
               <el-table :data="formData.attachments" class="hl-table">
@@ -348,30 +211,16 @@
                   </template> -->
                 </el-table-column>
 
-                <el-table-column
-                  prop="createTime"
-                  align="center"
-                  label="上传日期"
-                  :formatter="dateFormatter"
-                />
+                <el-table-column prop="createTime" align="center" label="上传日期" :formatter="dateFormatter" />
 
                 <el-table-column label="操作" align="center">
                   <template #default="scope">
-                    <el-button
-                      link
-                      type="danger"
-                      size="small"
-                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
-                      v-if="isShowBtnDelete"
-                    >
+                    <el-button link type="danger" size="small" v-bind:disabled="btnView || btnDelete"
+                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)" >
                       删除
                     </el-button>
-                    <el-button
-                      link
-                      type="primary"
-                      size="small"
-                      @click="downloadAttachment(scope.row.name, scope.row.url)"
-                    >
+                    <el-button link type="primary" size="small" v-bind:disabled="btnView || btnDelete"
+                      @click="downloadAttachment(scope.row.name, scope.row.url)">
                       下载
                     </el-button>
                   </template>
@@ -427,30 +276,12 @@
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
-      <el-button
-        @click="submitForm"
-        v-if="isShowBtnGroup"
-        type="success"
-        :disabled="formLoading"
-        size="large"
-        >保 存</el-button
-      >
-      <el-button
-        @click="handleStatus(2)"
-        v-if="isShowBtnGroup"
-        type="primary"
-        :disabled="formLoading"
-        size="large"
-        >提 交</el-button
-      >
-      <el-button
-        @click="handleStatus(3)"
-        v-if="isShowBtnCancel"
-        type="danger"
-        :disabled="formLoading"
-        size="large"
-        >报 废</el-button
-      >
+      <el-button @click="submitForm"   type="success" :disabled="btnView || btnSave" size="large">保
+        存</el-button>
+      <el-button @click="handleStatus(2)"  type="primary" :disabled="btnView || btnSave" size="large">提
+        交</el-button>
+      <el-button @click="handleStatus(3)"  type="danger" :disabled="btnView || btnCancel" size="large">报
+        废</el-button>
     </div>
   </el-card>
 </template>
@@ -480,10 +311,8 @@ const message = useMessage() // 消息弹窗
 const { query } = useRoute()
 const router = useRouter()
 
-const isShow = ref(false)
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   stockType: 1,
@@ -495,7 +324,7 @@ const formData = ref({
   status: 1,
   whId: undefined,
   creator: undefined,
-  createTime: formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss'),
+  createTime: undefined,
   keeper: undefined,
   keeperTime: undefined,
   outbound: undefined,
@@ -534,11 +363,10 @@ const handleStatus = async (num) => {
   } catch (e) {
     return
   }
+  formData.value.status = num
   //保存表单数据
   await saveFormData()
 
-  formData.value.status = num
-
   const dataUpdate = formData.value as unknown as StorageApi.StorageVO
 
   if (num == 2) {
@@ -551,41 +379,23 @@ const handleStatus = async (num) => {
 
   message.success(t('common.updateSuccess'))
 
-  switch (num) {
-    case 1:
-      isShowBtnGroup.value = true
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = true
-      isShowBtnDelete.value = true
-      break
-    case 2:
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = true
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-      break
-    case 3:
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-      break
-    default:
-      break
-  }
-  //查看页面不可以编辑
-  if (query.type === 'review') {
-    isShowBtnGroup.value = false
-    isShowBtnCancel.value = false
-    isShowBtnOther.value = false
-    isShowBtnDelete.value = false
-  }
-  query.type = 'update'
   query.id = formData.value.id
+  query.type= 'update'
   reload()
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
+const enableHeadNo = ref(false)
+const handleStockType = async (typeid) => {
+  formData.value.headerNo = ''
+  if (typeid == 1) {
+    enableHeadNo.value = false
+  } else {
+
+    enableHeadNo.value = true
+  }
+
+}
 // ====================附件信息 开始=======================================
 const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL)
 const matUploadRef = ref()
@@ -639,7 +449,6 @@ const downloadAttachment = async (name, url) => {
 }
 // ====================附件信息 结束=======================================
 
-const storageid = ref()
 var commonResult = ''
 
 /** 提交表单 */
@@ -652,27 +461,27 @@ const saveFormData = async () => {
     const data = formData.value as unknown as StorageApi.StorageVO
     if (query.type === 'create') {
       //库存信息保存
-      storageid.value = await StorageApi.createStorage(data)
+      formData.value.id = await StorageApi.createStorage(data)
       commonResult = 'common.createSuccess'
     } else {
-      storageid.value = data.id
       await StorageApi.updateStorage(data)
       commonResult = 'common.updateSuccess'
     }
     //物料信息保存
     formData.value.matItemDOList.forEach((item) => {
-      item.stockId = storageid.value
+      item.stockId = formData.value.id
       item.whId = formData.value.whId
     })
     const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
-    await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
+    await StorageMatApi.createStorageMatBatch(dataMats, formData.value.id)
 
-    if (formData.value.attachments!=undefined &&  formData.value.attachments.length > 0) {
+    if (formData.value.attachments != undefined && formData.value.attachments.length > 0) {
       //附件信息保存
-      matUploadData.value.businessId = storageid
+      matUploadData.value.businessId = formData.value.id
       matUploadRef.value!.submit()
     }
-    formData.value = await StorageApi.getStorage(storageid.value)
+    await initStatus(formData.value.status)
+    //formData.value = await StorageApi.getStorage(formData.value.id)
     message.success(t(commonResult))
   } finally {
     formLoading.value = false
@@ -695,9 +504,8 @@ const submitForm = async () => {
   await saveFormData()
 
   // 成功后刷新
+  query.id = formData.value.id
   query.type = 'update'
-  query.id = storageid.value
-  formData.value.id = storageid.value
   //页面重新加载
   reload()
 }
@@ -808,11 +616,46 @@ const handleMatCode = async (scope, matid) => {
   }
 }
 
-const isShowBtnGroup = ref(true)
-const isShowBtnCancel = ref(false)
-const isShowBtnOther = ref(false)
-const isShowBtnDelete = ref(true)
-const btnWhClickable = ref(false)
+// 按钮控制
+const btnView = ref(false)
+const btnSave = ref(false)
+const btnCancel = ref(true)
+const btnDelete = ref(false)
+
+
+// 根据页面动作和数据状态控制按钮输入框信息
+const initStatus = async (status) =>{
+  switch(status){
+    case 1:
+      btnView.value = false
+      btnSave.value = false
+      btnCancel.value = true
+      btnDelete.value = false
+      break
+    case 2:
+      btnView.value = false
+      btnSave.value = true
+      btnCancel.value = false
+      btnDelete.value = true
+      break
+    case 3:
+      btnView.value = true
+      btnSave.value = true
+      btnCancel.value = true
+      btnDelete.value = true
+      break
+    default:
+      break
+  }
+  // 查看页面时可操作控件禁用
+  if(query.type === 'review'){
+      btnView.value = true
+      btnSave.value = true
+      btnCancel.value = true
+      btnDelete.value = true
+  }
+} 
+
 /** 初始化 **/
 onMounted(async () => {
   // 获得物料列表
@@ -828,8 +671,7 @@ onMounted(async () => {
   dialogTitle.value = t('action.' + query.type)
 
   dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
-
-  isShow.value = query.type == 'create' ? false : true
+  
 
   //-------------------仓库全数据
   const data = await WarehouseApi.getWarehouseSimpList()
@@ -839,34 +681,7 @@ onMounted(async () => {
     //获取库存信息
     formData.value = await StorageApi.getStorage(query.id)
 
-    switch (formData.value.status) {
-      case 1:
-        isShowBtnGroup.value = true
-        isShowBtnCancel.value = false
-        isShowBtnDelete.value = true
-        break
-      case 2:
-        isShowBtnGroup.value = false
-        isShowBtnCancel.value = true
-        isShowBtnOther.value = false
-        isShowBtnDelete.value = false
-        break
-      case 3:
-        isShowBtnGroup.value = false
-        isShowBtnCancel.value = false
-        isShowBtnOther.value = false
-        isShowBtnDelete.value = false
-        break
-      default:
-        break
-    }
-    //查看页面不可以编辑
-    if (query.type === 'review') {
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-    }
+    await initStatus(formData.value.status)
 
     //获得库区列表
     const queryParamsRg = reactive({
@@ -927,7 +742,7 @@ onMounted(async () => {
     }
     formData.value.attachments = (await getFilePage(attParams)).list
   }
-
+  
   //用户信息
   userList.value = await UserApi.getSimpleUserList()
 })
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index faa083a6..73f2676c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -9,14 +9,8 @@
       <img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
       <span v-else></span>
     </div>
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-      v-bind:disabled="isShowBtnOther"
-    >
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading"
+      v-bind:disabled="isShowBtnOther">
       <!--  基础信息   -->
       <el-card class="hl-card-info">
         <template #header>
@@ -34,13 +28,9 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="stockInType" label="出库类型">
-                  <el-select v-model="formData.stockInType" clearable style="width: 100%">
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
+                  <el-select v-model="formData.stockInType" clearable style="width: 100%" @change="handleStockType" v-bind:disabled="btnView || btnSave">
+                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE)" :key="dict.value"
+                      :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -50,19 +40,9 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="industry" label="单据状态">
-                  <el-select
-                    v-model="formData.status"
-                    placeholder="下拉选择"
-                    clearable
-                    class="!w-700px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
+                  <el-select v-model="formData.status" placeholder="下拉选择" clearable class="!w-700px" disabled>
+                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)" :key="dict.value"
+                      :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -70,7 +50,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="headerNo" label="上游单号">
-                  <el-input v-model="formData.headerNo" />
+                  <el-input v-model="formData.headerNo" class="!w-700px" v-bind:disabled="btnView || btnSave || enableHeadNo"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -79,27 +59,17 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="单据日期" prop="createTime">
-                  {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
+                  <el-date-picker v-model="formData.createTime" value-format="x" placeholder="单据日期" disabled
+                    class="!w-400px" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="whId" label="出库仓库" required>
-                  <el-select
-                    v-model="formData.whId"
-                    placeholder="下拉选择"
-                    clearable
-                    class="!w-400px"
-                    @change="handleWh"
-                    v-bind:disabled="btnWhClickable"
-                  >
-                    <el-option
-                      v-for="dict in warehouseList"
-                      :key="dict.id"
-                      :label="dict.whName"
-                      :value="dict.id"
-                    />
+                  <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-400px" @change="handleWh"
+                  v-bind:disabled="btnView || btnSave">
+                    <el-option v-for="dict in warehouseList" :key="dict.id" :label="dict.whName" :value="dict.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -109,12 +79,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="description">
-              <el-input
-                type="textarea"
-                v-model="formData.description"
-                show-word-limit
-                maxlength="200"
-              />
+              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" class="!w-2080px" v-bind:disabled="btnView || btnSave"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -128,46 +93,20 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
-                  >新增</el-button
-                >
+                <el-button class="hl-addbutton" type="primary" size="large" v-bind:disabled="btnView || btnSave" @click="onAddItem">新增</el-button>
               </el-col>
-              <el-form
-                ref="matSubFormRef"
-                :model="formData.matItemDOList"
-                :rules="subFormRules"
-                v-loading="subFormLoading"
-                label-width="0"
-              >
+              <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules"
+                v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.matItemDOList" class="hl-table">
                   <el-table-column prop="cid" label="序号" :width="80" />
                   <el-table-column prop="matId" min-width="140" align="center">
                     <template #header> <span class="hl-table_header">*</span>物料名称 </template>
                     <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.matId`"
-                        :rules="subFormRules.matId"
-                        class="mb-0px!"
-                      >
-                        <el-select
-                          v-model="scope.row.matId"
-                          placeholder="物料名称"
-                          :remote-method="remoteMatCodeSearch"
-                          remote-show-suffix
-                          remote
-                          clearable
-                          reserve-keyword
-                          filterable
-                          :loading="matSelectLoading"
-                          @change="(val) => handleMatCode(scope, val)"
-                          class="!w-180px"
-                        >
-                          <el-option
-                            v-for="item in matList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                          />
+                      <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
+                        <el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatCodeSearch" v-bind:disabled="btnView || btnSave"
+                          remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading"
+                          @change="(val) => handleMatCode(scope, val)" class="!w-180px">
+                          <el-option v-for="item in matList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                       </el-form-item>
                     </template>
@@ -175,50 +114,25 @@
                   <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
                   <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
                     <template #default="scope">
-                      <dict-tag
-                        :type="DICT_TYPE.HELI_MATERIAL_TYPE"
-                        :value="scope.row.matType"
-                        v-if="scope.row.matType ? true : false"
-                      />
+                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType"
+                        v-if="scope.row.matType ? true : false" />
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    prop="matSpec"
-                    label="规格/型号"
-                    min-width="120"
-                    align="center"
-                  />
+                  <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
 
                   <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
                     <template #default="scope">
-                      <dict-tag
-                        :type="DICT_TYPE.HELI_MATERIAL_UNIT"
-                        :value="scope.row.matUnit"
-                        v-if="scope.row.matUnit ? true : false"
-                      />
+                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit"
+                        v-if="scope.row.matUnit ? true : false" />
                     </template>
                   </el-table-column>
                   <el-table-column prop="rgId" min-width="120" align="center">
                     <template #header> <span class="hl-table_header">*</span>出库库区 </template>
                     <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.rgId`"
-                        :rules="subFormRules.rgId"
-                        class="mb-0px!"
-                      >
-                        <el-select
-                          v-model="scope.row.rgId"
-                          placeholder=""
-                          style="width: 100%"
-                          @change="handleRg(scope)"
-                          disabled=""
-                        >
-                          <el-option
-                            v-for="dict in rgList"
-                            :key="dict.id"
-                            :label="dict.rgName"
-                            :value="dict.id"
-                          />
+                      <el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
+                        <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="handleRg(scope)"
+                        v-bind:disabled="btnView || btnSave">
+                          <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rgName" :value="dict.id" />
                         </el-select>
                       </el-form-item>
                     </template>
@@ -226,18 +140,10 @@
                   <el-table-column prop="pnId" min-width="140" align="center">
                     <template #header> <span class="hl-table_header">*</span>出库库位 </template>
                     <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.pnId`"
-                        :rules="subFormRules.pnId"
-                        class="mb-0px!"
-                      >
-                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
-                          <el-option
-                            v-for="dict in scope.row.pnlist"
-                            :key="dict.id"
-                            :label="dict.pnName"
-                            :value="dict.id"
-                          />
+                      <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
+                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%" v-bind:disabled="btnView || btnSave">
+                          <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pnName"
+                            :value="dict.id" />
                         </el-select>
                       </el-form-item>
                     </template>
@@ -246,19 +152,16 @@
                   <el-table-column prop="storageOkQty" min-width="120" align="center">
                     <template #header> <span class="hl-table_header">*</span>出库数量</template>
                     <template #default="scope">
-                      <el-form-item
-                        :prop="`${scope.$index}.storageOkQty`"
-                        :rules="subFormRules.storageOkQty"
-                        class="mb-0px!"
-                      >
-                        <el-input v-model="scope.row.storageOkQty" />
+                      <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty"
+                        class="mb-0px!">
+                        <el-input v-model="scope.row.storageOkQty" v-bind:disabled="btnView || btnSave"/>
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
                   <el-table-column prop="description" min-width="180" label="备注" align="center">
                     <template #default="scope">
-                      <el-input v-model="scope.row.description" />
+                      <el-input v-model="scope.row.description" v-bind:disabled="btnView || btnSave"/>
                     </template>
                   </el-table-column>
                   <el-table-column label="操作" align="center" width="240">
@@ -272,13 +175,8 @@
                       </el-button>
 
                       <el-button link type="primary" @click="handlefuke(scope.$index, scope.row)">复制</el-button> -->
-                      <el-button
-                        link
-                        type="danger"
-                        size="small"
-                        @click.prevent="handleDelete2(scope.$index)"
-                        v-if="isShowBtnDelete"
-                      >
+                      <el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)"
+                      v-bind:disabled="btnView || btnDelete">
                         删除
                       </el-button>
                     </template>
@@ -298,24 +196,15 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-upload
-                  ref="matUploadRef"
-                  :file-list="matUploadFiles"
-                  multiple
-                  :limit="10"
-                  :action="uploadUrl"
+                <el-upload ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="uploadUrl"
                   :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
-                  }"
-                  name="files"
-                  :show-file-list="false"
-                  :auto-upload="false"
-                  :data="matUploadData"
-                  :on-change="matUploadChange"
-                  class="upload-file-uploader"
-                >
-                  <el-button type="primary"> <Icon icon="ep:upload-filled" />上传 </el-button>
+                  }" name="files" :show-file-list="false" :auto-upload="false" :data="matUploadData"
+                  :on-change="matUploadChange" class="upload-file-uploader" >
+                  <el-button type="primary" v-bind:disabled="btnView || btnSave">
+                    <Icon icon="ep:upload-filled"  />上传
+                  </el-button>
                 </el-upload>
               </el-col>
               <el-table :data="formData.attachments" class="hl-table">
@@ -325,30 +214,16 @@
                   </template> -->
                 </el-table-column>
 
-                <el-table-column
-                  prop="createTime"
-                  align="center"
-                  label="上传日期"
-                  :formatter="dateFormatter"
-                />
+                <el-table-column prop="createTime" align="center" label="上传日期" :formatter="dateFormatter" />
 
                 <el-table-column label="操作" align="center">
                   <template #default="scope">
-                    <el-button
-                      link
-                      type="danger"
-                      size="small"
-                      v-if="isShowBtnDelete"
-                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
-                    >
+                    <el-button link type="danger" size="small" v-bind:disabled="btnView || btnDelete"
+                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)">
                       删除
                     </el-button>
-                    <el-button
-                      link
-                      type="primary"
-                      size="small"
-                      @click="downloadAttachment(scope.row.name, scope.row.url)"
-                    >
+                    <el-button link type="primary" size="small" v-bind:disabled="btnView || btnDelete"
+                      @click="downloadAttachment(scope.row.name, scope.row.url)">
                       下载
                     </el-button>
                   </template>
@@ -404,30 +279,12 @@
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
-      <el-button
-        @click="submitForm"
-        v-if="isShowBtnGroup"
-        type="success"
-        :disabled="formLoading"
-        size="large"
-        >保 存</el-button
-      >
-      <el-button
-        @click="handleStatus(2)"
-        v-if="isShowBtnGroup"
-        type="primary"
-        :disabled="formLoading"
-        size="large"
-        >提 交</el-button
-      >
-      <el-button
-        @click="handleStatus(3)"
-        v-if="isShowBtnCancel"
-        type="danger"
-        :disabled="formLoading"
-        size="large"
-        >报 废</el-button
-      >
+      <el-button @click="submitForm"   type="success" :disabled="btnView || btnSave" size="large">保
+        存</el-button>
+      <el-button @click="handleStatus(2)"  type="primary" :disabled="btnView || btnSave" size="large">提
+        交</el-button>
+      <el-button @click="handleStatus(3)"  type="danger" :disabled="btnView || btnCancel" size="large">报
+        废</el-button>
     </div>
   </el-card>
 </template>
@@ -471,7 +328,7 @@ const formData = ref({
   status: 1,
   whId: undefined,
   creator: undefined,
-  createTime: formatDate(new Date(), 'YYYY-MM-DD HH:mm'),
+  createTime: undefined,
   keeper: undefined,
   keeperTime: undefined,
   outbound: undefined,
@@ -498,6 +355,17 @@ const subFormRules = reactive({
   pnId: [{ required: true, message: '库位不能为空', trigger: 'blur' }],
   storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }]
 })
+const enableHeadNo = ref(false)
+const handleStockType = async (typeid) => {
+  formData.value.headerNo = ''
+  if (typeid == 1) {
+    enableHeadNo.value = false
+  } else {
+
+    enableHeadNo.value = true
+  }
+
+}
 const handleStatus = async (num) => {
   // 校验表单
   await formRef.value.validate()
@@ -526,36 +394,7 @@ const handleStatus = async (num) => {
 
   message.success(t('common.updateSuccess'))
 
-  switch (num) {
-    case 1:
-      isShowBtnGroup.value = true
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = true
-      isShowBtnDelete.value = true
-      break
-    case 2:
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = true
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-      break
-    case 3:
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-      break
-    default:
-      break
-  }
-  //查看页面不可以编辑
-  if (query.type === 'review') {
-    isShowBtnGroup.value = false
-    isShowBtnCancel.value = false
-    isShowBtnOther.value = false
-    isShowBtnDelete.value = false
-  }
-  query.id = storageid.value
+  query.id = formData.value.id
   query.type = 'update'
   reload()
 }
@@ -614,7 +453,6 @@ const downloadAttachment = async (name, url) => {
 }
 // ====================附件信息 结束=======================================
 
-const storageid = ref()
 var commonResult = ''
 
 /** 提交表单 */
@@ -647,27 +485,27 @@ const saveFormData = async () => {
     const data = formData.value as unknown as StorageApi.StorageVO
     if (query.type === 'create') {
       //库存信息保存
-      storageid.value = await StorageApi.createStorage(data)
+      formData.value.id = await StorageApi.createStorage(data)
       commonResult = 'common.createSuccess'
     } else {
-      storageid.value = data.id
+      
       await StorageApi.updateStorage(data)
       commonResult = 'common.updateSuccess'
     }
     //物料信息保存
     formData.value.matItemDOList.forEach((item) => {
-      item.stockId = storageid.value
+      item.stockId = formData.value.id
       item.whId = formData.value.whId
     })
     const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
-    await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
+    await StorageMatApi.createStorageMatBatch(dataMats, formData.value.id)
 
-    if (formData.value.attachments!=undefined &&  formData.value.attachments.length > 0) {
+    if (formData.value.attachments != undefined && formData.value.attachments.length > 0) {
       //附件信息保存
-      matUploadData.value.businessId = storageid
+      matUploadData.value.businessId = formData.value.id
       matUploadRef.value!.submit()
     }
-    formData.value = await StorageApi.getStorage(storageid.value)
+    await initStatus(formData.value.status)
     message.success(t(commonResult))
   } finally {
     formLoading.value = false
@@ -689,7 +527,7 @@ const submitForm = async () => {
   //保存表单数据
   await saveFormData()
   // 成功后刷新
-  query.id = storageid.value
+  query.id = formData.value.id
   query.type = 'update'
   reload()
 }
@@ -850,15 +688,49 @@ const handleMatCode = async (scope, matid) => {
   }
 }
 
-const isShowBtnGroup = ref(true)
-const isShowBtnCancel = ref(false)
-const isShowBtnOther = ref(false)
-const isShowBtnDelete = ref(true)
-const btnWhClickable = ref(false)
+
 const matLastData = ref([])
+// 按钮控制
+const btnView = ref(false)
+const btnSave = ref(false)
+const btnCancel = ref(true)
+const btnDelete = ref(false)
+
+
+// 根据页面动作和数据状态控制按钮输入框信息
+const initStatus = async (status) => {
+  switch (status) {
+    case 1:
+      btnView.value = false
+      btnSave.value = false
+      btnCancel.value = true
+      btnDelete.value = false
+      break
+    case 2:
+      btnView.value = false
+      btnSave.value = true
+      btnCancel.value = false
+      btnDelete.value = true
+      break
+    case 3:
+      btnView.value = true
+      btnSave.value = true
+      btnCancel.value = true
+      btnDelete.value = true
+      break
+    default:
+      break
+  }
+  // 查看页面时可操作控件禁用
+  if (query.type === 'review') {
+    btnView.value = true
+    btnSave.value = true
+    btnCancel.value = true
+    btnDelete.value = true
+  }
+}
 /** 初始化 **/
 onMounted(async () => {
-  btnWhClickable.value = query.type === 'update' ? true : false
 
   matLastData.value = await StorageMatApi.getStorageMatList()
 
@@ -882,36 +754,7 @@ onMounted(async () => {
   if (query.id) {
     //获取库存信息
     formData.value = await StorageApi.getStorage(query.id)
-
-    switch (formData.value.status) {
-      case 1:
-        isShowBtnGroup.value = true
-        isShowBtnCancel.value = false
-        isShowBtnDelete.value = true
-        break
-      case 2:
-        isShowBtnGroup.value = false
-        isShowBtnCancel.value = true
-        isShowBtnOther.value = false
-        isShowBtnDelete.value = false
-        break
-      case 3:
-        isShowBtnGroup.value = false
-        isShowBtnCancel.value = false
-        isShowBtnOther.value = false
-        isShowBtnDelete.value = false
-        break
-      default:
-        break
-    }
-    //查看页面不可以编辑
-    if (query.type === 'review') {
-      isShowBtnGroup.value = false
-      isShowBtnCancel.value = false
-      isShowBtnOther.value = false
-      isShowBtnDelete.value = false
-    }
-
+    await initStatus(formData.value.status)
     //获得库区列表
     const queryParamsRg = reactive({
       pageNo: 1,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
index fd82a0ab..74aab6cf 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
@@ -108,7 +108,7 @@
         <el-table-column label="物料简称" align="center" prop="shortName" min-width="120" />
         <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
         <el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
-        <el-table-column label="业务单据编号" align="center" prop="stockNo" min-width="120"/>
+        <el-table-column label="业务单据编号" align="center" prop="stockNo" min-width="180"/>
         <el-table-column label="业务单据类型" align="center" prop="stockTypeName" min-width="120"/>
         <el-table-column label="上游单据编号" align="center" prop="headerNo" min-width="120"/>
         <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>

From d3f0c12030ba4d2efaf88d0fcedafa5605cf76d1 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Tue, 30 Jan 2024 12:40:59 +0800
Subject: [PATCH 50/64] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

盘点接口
---
 .../storagecheck/StorageCheckController.java  | 255 +++++++++---------
 1 file changed, 127 insertions(+), 128 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
index b2cab75e..df09b770 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java
@@ -1,129 +1,128 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.StorageSaveReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
+import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
 import javax.validation.*;
-package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck;
-
-import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.StorageSaveReqVO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
-import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.io.IOException;
-
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
-
-import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
-
-import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
-import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
-import com.chanko.yunxi.mes.module.heli.service.storagecheck.StorageCheckService;
-
-@Tag(name = "管理后台 - 入/出库盘点")
-@RestController
-@RequestMapping("/heli/storage-check")
-@Validated
-public class StorageCheckController {
-
-    @Resource
-    private StorageCheckService storageCheckService;
-
-    @Resource
-    private StorageCheckMatService storageCheckMatService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建入/出库盘点")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:create')")
-    public CommonResult<Long> createStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO createReqVO) {
-        return success(storageCheckService.createStorageCheck(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新入/出库盘点")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:update')")
-    public CommonResult<Boolean> updateStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) {
-        storageCheckService.updateStorageCheck(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-status")
-    @Operation(summary = "更新盘点状态")
-    @PreAuthorize("@ss.hasPermission('heli:storage:update')")
-    public CommonResult<Boolean> updateStorageCheckStatus(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) {
-
-        // 提交或者删除时记录相关操作人
-        LocalDateTime currTime = LocalDateTime.now();
-        if(updateReqVO.getStatus().equals(2)){
-            // 已提交时间更新
-            updateReqVO.setKeeperTime(currTime);
-        } else if(updateReqVO.getStatus().equals(3)){
-            // 已删除时间更新
-            updateReqVO.setCancelTime(currTime);
-        }
-        // 盘点信息保存
-        storageCheckService.updateStorageCheck(updateReqVO);
-
-        // TODO保存物料列表信息
-
-        // TODO生成入库/出库单据
-
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除入/出库盘点")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:delete')")
-    public CommonResult<Boolean> deleteStorageCheck(@RequestParam("id") Long id) {
-        storageCheckService.deleteStorageCheck(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得入/出库盘点")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
-    public CommonResult<StorageCheckRespVO> getStorageCheck(@RequestParam("id") Long id) {
-        StorageCheckDO storageCheck = storageCheckService.getStorageCheck(id);
-        return success(BeanUtils.toBean(storageCheck, StorageCheckRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得入/出库盘点分页")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
-    public CommonResult<PageResult<StorageCheckRespVO>> getStorageCheckPage(@Valid StorageCheckPageReqVO pageReqVO) {
-        PageResult<StorageCheckDO> pageResult = storageCheckService.getStorageCheckPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, StorageCheckRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出入/出库盘点 Excel")
-    @PreAuthorize("@ss.hasPermission('heli:storage-check:export')")
-    @OperateLog(type = EXPORT)
-    public void exportStorageCheckExcel(@Valid StorageCheckPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<StorageCheckDO> list = storageCheckService.getStorageCheckPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "入/出库盘点.xls", "数据", StorageCheckRespVO.class,
-                        BeanUtils.toBean(list, StorageCheckRespVO.class));
-    }
-
-}
+import javax.servlet.http.*;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
+import com.chanko.yunxi.mes.module.heli.service.storagecheck.StorageCheckService;
+
+@Tag(name = "管理后台 - 入/出库盘点")
+@RestController
+@RequestMapping("/heli/storage-check")
+@Validated
+public class StorageCheckController {
+
+    @Resource
+    private StorageCheckService storageCheckService;
+
+    @Resource
+    private StorageCheckMatService storageCheckMatService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建入/出库盘点")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:create')")
+    public CommonResult<Long> createStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO createReqVO) {
+        return success(storageCheckService.createStorageCheck(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新入/出库盘点")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:update')")
+    public CommonResult<Boolean> updateStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) {
+        storageCheckService.updateStorageCheck(updateReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/update-status")
+    @Operation(summary = "更新盘点状态")
+    @PreAuthorize("@ss.hasPermission('heli:storage:update')")
+    public CommonResult<Boolean> updateStorageCheckStatus(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) {
+
+        // 提交或者删除时记录相关操作人
+        LocalDateTime currTime = LocalDateTime.now();
+        if(updateReqVO.getStatus().equals(2)){
+            // 已提交时间更新
+            updateReqVO.setKeeperTime(currTime);
+        } else if(updateReqVO.getStatus().equals(3)){
+            // 已删除时间更新
+            updateReqVO.setCancelTime(currTime);
+        }
+        // 盘点信息保存
+        storageCheckService.updateStorageCheck(updateReqVO);
+
+        // TODO保存物料列表信息
+
+        // TODO生成入库/出库单据
+
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除入/出库盘点")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:delete')")
+    public CommonResult<Boolean> deleteStorageCheck(@RequestParam("id") Long id) {
+        storageCheckService.deleteStorageCheck(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得入/出库盘点")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
+    public CommonResult<StorageCheckRespVO> getStorageCheck(@RequestParam("id") Long id) {
+        StorageCheckDO storageCheck = storageCheckService.getStorageCheck(id);
+        return success(BeanUtils.toBean(storageCheck, StorageCheckRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得入/出库盘点分页")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:query')")
+    public CommonResult<PageResult<StorageCheckRespVO>> getStorageCheckPage(@Valid StorageCheckPageReqVO pageReqVO) {
+        PageResult<StorageCheckDO> pageResult = storageCheckService.getStorageCheckPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, StorageCheckRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出入/出库盘点 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:storage-check:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStorageCheckExcel(@Valid StorageCheckPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<StorageCheckDO> list = storageCheckService.getStorageCheckPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "入/出库盘点.xls", "数据", StorageCheckRespVO.class,
+                        BeanUtils.toBean(list, StorageCheckRespVO.class));
+    }
+
+}

From f856436e96476d710bb30d332fffbff8ce7d58f7 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 12:45:31 +0800
Subject: [PATCH 51/64] =?UTF-8?q?=E8=81=8C=E5=B7=A5=20=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/dept/DeptForm.vue          |   2 +-
 .../src/views/heli/hlvuestyle/userSelect.vue  | 116 ++++++++++++------
 2 files changed, 82 insertions(+), 36 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
index d8f72aef..7d97207a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
@@ -24,7 +24,7 @@
         />
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-       <UserSelect v-model="formData.leaderUserId" @update:newValue="handleSelectedUser" />
+       <UserSelect v-model="formData.leaderUserId" :leaderUserId="formData.leaderUserId" @update:newValue="handleSelectedUser" />
       </el-form-item>
       <!--      <el-form-item label="联系电话" prop="phone">
         <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
index 83b0dd0d..60dd4e43 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, toRefs,computed } from 'vue'
+import { ref, onMounted, toRefs, computed } from 'vue'
 import * as UserApi from '@/api/system/user'
 
 interface UserVO {
@@ -31,58 +31,104 @@ interface UserVO {
   nickname: string
 }
 const props = defineProps({
-  initialUserList: {
-    type: Array as PropType<UserVO[]>,
-    default: () => []
+  leaderUserId: {
+    type: [Number, String],
+    required: true // 如果是必需的属性，可以设置为true
   }
 })
+const userParams = {
+  pageNo: 1,
+  pageSize: 10,
+  status: undefined, // 根据实际情况调整参数
+  username: undefined,
+  nickname: undefined
+}
 const valueName: any = ref() //选中的值
-const valueNameObject:any = ref(); // 存储选中的完整用户对象
+const valueNameObject: any = ref() // 存储选中的完整用户对象
 
 const emit = defineEmits(['update:newValue'])
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const userSelectList = ref<UserApi.UserVO[]>([])
 const userSelectLoading = ref(false)
+const leaderUserId = toRefs(props).leaderUserId // 获取 props 中的 leaderUserId
+const initialValue: any = ref(null) // 存储初始选中的用户 ID
+
+const gitlist = async () => {
+  const data = await UserApi.getUserPage(userParams)
+  userList.value = data.list
+  // 设置初始值
+  if (leaderUserId.value) {
+    valueName.value = leaderUserId.value
+    const initialUser = await UserApi.getUser(valueName.value)
 
+    // 查找初始用户是否已经在 userList 中
+    let foundInitialUserInList = false
+    for (const user of userList.value) {
+      if (user.id === initialUser.id) {
+        foundInitialUserInList = true
+        break
+      }
+    }
+    // 如果初始用户不在列表中，则将其添加到列表开头
+    if (!foundInitialUserInList && !userSelectList.value.length) {
+      userList.value = []
+      userList.value.unshift(initialUser)
+    }
+  }
+  remoteMethod('')
+}
+
+const remoteMethod = async (query: any) => {
+  userSelectLoading.value = true
+  userSelectList.value = []
+
+  try {
+    if (query) {
+      // 根据 username 查询
+      userParams.username = query
+      const dataByUsername = await UserApi.getUserPage(userParams)
+
+      // 将根据 username 查询的结果添加到临时列表（用于去重）
+      let tempUserList = [...dataByUsername.list]
+
+      // 根据 nickname 查询（假设 nickname 查询返回的数据与 username 不重复）
+      userParams.username = undefined
+      userParams.nickname = query
+      const dataByNickname = await UserApi.getUserPage(userParams)
+
+      // 将根据 nickname 查询的结果合并至临时列表，并去重
+      tempUserList = [
+        ...tempUserList,
+        ...dataByNickname.list.filter(
+          (item) => !tempUserList.some((selectItem) => selectItem.id === item.id)
+        )
+      ]
+
+      // 设置最终的用户选择列表为去重后的结果
+      userSelectList.value = tempUserList
+    } else {
+      // 加载所有数据（无查询条件时的情况）
+      const data = await UserApi.getUserPage({ ...userParams, pageNo: 1 })
+      userList.value = [...userList.value, ...data.list]
+      userSelectList.value = userList.value
+    }
+  } catch (error) {
+    console.error(error)
+  } finally {
+    userSelectLoading.value = false
+  }
+}
 // 初始化用户列表
 onMounted(async () => {
-  const userParams = {
-    pageNo: 1,
-    pageSize: 10,
-    status: undefined, // 根据实际情况调整参数
-  }
   try {
-    const data = await UserApi.getUserPage(userParams)
-    userList.value = data.list
-    // 设置初始值，如果需要的话
-    remoteMethod('')
+    await gitlist()
   } catch (error) {
     console.error(error)
   }
 })
 
-const remoteMethod = (query: any) => {
-  if (query) {
-    userSelectLoading.value = true
-    setTimeout(() => {
-      userSelectLoading.value = false
-      userSelectList.value = userList.value
-        .filter(
-          (item) =>
-            item.nickname.toLowerCase().includes(query.toLowerCase()) ||
-            item.username.toLowerCase().includes(query.toLowerCase())
-        )
-        .slice(0, 10) //只显示前10个
-    }, 200)
-  } else {
-    userSelectList.value = userList.value.slice(0, 10) //只显示前10个
-  }
-}
-
 const onSelectChange = (newValue: any) => {
-  valueNameObject.value = userList.value.find(user => user.id === newValue); // 更新选中的完整用户对象
+  valueNameObject.value = userList.value.find((user) => user.id === newValue) // 更新选中的完整用户对象
   emit('update:newValue', valueNameObject.value)
 }
-
-
 </script>

From fefca0672adbdf44d046b166c48a57406144d6aa Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 12:55:04 +0800
Subject: [PATCH 52/64] =?UTF-8?q?=E4=BB=93=E5=82=A8=E8=AE=BE=E7=BD=AE=20?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=BD=BF=E7=94=A8=E5=B0=81=E8=A3=85?=
 =?UTF-8?q?=E7=9A=84=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/heli/warehouse/WarehouseForm.vue    | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
index 01d841b1..9da63fc1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
@@ -14,27 +14,11 @@
         <el-input v-model="formData.whName" placeholder="请输入仓库名称" class="!w-500px" />
       </el-form-item>
       <el-form-item label="联系人" prop="contact">
-        <!-- <el-input v-model="formData.contact" placeholder="请输入联系人" class="!w-500px" /> -->
-        <el-select
+        <UserSelect class="!w-500px"
           v-model="formData.contact"
-          placeholder="请输入联系人"
-          :remote-method="remoteUserSearch"
-          remote-show-suffix
-          remote
-          clearable
-          reserve-keyword
-          filterable
-          :loading="userSelectLoading"
-          class="!w-500px"
-          @change="handleContact"
-        >
-          <el-option
-            v-for="item in userSelectList"
-            :key="item.id"
-            :label="item.username + ' ' + item.nickname"
-            :value="item.id"
-          />
-        </el-select>
+          :leaderUserId="formData.contact"
+          @update:newValue="handleSelectedUser"
+        />
       </el-form-item>
       <el-form-item label="联系电话" prop="telephone">
         <el-input v-model="formData.telephone" placeholder="请输入联系电话" class="!w-500px" />
@@ -62,7 +46,7 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as WarehouseApi from '@/api/heli/warehouse'
 import * as UserApi from '@/api/system/user'
 import { fromPairs } from 'lodash-es'
-
+import UserSelect from '../hlvuestyle/userSelect.vue'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -179,4 +163,9 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
+const handleSelectedUser = (newValue: any) => {
+  // console.log('接收对应的数据:', newValue)
+  formData.value.leaderUserId = newValue.id
+}
 </script>

From 5f53dbda47d6b4b27c95b5210b1cb3c842fa5f2d Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 13:08:14 +0800
Subject: [PATCH 53/64] =?UTF-8?q?=E8=BD=A6=E9=97=B4=20=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85=E8=81=8C=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/workshop/WorkshopForm.vue     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
index 6d2d8a8e..d8527059 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
@@ -25,7 +25,12 @@
         />
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-        <el-select v-model="formData.leaderUserId"
+         <UserSelect 
+          v-model="formData.leaderUserId"
+          :leaderUserId="formData.leaderUserId"
+          @update:newValue="handleSelectedUser"
+        />
+        <!-- <el-select v-model="formData.leaderUserId"
                    placeholder="请输入负责人"
                    :remote-method="remoteUserSearch"
                    remote-show-suffix
@@ -41,7 +46,7 @@
             :label="item.username + ' ' + item.nickname"
             :value="item.id"
           />
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-form-item label="描述信息" prop="description">
         <el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200"/>
@@ -70,7 +75,7 @@ import * as WorkshopApi from '@/api/heli/workshop'
 import {defaultProps, handleTree} from "@/utils/tree";
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from "@/api/system/user";
-
+import UserSelect from '../hlvuestyle/userSelect.vue'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -179,4 +184,9 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
+const handleSelectedUser = (newValue: any) => {
+  // console.log('接收对应的数据:', newValue)
+  formData.value.leaderUserId = newValue.id
+}
 </script>

From 310e25e2faafca6230225c737ca91fa2886d6ccb Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 13:16:15 +0800
Subject: [PATCH 54/64] =?UTF-8?q?=E8=BD=A6=E9=97=B4=20=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/classes/ClassesForm.vue    | 25 ++++++-------------
 .../src/views/heli/hlvuestyle/userSelect.vue  |  2 +-
 .../views/heli/warehouse/WarehouseForm.vue    |  2 +-
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
index 4d77957e..44a72814 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
@@ -34,23 +34,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-        <el-select v-model="formData.leaderUserId"
-                   placeholder="请输入负责人"
-                   :remote-method="remoteUserSearch"
-                   remote-show-suffix
-                   remote
-                   clearable
-                   reserve-keyword
-                   filterable
-                   :loading="userSelectLoading"
-        >
-          <el-option
-            v-for="item in userSelectList"
-            :key="item.id"
-            :label="item.username + ' ' + item.nickname"
-            :value="item.id"
-          />
-        </el-select>
+          <UserSelect v-model="formData.leaderUserId" :leaderUserId="formData.leaderUserId" @update:newValue="handleSelectedUser" />
       </el-form-item>
       <el-form-item label="班组描述" prop="description">
         <el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200" />
@@ -79,7 +63,7 @@ import * as UserApi from "@/api/system/user";
 import * as WorkshopApi from "@/api/heli/workshop";
 import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 import {getWorkshopPage} from "@/api/heli/workshop";
-
+import UserSelect from '../hlvuestyle/userSelect.vue'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -219,4 +203,9 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
+const handleSelectedUser = (newValue: any) => {
+  // console.log('接收对应的数据:', newValue)
+  formData.value.leaderUserId = newValue.id
+}
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
index 60dd4e43..1d79a384 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
@@ -2,7 +2,7 @@
   <!-- 负责人选择 -->
   <el-select
     v-model="valueName"
-    placeholder="请输入负责人"
+    placeholder="请选择相关人员"
     :remote-method="remoteMethod"
     remote-show-suffix
     remote
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
index 9da63fc1..24bf711c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
@@ -166,6 +166,6 @@ const resetForm = () => {
 
 const handleSelectedUser = (newValue: any) => {
   // console.log('接收对应的数据:', newValue)
-  formData.value.leaderUserId = newValue.id
+  formData.value.contact = newValue.id
 }
 </script>

From 61328efcc51737bcdecc89c3502fc4f963abfb1c Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Tue, 30 Jan 2024 13:51:01 +0800
Subject: [PATCH 55/64] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8E=E6=98=B5=E7=A7=B0=E5=90=8C=E6=97=B6like?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/user/vo/user/UserPageReqVO.java     | 3 +++
 .../module/system/dal/mysql/user/AdminUserMapper.java    | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserPageReqVO.java
index a5f81262..28188245 100644
--- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserPageReqVO.java
+++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserPageReqVO.java
@@ -25,6 +25,9 @@ public class UserPageReqVO extends PageParam {
     @Schema(description = "昵称，模糊匹配", example = "mes")
     private String nickname;
 
+    @Schema(description = "用户账号或昵称", example = "mes")
+    private String userNickName;
+
     @Schema(description = "手机号码，模糊匹配", example = "mes")
     private String mobile;
 
diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java
index 585092ec..365a4390 100644
--- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java
+++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java
@@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.UserPageReqVO;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.util.StringUtils;
 
 import java.util.Collection;
 import java.util.List;
@@ -26,14 +27,18 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     }
 
     default PageResult<AdminUserDO> selectPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
+        LambdaQueryWrapperX<AdminUserDO> query = new LambdaQueryWrapperX<AdminUserDO>()
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                .orderByDesc(AdminUserDO::getId));
+                .orderByDesc(AdminUserDO::getId);
+        if(!StringUtils.isEmpty(reqVO.getUserNickName())){
+            query.like(AdminUserDO::getUsername, reqVO.getUserNickName()).or().like(AdminUserDO::getNickname, reqVO.getUserNickName());
+        }
+        return selectPage(reqVO, query);
     }
 
     default List<AdminUserDO> selectListByNickname(String nickname) {

From 33d3dc98351b53ebea7f8daf009fb098d9a50f45 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 14:35:36 +0800
Subject: [PATCH 56/64] =?UTF-8?q?=E8=81=8C=E5=B7=A5=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=20=E4=BB=A5=E5=8F=8A=20?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=98=AF=E5=90=A6=E5=AD=97=E5=85=B8=E8=B0=83?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/user/index.ts              |  1 +
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss  | 10 ++++-
 .../src/views/heli/hlvuestyle/userSelect.vue  | 45 +++++++------------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts
index c443a37f..92d42a27 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts
@@ -4,6 +4,7 @@ export interface UserVO {
   id: number
   username: string
   nickname: string
+  userNickName:string
   deptId: number
   postIds: string[]
   email: string
diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index cefdfaf9..4d395d78 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -244,8 +244,14 @@
   background-color: transparent;
   border: none;
 }
-.sizestylenone{
+.sizestylenone {
   background-color: transparent;
   border: none;
   color: var(--el-table-text-color);
-}
\ No newline at end of file
+}
+
+.fou {
+  background-color: #f7fbfd;
+  border: 1px solid #d4d6e3;
+  color: #77838C;
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
index 1d79a384..f6342d30 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
@@ -11,6 +11,7 @@
     filterable
     :loading="userSelectLoading"
     @change="onSelectChange"
+     @visible-change="onVisibleChange"
   >
     <el-option
       v-for="item in userSelectList"
@@ -25,11 +26,6 @@
 import { ref, onMounted, toRefs, computed } from 'vue'
 import * as UserApi from '@/api/system/user'
 
-interface UserVO {
-  id: number
-  username: string
-  nickname: string
-}
 const props = defineProps({
   leaderUserId: {
     type: [Number, String],
@@ -41,7 +37,8 @@ const userParams = {
   pageSize: 10,
   status: undefined, // 根据实际情况调整参数
   username: undefined,
-  nickname: undefined
+  nickname: undefined,
+  userNickName: undefined
 }
 const valueName: any = ref() //选中的值
 const valueNameObject: any = ref() // 存储选中的完整用户对象
@@ -81,32 +78,12 @@ const gitlist = async () => {
 const remoteMethod = async (query: any) => {
   userSelectLoading.value = true
   userSelectList.value = []
-
   try {
     if (query) {
-      // 根据 username 查询
-      userParams.username = query
-      const dataByUsername = await UserApi.getUserPage(userParams)
-
-      // 将根据 username 查询的结果添加到临时列表（用于去重）
-      let tempUserList = [...dataByUsername.list]
-
-      // 根据 nickname 查询（假设 nickname 查询返回的数据与 username 不重复）
-      userParams.username = undefined
-      userParams.nickname = query
-      const dataByNickname = await UserApi.getUserPage(userParams)
-
-      // 将根据 nickname 查询的结果合并至临时列表，并去重
-      tempUserList = [
-        ...tempUserList,
-        ...dataByNickname.list.filter(
-          (item) => !tempUserList.some((selectItem) => selectItem.id === item.id)
-        )
-      ]
-
-      // 设置最终的用户选择列表为去重后的结果
-      userSelectList.value = tempUserList
-    } else {
+      userParams.userNickName = query
+      const data = await UserApi.getUserPage(userParams)
+      userSelectList.value = data.list
+    }else {
       // 加载所有数据（无查询条件时的情况）
       const data = await UserApi.getUserPage({ ...userParams, pageNo: 1 })
       userList.value = [...userList.value, ...data.list]
@@ -127,6 +104,14 @@ onMounted(async () => {
   }
 })
 
+const onVisibleChange = (isVisible: boolean) => {
+  if (!isVisible) {
+    // 下拉框关闭时，重置查询参数和下拉框列表
+    userParams.userNickName = undefined;
+    userSelectList.value = [];
+  }
+}
+
 const onSelectChange = (newValue: any) => {
   valueNameObject.value = userList.value.find((user) => user.id === newValue) // 更新选中的完整用户对象
   emit('update:newValue', valueNameObject.value)

From f12c459183190ecd8c0df8345e4a2d0208848c66 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 14:46:34 +0800
Subject: [PATCH 57/64] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=8C=E5=B7=A5?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/hlvuestyle/userSelect.vue  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
index f6342d30..2ab37fe7 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
@@ -11,7 +11,7 @@
     filterable
     :loading="userSelectLoading"
     @change="onSelectChange"
-     @visible-change="onVisibleChange"
+    @visible-change="onVisibleChange"
   >
     <el-option
       v-for="item in userSelectList"
@@ -27,10 +27,10 @@ import { ref, onMounted, toRefs, computed } from 'vue'
 import * as UserApi from '@/api/system/user'
 
 const props = defineProps({
-  leaderUserId: {
+  modelValue: {
     type: [Number, String],
     required: true // 如果是必需的属性，可以设置为true
-  }
+  },
 })
 const userParams = {
   pageNo: 1,
@@ -47,15 +47,16 @@ const emit = defineEmits(['update:newValue'])
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const userSelectList = ref<UserApi.UserVO[]>([])
 const userSelectLoading = ref(false)
-const leaderUserId = toRefs(props).leaderUserId // 获取 props 中的 leaderUserId
+const propsmodelValue = toRefs(props).modelValue // 获取 props 中的 modelValue
 const initialValue: any = ref(null) // 存储初始选中的用户 ID
 
 const gitlist = async () => {
   const data = await UserApi.getUserPage(userParams)
   userList.value = data.list
   // 设置初始值
-  if (leaderUserId.value) {
-    valueName.value = leaderUserId.value
+  // console.log(propsmodelValue.value)
+  if (propsmodelValue.value) {
+    valueName.value = propsmodelValue.value
     const initialUser = await UserApi.getUser(valueName.value)
 
     // 查找初始用户是否已经在 userList 中
@@ -83,7 +84,7 @@ const remoteMethod = async (query: any) => {
       userParams.userNickName = query
       const data = await UserApi.getUserPage(userParams)
       userSelectList.value = data.list
-    }else {
+    } else {
       // 加载所有数据（无查询条件时的情况）
       const data = await UserApi.getUserPage({ ...userParams, pageNo: 1 })
       userList.value = [...userList.value, ...data.list]
@@ -107,8 +108,8 @@ onMounted(async () => {
 const onVisibleChange = (isVisible: boolean) => {
   if (!isVisible) {
     // 下拉框关闭时，重置查询参数和下拉框列表
-    userParams.userNickName = undefined;
-    userSelectList.value = [];
+    userParams.userNickName = undefined
+    userSelectList.value = []
   }
 }
 

From 9b4649a2f4a6534dcfb9189d1046984b9558ce84 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 15:09:40 +0800
Subject: [PATCH 58/64] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue  | 2 +-
 .../src/views/heli/hlvuestyle/userSelect.vue               | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
index 7d97207a..2c161c5c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
@@ -24,7 +24,7 @@
         />
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-       <UserSelect v-model="formData.leaderUserId" :leaderUserId="formData.leaderUserId" @update:newValue="handleSelectedUser" />
+       <UserSelect v-model="formData.leaderUserId"  @update:newValue="handleSelectedUser" />
       </el-form-item>
       <!--      <el-form-item label="联系电话" prop="phone">
         <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
index 2ab37fe7..42e36875 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
@@ -30,7 +30,7 @@ const props = defineProps({
   modelValue: {
     type: [Number, String],
     required: true // 如果是必需的属性，可以设置为true
-  },
+  }
 })
 const userParams = {
   pageNo: 1,
@@ -54,7 +54,6 @@ const gitlist = async () => {
   const data = await UserApi.getUserPage(userParams)
   userList.value = data.list
   // 设置初始值
-  // console.log(propsmodelValue.value)
   if (propsmodelValue.value) {
     valueName.value = propsmodelValue.value
     const initialUser = await UserApi.getUser(valueName.value)
@@ -63,12 +62,15 @@ const gitlist = async () => {
     let foundInitialUserInList = false
     for (const user of userList.value) {
       if (user.id === initialUser.id) {
+        userSelectList.value = []
+        userList.value = []
         foundInitialUserInList = true
         break
       }
     }
     // 如果初始用户不在列表中，则将其添加到列表开头
     if (!foundInitialUserInList && !userSelectList.value.length) {
+      userSelectList.value = []
       userList.value = []
       userList.value.unshift(initialUser)
     }
@@ -109,6 +111,7 @@ const onVisibleChange = (isVisible: boolean) => {
   if (!isVisible) {
     // 下拉框关闭时，重置查询参数和下拉框列表
     userParams.userNickName = undefined
+    userList.value = []
     userSelectList.value = []
   }
 }

From 933919ceab4fc0fc5dee2844992016da4e93d2a9 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Tue, 30 Jan 2024 15:17:11 +0800
Subject: [PATCH 59/64] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

出库管理 批次号处理
---
 .../mapper/storagemat/StorageMatMapper.xml    |  2 +-
 .../src/views/heli/storage/StorageForm.vue    |  2 +-
 .../src/views/heli/storage/StorageOut.vue     | 30 ++++++++--
 .../views/heli/storagelog/StorageLogForm.vue  |  4 +-
 .../src/views/heli/storagelog/index.vue       |  4 +-
 sql/v1.2.0/1.structure.sql                    | 59 +++++++++++--------
 6 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagemat/StorageMatMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagemat/StorageMatMapper.xml
index 6b49bac5..73a91ddf 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagemat/StorageMatMapper.xml
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagemat/StorageMatMapper.xml
@@ -23,6 +23,6 @@
         <result property="storageOkQty" column="storage_ok_qty"/>
     </resultMap>
     <select id="selectStorageMatValid" resultType="com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo.StorageMatValidRespVO">
-        select mat_id,mat_name,mat_code,mat_rest,material_type,wh_id,rg_id,pn_id,spec as mat_spec,unit as mat_unit,lot_no,storage_ok_qty from v_storage_material_amount where mat_rest > 0
+        select mat_id,mat_name,mat_code,mat_rest,material_type,wh_id,rg_id,pn_id,spec as mat_spec,unit as mat_unit,'' as lot_no,storage_ok_qty from v_storage_material_amount where mat_rest > 0
     </select>
 </mapper>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index 51cec357..1c8b3607 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -155,7 +155,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="lotNo" label="批次号" align="center" min-width="120">
+                  <el-table-column prop="lotNo" label="批次号" align="center" min-width="120" v-if="false">
                     <template #default="scope">
                       <el-input v-model="scope.row.lotNo" v-bind:disabled="btnView || btnSave"/>
                     </template>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 73f2676c..d3fd950a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -141,7 +141,7 @@
                     <template #header> <span class="hl-table_header">*</span>出库库位 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
-                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%" v-bind:disabled="btnView || btnSave">
+                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%" v-bind:disabled="btnView || btnSave" @change="handlePn(scope)">
                           <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pnName"
                             :value="dict.id" />
                         </el-select>
@@ -158,7 +158,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" />
+                  <el-table-column prop="lotNo" min-width="120" label="批次号" align="center" v-if="false" />
                   <el-table-column prop="description" min-width="180" label="备注" align="center">
                     <template #default="scope">
                       <el-input v-model="scope.row.description" v-bind:disabled="btnView || btnSave"/>
@@ -622,6 +622,28 @@ const handleRg = async (scope) => {
   //-------------------
 }
 
+const handlePn = async (scope) =>{
+  if (matLastData.value.find((item) => item.matId === scope.row.matId && item.whId== formData.value.whId && item.rgId == scope.row.rgId && item.pnId == scope.row.pnId)) {
+    const matVo = matLastData.value.find((item) => item.matId === scope.row.matId && item.whId== formData.value.whId && item.rgId == scope.row.rgId && item.pnId == scope.row.pnId)
+    scope.row.matId = matVo.matId
+    scope.row.matName = matVo.matName
+    scope.row.matCode = matVo.matCode
+    scope.row.matSpec = matVo.matSpec
+    scope.row.matType = matVo.materialType
+    scope.row.matUnit = matVo.matUnit
+    scope.row.rgId = matVo.rgId
+    scope.row.pnId = matVo.pnId
+    scope.row.matRest = matVo.matRest
+    scope.row.storageOkQty = matVo.storageOkQty
+    scope.row.lotNo = matVo.lotNo
+    scope.row.description = matVo.description
+
+  } else {
+
+    scope.row.matRest = ''
+  }
+}
+
 const matList = ref<MaterialApi.MaterialVO[]>([]) // 物料列表
 const matSelectLoading = ref(false)
 const remoteMatCodeSearch = async (name) => {
@@ -648,8 +670,8 @@ const remoteMatCodeSearch = async (name) => {
 }
 
 const handleMatCode = async (scope, matid) => {
-  if (matid && matLastData.value.find((item) => item.matId === matid)) {
-    const matVo = matLastData.value.find((item) => item.matId === matid)
+  if (matid && matLastData.value.find((item) => item.matId === matid && item.whId== formData.value.whId)) {
+    const matVo = matLastData.value.find((item) => item.matId === matid && item.whId== formData.value.whId)
     scope.row.matId = matVo.matId
     scope.row.matName = matVo.matName
     scope.row.matCode = matVo.matCode
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
index 2fabda45..78044e9d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
@@ -20,7 +20,7 @@
             :value="dict.label" />
         </el-select>
       </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
+      <el-form-item label="批次号" prop="lotNo" v-if="false">
         <el-input v-model="queryParams.lotNo" placeholder="批次号" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item label="仓库" prop="whId">
@@ -65,7 +65,7 @@
       <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
       <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
       <el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
-      <el-table-column label="批次号" align="center" prop="lotNo" min-width="120"/>
+      <el-table-column label="批次号" align="center" prop="lotNo" min-width="120" v-if="false"/>
       <el-table-column label="库存数量" align="center" prop="storageOkQty" min-width="120"/>
       <el-table-column label="库存单位" align="center" prop="matUnit" min-width="120"/>
     </el-table>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
index 74aab6cf..b6ba8baf 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
@@ -45,7 +45,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
+        <el-form-item label="批次号" prop="lotNo" v-if="false">
           <el-input
             v-model="queryParams.lotNo"
             placeholder="批次号"
@@ -114,7 +114,7 @@
         <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
         <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
         <el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
-        <el-table-column label="批次号" align="center" prop="lotNo" min-width="120"/>
+        <el-table-column label="批次号" align="center" prop="lotNo" min-width="120" v-if="false"/>
         <el-table-column label="变动数量" align="center" prop="storageOkQty" fixed="right" min-width="120"/>
         <el-table-column label="库存单位" align="center" prop="matUnit" fixed="right" min-width="120"/>
       </el-table>
diff --git a/sql/v1.2.0/1.structure.sql b/sql/v1.2.0/1.structure.sql
index 92672206..1ebab041 100644
--- a/sql/v1.2.0/1.structure.sql
+++ b/sql/v1.2.0/1.structure.sql
@@ -130,31 +130,42 @@ from (((((`wms_storage_log` `lg`
 where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0));
 
 CREATE OR REPLACE VIEW v_storage_material_now AS
-select `t`.`deleted` AS `deleted`,`t`.`id` AS `id`,`t`.`creator` AS `creator`,`t`.`create_time` AS `create_time`,`t`.`updater` AS `updater`,`t`.`update_time` AS `update_time`,`t`.`tenant_id` AS `tenant_id`,
-       `t`.`mat_code` AS `mat_code`,`t`.`mat_name` AS `mat_name`,`t`.`mat_type` AS `mat_type`,`t`.`mat_spec` AS `mat_spec`,`t`.`mat_unit` AS `mat_unit`,`t`.`mat_brand` AS `mat_brand`,
-       `t`.`wh_id` AS `wh_id`,`t`.`wh_name` AS `wh_name`,`t`.`rg_id` AS `rg_id`,`t`.`rg_name` AS `rg_name`,`t`.`pn_id` AS `pn_id`,`t`.`pn_name` AS `pn_name`,`t`.`lot_no` AS `lot_no`,`t`.`short_name` AS `short_name`,
-       sum(`t`.`storage_ok_qty`) AS `storage_ok_qty`
+select `t`.`deleted` AS `deleted`,`t`.`id` AS `id`,`t`.`creator` AS `creator`,`t`.`updater` AS `updater`,cast('2000-01-01 00:00' as date) AS `create_time`,cast('2000-01-01 00:00' as date) AS `update_time`,
+       `t`.`tenant_id` AS `tenant_id`,`t`.`mat_code` AS `mat_code`,`t`.`mat_name` AS `mat_name`,
+       `t`.`mat_type` AS `mat_type`,`t`.`mat_spec` AS `mat_spec`,`t`.`mat_unit` AS `mat_unit`,`t`.`mat_brand` AS `mat_brand`,`t`.`wh_id` AS `wh_id`,`t`.`wh_name` AS `wh_name`,`t`.`rg_id` AS `rg_id`,
+       `t`.`rg_name` AS `rg_name`,`t`.`pn_id` AS `pn_id`,`t`.`pn_name` AS `pn_name`,'' AS `lot_no`,`t`.`short_name` AS `short_name`,sum(`t`.`storage_ok_qty`) AS `storage_ok_qty`
 from (
-    select 0 AS `deleted`,`mat`.`id` AS `id`,`mat`.`creator` AS `creator`,`mat`.`create_time` AS `create_time`,`mat`.`updater` AS `updater`,`mat`.`update_time` AS `update_time`,`mat`.`tenant_id` AS `tenant_id`,
-           `mat`.`code` AS `mat_code`,`mat`.`name` AS `mat_name`,(select `mes-heli`.`system_dict_data`.`label`
-    from `mes-heli`.`system_dict_data`
-    where ((`mes-heli`.`system_dict_data`.`dict_type` = 'heli_material_type') and (`mes-heli`.`system_dict_data`.`value` = `mat`.`material_type`))) AS `mat_type`,
-        (case when (isnull(`mat`.`short_name`) = TRUE) then '' else `mat`.`short_name` end) AS `short_name`,(case when (isnull(`mat`.`spec`) = TRUE) then '' else `mat`.`spec` end) AS `mat_spec`,
-        (case when (isnull(`mat`.`brand`) = TRUE) then '' else `mat`.`brand` end) AS `mat_brand`,(select `mes-heli`.`system_dict_data`.`label` from `mes-heli`.`system_dict_data` where ((`mes-heli`.`system_dict_data`.`dict_type` = 'heli_material_unit') and (`mes-heli`.`system_dict_data`.`value` = `mat`.`unit`))) AS `mat_unit`,
-        `wh`.`id` AS `wh_id`,`wh`.`wh_name` AS `wh_name`,`rg`.`id` AS `rg_id`,`rg`.`rg_name` AS `rg_name`,`pn`.`id` AS `pn_id`,`pn`.`pn_name` AS `pn_name`,
-        (case when (isnull(`lg`.`lot_no`) = 1) then '' else `lg`.`lot_no` end) AS `lot_no`,(case when ((`st`.`stock_type` = 1) and (`lg`.`status` = 2)) then `lg`.`storage_ok_qty` when ((`st`.`stock_type` = 1) and (`lg`.`status` = 3)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 2)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 3)) then `lg`.`storage_ok_qty` else `lg`.`storage_ok_qty` end) AS `storage_ok_qty`
-        from (((((`mes-heli`.`wms_storage_log` `lg` left join `mes-heli`.`wms_storage` `st` on((`lg`.`stock_id` = `st`.`id`))) left join `mes-heli`.`base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`))) left join `mes-heli`.`wms_wh` `wh` on((`lg`.`wh_id` = `wh`.`id`))) left join `mes-heli`.`wms_rg` `rg` on((`lg`.`rg_id` = `rg`.`id`))) left join `mes-heli`.`wms_pn` `pn` on((`lg`.`pn_id` = `pn`.`id`))) where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0))) `t`
-group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`create_time`,`t`.`updater`,`t`.`update_time`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`mat_type`,`t`.`mat_spec`,`t`.`mat_unit`,`t`.`mat_brand`,`t`.`wh_id`,`t`.`wh_name`,`t`.`rg_id`,`t`.`rg_name`,`t`.`pn_id`,`t`.`pn_name`,`t`.`lot_no`,`t`.`short_name`;
-
+    select 0 AS `deleted`,`mat`.`id` AS `id`,`mat`.`creator` AS `creator`,`mat`.`updater` AS `updater`,`mat`.`tenant_id` AS `tenant_id`,`mat`.`code` AS `mat_code`,`mat`.`name` AS `mat_name`,
+           (select `mes-heli`.`system_dict_data`.`label` from `mes-heli`.`system_dict_data` where ((`mes-heli`.`system_dict_data`.`dict_type` = 'heli_material_type') and (`mes-heli`.`system_dict_data`.`value` = `mat`.`material_type`))) AS `mat_type`,
+           (case when (isnull(`mat`.`short_name`) = TRUE) then '' else `mat`.`short_name` end) AS `short_name`,
+           (case when (isnull(`mat`.`spec`) = TRUE) then '' else `mat`.`spec` end) AS `mat_spec`,
+           (case when (isnull(`mat`.`brand`) = TRUE) then '' else `mat`.`brand` end) AS `mat_brand`,
+           (select `mes-heli`.`system_dict_data`.`label` from `mes-heli`.`system_dict_data` where ((`mes-heli`.`system_dict_data`.`dict_type` = 'heli_material_unit') and (`mes-heli`.`system_dict_data`.`value` = `mat`.`unit`))) AS `mat_unit`,
+           `wh`.`id` AS `wh_id`,`wh`.`wh_name` AS `wh_name`,`rg`.`id` AS `rg_id`,`rg`.`rg_name` AS `rg_name`,`pn`.`id` AS `pn_id`,`pn`.`pn_name` AS `pn_name`,
+           (case when (isnull(`lg`.`lot_no`) = 1) then '' else `lg`.`lot_no` end) AS `lot_no`,
+           (case when ((`st`.`stock_type` = 1) and (`lg`.`status` = 2)) then `lg`.`storage_ok_qty` when ((`st`.`stock_type` = 1) and (`lg`.`status` = 3)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 2)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 3)) then `lg`.`storage_ok_qty` else `lg`.`storage_ok_qty` end) AS `storage_ok_qty`
+    from (((((`mes-heli`.`wms_storage_log` `lg`
+        left join `mes-heli`.`wms_storage` `st` on((`lg`.`stock_id` = `st`.`id`)))
+        left join `mes-heli`.`base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`)))
+        left join `mes-heli`.`wms_wh` `wh` on((`lg`.`wh_id` = `wh`.`id`)))
+        left join `mes-heli`.`wms_rg` `rg` on((`lg`.`rg_id` = `rg`.`id`)))
+        left join `mes-heli`.`wms_pn` `pn` on((`lg`.`pn_id` = `pn`.`id`)))
+    where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0))) `t`
+group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`updater`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`mat_type`,`t`.`mat_spec`,`t`.`mat_unit`,`t`.`mat_brand`,`t`.`wh_id`,`t`.`wh_name`,`t`.`rg_id`,`t`.`rg_name`,`t`.`pn_id`,`t`.`pn_name`,`t`.`short_name`
 
 CREATE OR REPLACE  VIEW v_storage_material_amount AS
-select `t`.`tenant_id` AS `tenant_id`,`t`.`mat_id` AS `mat_id`,`t`.`mat_name` AS `mat_name`,`t`.`mat_code` AS `mat_code`,`t`.`wh_id` AS `wh_id`,`t`.`rg_id` AS `rg_id`,`t`.`pn_id` AS `pn_id`,
-       `t`.`spec` AS `spec`,`t`.`unit` AS `unit`,`t`.`material_type` AS `material_type`,`t`.`lot_no` AS `lot_no`,'' AS `storage_ok_qty`,sum(`t`.`storage_ok_qty`) AS `mat_rest`
+select `t`.`deleted` AS `deleted`,`t`.`id` AS `mat_id`,`t`.`creator` AS `creator`,`t`.`updater` AS `updater`,`t`.`tenant_id` AS `tenant_id`,`t`.`mat_code` AS `mat_code`,`t`.`mat_name` AS `mat_name`,
+       `t`.`material_type` AS `material_type`,`t`.`spec` AS `spec`,`t`.`unit` AS `unit`,`t`.`wh_id` AS `wh_id`,`t`.`rg_id` AS `rg_id`,`t`.`pn_id` AS `pn_id`,`t`.`short_name` AS `short_name`,
+       0 AS `storage_ok_qty`,sum(`t`.`storage_ok_qty`) AS `mat_rest`
 from (
-         select `st`.`stock_type` AS `stock_type`,`mat`.`tenant_id` AS `tenant_id`,`mat`.`mat_id` AS `mat_id`,`bm`.`code` AS `mat_code`,`bm`.`name` AS `mat_name`,`mat`.`wh_id` AS `wh_id`,`mat`.`rg_id` AS `rg_id`,`mat`.`pn_id` AS `pn_id`,`mat`.`lot_no` AS `lot_no`,`bm`.`spec` AS `spec`,`bm`.`unit` AS `unit`,`bm`.`material_type` AS `material_type`,
-                (case when ((`st`.`status` = 2) and (`st`.`stock_type` = 1)) then `mat`.`storage_ok_qty` when ((`st`.`status` = 3) and (`st`.`stock_type` = 1)) then (-(1) * `mat`.`storage_ok_qty`) when ((`st`.`status` = 2) and (`st`.`stock_type` = 2)) then (-(1) * `mat`.`storage_ok_qty`) when ((`st`.`status` = 3) and (`st`.`stock_type` = 2)) then `mat`.`storage_ok_qty` else 0 end) AS `storage_ok_qty`
-         from ((`mes-heli`.`wms_storage_mat` `mat`
-             left join `mes-heli`.`wms_storage` `st` on((`mat`.`stock_id` = `st`.`id`)))
-             left join `mes-heli`.`base_material` `bm` on((`mat`.`mat_id` = `bm`.`id`)))
-         where ((`mat`.`deleted` = 0) and (`st`.`status` <> 1) and (`st`.`deleted` = 0) and (`bm`.`deleted` = 0) and (`bm`.`status` = 1))
-     ) `t` group by `t`.`mat_id`;
\ No newline at end of file
+    select 0 AS `deleted`,`mat`.`id` AS `id`,`mat`.`creator` AS `creator`,`mat`.`updater` AS `updater`,`mat`.`tenant_id` AS `tenant_id`,`mat`.`code` AS `mat_code`,`mat`.`name` AS `mat_name`,
+           `mat`.`material_type` AS `material_type`,(case when (isnull(`mat`.`short_name`) = TRUE) then '' else `mat`.`short_name` end) AS `short_name`,
+           `mat`.`spec` AS `spec`,`mat`.`unit` AS `unit`,`lg`.`wh_id` AS `wh_id`,`lg`.`rg_id` AS `rg_id`,`lg`.`pn_id` AS `pn_id`,
+           (case when (isnull(`lg`.`lot_no`) = 1) then '' else `lg`.`lot_no` end) AS `lot_no`,
+           (case when ((`st`.`stock_type` = 1) and (`lg`.`status` = 2)) then `lg`.`storage_ok_qty` when ((`st`.`stock_type` = 1) and (`lg`.`status` = 3)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 2)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 3)) then `lg`.`storage_ok_qty` else `lg`.`storage_ok_qty` end) AS `storage_ok_qty`
+    from ((`mes-heli`.`wms_storage_log` `lg`
+        left join `mes-heli`.`wms_storage` `st` on((`lg`.`stock_id` = `st`.`id`)))
+        left join `mes-heli`.`base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`)))
+    where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`lg`.`deleted` = 0))
+) `t`
+group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`updater`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`material_type`,`t`.`spec`,`t`.`unit`,`t`.`wh_id`,`t`.`rg_id`,`t`.`pn_id`,`t`.`short_name`;
\ No newline at end of file

From 0e8002bd1da9cd31e18061eb430b95bdba1d403e Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 15:25:12 +0800
Subject: [PATCH 60/64] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
index 42e36875..822195c3 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 负责人选择 -->
   <el-select
-    v-model="valueName"
+    v-model="propsmodelValue"
     placeholder="请选择相关人员"
     :remote-method="remoteMethod"
     remote-show-suffix

From 50210fdd1494b1219e389cbb3f3f28ffcfad365f Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 16:13:06 +0800
Subject: [PATCH 61/64] =?UTF-8?q?=E8=81=8C=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/classes/ClassesForm.vue    |  5 ++--
 .../src/views/heli/dept/DeptForm.vue          |  3 +--
 .../src/views/heli/hlvuestyle/userSelect.vue  |  1 +
 .../views/heli/warehouse/WarehouseForm.vue    |  5 ++--
 .../src/views/heli/workshop/WorkshopForm.vue  | 23 +++----------------
 5 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
index 44a72814..9c635923 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
@@ -34,7 +34,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-          <UserSelect v-model="formData.leaderUserId" :leaderUserId="formData.leaderUserId" @update:newValue="handleSelectedUser" />
+          <UserSelect v-model="formData.leaderUserId"  @update:newValue="handleSelectedUser" />
       </el-form-item>
       <el-form-item label="班组描述" prop="description">
         <el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200" />
@@ -205,7 +205,6 @@ const resetForm = () => {
 }
 
 const handleSelectedUser = (newValue: any) => {
-  // console.log('接收对应的数据:', newValue)
-  formData.value.leaderUserId = newValue.id
+  formData.value.leaderUserId = newValue?.id
 }
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
index 2c161c5c..d88d33a1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
@@ -195,7 +195,6 @@ const resetForm = () => {
 // }
 
 const handleSelectedUser = (newValue: any) => {
-  console.log('接收对应的数据:', newValue)
-  formData.value.leaderUserId = newValue.id
+  formData.value.leaderUserId = newValue?.id
 }
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
index 822195c3..ad546e9b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
@@ -85,6 +85,7 @@ const remoteMethod = async (query: any) => {
     if (query) {
       userParams.userNickName = query
       const data = await UserApi.getUserPage(userParams)
+      userList.value = data.list
       userSelectList.value = data.list
     } else {
       // 加载所有数据（无查询条件时的情况）
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
index 24bf711c..2db9e8d1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
@@ -16,7 +16,7 @@
       <el-form-item label="联系人" prop="contact">
         <UserSelect class="!w-500px"
           v-model="formData.contact"
-          :leaderUserId="formData.contact"
+          
           @update:newValue="handleSelectedUser"
         />
       </el-form-item>
@@ -165,7 +165,6 @@ const resetForm = () => {
 }
 
 const handleSelectedUser = (newValue: any) => {
-  // console.log('接收对应的数据:', newValue)
-  formData.value.contact = newValue.id
+  formData.value.contact = newValue?.id
 }
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
index d8527059..884bf47c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
@@ -27,26 +27,10 @@
       <el-form-item label="负责人" prop="leaderUserId">
          <UserSelect 
           v-model="formData.leaderUserId"
-          :leaderUserId="formData.leaderUserId"
+      
           @update:newValue="handleSelectedUser"
         />
-        <!-- <el-select v-model="formData.leaderUserId"
-                   placeholder="请输入负责人"
-                   :remote-method="remoteUserSearch"
-                   remote-show-suffix
-                   remote
-                   clearable
-                   reserve-keyword
-                   filterable
-                   :loading="userSelectLoading"
-        >
-          <el-option
-            v-for="item in userSelectList"
-            :key="item.id"
-            :label="item.username + ' ' + item.nickname"
-            :value="item.id"
-          />
-        </el-select> -->
+
       </el-form-item>
       <el-form-item label="描述信息" prop="description">
         <el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200"/>
@@ -186,7 +170,6 @@ const resetForm = () => {
 }
 
 const handleSelectedUser = (newValue: any) => {
-  // console.log('接收对应的数据:', newValue)
-  formData.value.leaderUserId = newValue.id
+  formData.value.leaderUserId = newValue?.id
 }
 </script>

From 6896226b782b182ab0199e18d779abe94a0db397 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 16:26:20 +0800
Subject: [PATCH 62/64] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/styles/cus.scss | 52 +++++++++-----------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index 4d395d78..f5dd0d61 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -172,75 +172,67 @@
 
 //已送审
 .iapproval {
-  border: 1px solid #0d0d26;
-  background-color: #e8e8e8;
-  color: #0d0d26;
+  background-color:#EDFFED;
+  color: #038A24;
 }
 //已保存
 .iconserve {
-  border: 1px solid #52a7ff;
-  background-color: #eef6ff;
-  color: #52a7ff;
+  background-color:#F2FBFF;
+  color: #1B9AEE;
 }
 
 //已审核
 .iaudit {
-  border: 1px solid #19a998;
-  background-color: #ebf5f4;
-  color: #19a998;
+  background-color: #19A998;
+  color:#FFFFFF;
 }
 //已启动
 .istart {
-  border: 1px solid #326ad2;
-  background-color: #e9effa;
-  color: #326ad2;
+  background-color: #1B9AEE;
+  color: #FFFFFF;
 }
 //已打回
 .iBack {
-  border: 1px solid #e51e1e;
-  background-color: #fff9f9;
-  color: #e51e1e;
+  background-color: #FFEDED;
+  color: #E62412;
 }
 
 //已变更
 .ialteration {
-  border: 1px solid #f39800;
-  background-color: #f7f3ed;
-  color: #f39800;
+  background-color:#FFF7E6;
+  color:#D46B08;
 }
 //已提交
 .isubmit {
-  border: 1px solid #356899;
-  background-color: #ecf0f4;
-  color: #356899;
+  background-color: #19A998;
+  color:#FFFFFF;
 }
 //已作废
 .icancellation {
-  border: 1px solid #95969d;
-  background-color: #ebebeb;
-  color: #95969d;
+  background-color: #F0F1F4;
+  color: #666879;
 }
 //已终止
 .ibreakup {
-  border: 1px solid #0d0d26;
-  background-color: #e8e8e8;
-  color: #0d0d26;
+  background-color: #F0F1F4;
+  color: #666879;
 }
 
 //全部发货
 .allshipments {
-  color: #3ac33d;
+  color: #1B9AEE;
   background-color: transparent;
   border: none;
 }
 //未发货
 .noshipments {
-  color: #4589ff;
+  color: #E62412;
   background-color: transparent;
   border: none;
 }
+//部分发货
 .partshipments {
-  color: #19a998;
+  color: #F39800;
   background-color: transparent;
   border: none;
 }

From fc5e52ac6cd933cd89b16f49c8d6e64e8ff832b6 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Tue, 30 Jan 2024 16:30:03 +0800
Subject: [PATCH 63/64] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E3=80=91=E5=8F=91=E8=B4=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heli/enums/DeliverOrderStatusEnum.java    |   4 +-
 .../deliverorder/DeliverOrderController.java  |   2 +-
 .../vo/DeliverOrderSaveReqVO.java             |   4 -
 .../vo/ProjectOrderPageReqVO.java             |   3 +
 .../deliverorder/DeliverOrderDO.java          |  18 +-
 .../deliverorder/DeliverOrderSubDO.java       |   8 +
 .../projectorder/ProjectOrderSubDO.java       |   3 +
 .../deliverorder/DeliverOrderMapper.java      |   6 +-
 .../projectorder/ProjectOrderMapper.java      |   1 +
 .../projectorder/ProjectOrderSubMapper.java   |   4 +-
 .../deliverorder/DeliverOrderServiceImpl.java |  38 ++-
 .../src/api/heli/deliverorder/index.ts        |   1 +
 .../src/views/heli/deliverorder/detail.vue    | 309 +++++++++++++-----
 .../src/views/heli/deliverorder/index.vue     |  37 ++-
 .../heli/deliverorder/projectOrderDialog.vue  |   3 +-
 sql/v1.2.0/1.structure.sql                    |  12 +-
 16 files changed, 327 insertions(+), 126 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/DeliverOrderStatusEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/DeliverOrderStatusEnum.java
index dc5de32b..820fed16 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/DeliverOrderStatusEnum.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/DeliverOrderStatusEnum.java
@@ -10,8 +10,8 @@ import lombok.Getter;
 @Getter
 public enum DeliverOrderStatusEnum {
 
-    DEFAULT(1, "已保存"),
-    FINISHED(2, "已发货");
+    SAVE(1, "已保存"),
+    DELIVER(2, "已发货");
 
     private int code;
     private String description;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
index e55067df..f25df945 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
@@ -78,7 +78,7 @@ public class DeliverOrderController {
         // 手动记录日志
         operateLogFrameworkService.createOperateLog(request,
                 startTime,
-                BusinesTypeEnum.PROJECT_ORDER.name(),
+                BusinesTypeEnum.DELIVER_ORDER.name(),
                 operateReqVO.getId(),
                 OperateTypeEnum.valueOf(operateReqVO.getActive()).getType(),
                 operateReqVO.getActiveOpinion());
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
index 8bb0733e..6db72db3 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderSaveReqVO.java
@@ -17,7 +17,6 @@ public class DeliverOrderSaveReqVO {
     private Long id;
 
     @Schema(description = "编号，唯一", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "编号，唯一不能为空")
     private String code;
 
     @Schema(description = "销售订单id列表 多个用英文逗号分割", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -49,7 +48,6 @@ public class DeliverOrderSaveReqVO {
     private String deliverMode;
 
     @Schema(description = "收货人电话", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "收货人电话不能为空")
     private String receivePersonMobile;
 
     @Schema(description = "司机姓名", example = "王五")
@@ -75,11 +73,9 @@ public class DeliverOrderSaveReqVO {
     private Integer status;
 
     @Schema(description = "收货人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    @NotEmpty(message = "收货人姓名不能为空")
     private String receivePersonName;
 
     @Schema(description = "收货详细地址", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "收货详细地址不能为空")
     private String receiveAddress;
 
     @Schema(description = "操作类型")
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderPageReqVO.java
index bfadefcf..070f7dc0 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderPageReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderPageReqVO.java
@@ -28,6 +28,9 @@ public class ProjectOrderPageReqVO extends PageParam {
     @Schema(description = "发货状态 未发货/部分发货/全部发货", example = "1")
     private Integer deliveryStatus;
 
+    @Schema(description = "发货状态列表")
+    private List<Integer> deliveryStatusList;
+
     @Schema(description = "提出部门id", example = "9959")
     private Long businessDeptId;
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
index 9e746650..a81ae8fd 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
@@ -1,5 +1,6 @@
 package com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder;
 
+import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
 import com.chanko.yunxi.mes.module.heli.enums.DeliverOrderStatusEnum;
 import lombok.*;
 import java.util.*;
@@ -122,6 +123,21 @@ public class DeliverOrderDO extends BaseDO {
     private String customerName;
 
     public boolean canDeliver() {
-        return DeliverOrderStatusEnum.DEFAULT.getCode() == this.deliverStatus.intValue();
+        return DeliverOrderStatusEnum.SAVE.getCode() == this.deliverStatus.intValue();
+    }
+
+    public boolean canOperate(OperateTypeEnum operateTypeEnum) {
+        switch (operateTypeEnum){
+            case SAVE:
+                return canSave();
+            case DELIVER:
+                return canDeliver();
+            default:
+                return false;
+        }
+    }
+
+    private boolean canSave() {
+        return DeliverOrderStatusEnum.SAVE.getCode() == this.deliverStatus.intValue();
     }
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderSubDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderSubDO.java
index 01fb60e2..61c31d03 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderSubDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderSubDO.java
@@ -81,5 +81,13 @@ public class DeliverOrderSubDO extends BaseDO {
      * 删除 物理删除
      */
     private Boolean deleted;
+    /**
+     * 销售订单子项id
+     */
+    private Long saleOrderSubId;
+    /**
+     * 销售订单编号
+     */
+    private String saleOrderCode;
 
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
index c1f5645b..0f314495 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
@@ -77,4 +77,7 @@ public class ProjectOrderSubDO extends BaseDO {
      */
     @TableField(exist = false)
     private String compositionName;
+
+    @TableField(exist = false)
+    private String projectOrderCode;
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
index af785f1a..3f97a7bf 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
@@ -34,9 +34,9 @@ public interface DeliverOrderMapper extends BaseMapperX<DeliverOrderDO> {
                 .orderByDesc(DeliverOrderDO::getId)
                 .disableSubLogicDel();
         query.like(!StringUtils.isEmpty(reqVO.getCode()), DeliverOrderDO::getCode, reqVO.getCode())
-                .like(!StringUtils.isEmpty(reqVO.getSaleOrderCode()), ProjectOrderDO::getCode, reqVO.getSaleOrderCode())
-                .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName())
-                .like(!StringUtils.isEmpty(reqVO.getMouldName()), ProjectOrderDO::getMouldName, reqVO.getMouldName())
+                .like(!StringUtils.isEmpty(reqVO.getSaleOrderCode()), "p.code", reqVO.getSaleOrderCode())
+                .like(!StringUtils.isEmpty(reqVO.getCustomerName()), "e.name", reqVO.getCustomerName())
+                .like(!StringUtils.isEmpty(reqVO.getMouldName()), "p.mould_name", reqVO.getMouldName())
                 .between(reqVO.getDeliverDate() != null && reqVO.getDeliverDate().length == 2,
                         DeliverOrderDO::getDeliverDate, ArrayUtils.get(reqVO.getDeliverDate(), 0), ArrayUtils.get(reqVO.getDeliverDate(), 1))
                 .eq(reqVO.getDeliverStatus() != null, DeliverOrderDO::getDeliverStatus, reqVO.getDeliverStatus());
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
index 6d28c27f..d01d3d2d 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
@@ -38,6 +38,7 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
                 .eq(reqVO.getOrderStatus() != null, ProjectOrderDO::getOrderStatus, reqVO.getOrderStatus())
                 .eq(reqVO.getDeliveryStatus() != null, ProjectOrderDO::getDeliveryStatus, reqVO.getDeliveryStatus())
                 .in(reqVO.getOrderStatusList() != null && !reqVO.getOrderStatusList().isEmpty(), ProjectOrderDO::getOrderStatus, reqVO.getOrderStatusList())
+                .in(reqVO.getDeliveryStatusList() != null && !reqVO.getDeliveryStatusList().isEmpty(), ProjectOrderDO::getDeliveryStatus, reqVO.getDeliveryStatusList())
                 .eq(reqVO.getIsSnapshot() != null, ProjectOrderDO::getIsSnapshot, reqVO.getIsSnapshot())
                 .eq(reqVO.getHasAlter() != null, ProjectOrderDO::getHasAlter, reqVO.getHasAlter())
                 .like(!StringUtils.isEmpty(reqVO.getSnapshotCode()), ProjectOrderDO::getSnapshotCode, reqVO.getSnapshotCode());
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
index 9d309ec2..0261b9e6 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
@@ -2,6 +2,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder;
 
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,7 +20,8 @@ public interface ProjectOrderSubMapper extends BaseMapperX<ProjectOrderSubDO> {
     default List<ProjectOrderSubDO> selectListByProjectOrderId(Long projectOrderId) {
         MPJLambdaWrapper<ProjectOrderSubDO> query = new MPJLambdaWrapper<>();
         query.selectAll(ProjectOrderSubDO.class)
-                        .select("b.name as compositionName")
+                        .select("b.name as compositionName", "p.code as projectOrderCode")
+                        .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId)
                         .leftJoin(CompositionDO.class, "b", CompositionDO::getId, ProjectOrderSubDO::getCompositionId)
                         .disableSubLogicDel()
                         .eq(ProjectOrderSubDO::getProjectOrderId, projectOrderId);
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
index def73747..12396359 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
@@ -1,29 +1,32 @@
 package com.chanko.yunxi.mes.module.heli.service.deliverorder;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.DeliverOrderPageReqVO;
+import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.DeliverOrderSaveReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
+import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper;
+import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverordersub.DeliverOrderSubMapper;
 import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
+import com.chanko.yunxi.mes.module.heli.enums.DeliverOrderStatusEnum;
 import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.*;
-import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
-import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
-import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
-
-import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper;
-import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverordersub.DeliverOrderSubMapper;
+import java.util.Date;
+import java.util.List;
 
 import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.PROJECT_DELIVERY_ORDER;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.DELIVER_ORDER_NOT_EXISTS;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.INVALID_OPERATE;
 
 /**
  * 发货订单 Service 实现类
@@ -49,12 +52,15 @@ public class DeliverOrderServiceImpl implements DeliverOrderService {
         // 月度流水号
         SerialNumberDO serialNumberDO = serialNumberService.getSerialNumber(BusinesTypeEnum.DELIVER_ORDER.name(), new SimpleDateFormat("yyyyMM").format(new Date()));
         serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1);
+        deliverOrder.setCode(PROJECT_DELIVERY_ORDER.getCode(serialNumberDO.getSerialNumber().toString()));
+        deliverOrder.setDeliverStatus(DeliverOrderStatusEnum.valueOf(createReqVO.getActive()).getCode());
         deliverOrderMapper.insert(deliverOrder);
 
         // 插入子表
         if(createReqVO.getDeliverOrderSubs() != null && !createReqVO.getDeliverOrderSubs().isEmpty()){
             createDeliverOrderSubList(deliverOrder.getId(), createReqVO.getDeliverOrderSubs());
         }
+        createReqVO.setId(deliverOrder.getId()).setCode(deliverOrder.getCode());
         // 回写序列记录
         serialNumberService.updateSerialNumber(serialNumberDO);
         // 返回
@@ -66,12 +72,14 @@ public class DeliverOrderServiceImpl implements DeliverOrderService {
     public void updateDeliverOrder(DeliverOrderSaveReqVO updateReqVO) {
         // 校验存在
         DeliverOrderDO oldDO = validateDeliverOrderExists(updateReqVO.getId());
-        if(!oldDO.canDeliver()){
+        if(!oldDO.canOperate(OperateTypeEnum.valueOf(updateReqVO.getActive()))){
             throw exception(INVALID_OPERATE);
         }
         // 更新
         DeliverOrderDO updateObj = BeanUtils.toBean(updateReqVO, DeliverOrderDO.class);
+        updateObj.setDeliverStatus(DeliverOrderStatusEnum.valueOf(updateReqVO.getActive()).getCode());
         deliverOrderMapper.updateById(updateObj);
+        updateReqVO.setDeliverStatus(updateObj.getDeliverStatus());
 
         // 更新子表
         updateDeliverOrderSubList(updateReqVO.getId(), updateReqVO.getDeliverOrderSubs());
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
index d84eaa08..e8afac3e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/deliverorder/index.ts
@@ -21,6 +21,7 @@ export interface DeliverOrderVO {
   receivePersonName: string
   receiveAddress: string
   active: string
+  deliverOrderSubs: object
 }
 
 // 查询发货订单分页
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
index 786c6934..11468955 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
@@ -25,7 +25,7 @@
           <el-col :span="6">
             <el-form-item label="项目编号" prop="saleOrderIds">
               <el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号" >
-                <template #append><el-button @click="openProjectOrderDialog" :icon="Search" /></template>
+                <template #append><el-button :disabled="query.active != 'create'" @click="openProjectOrderDialog" :icon="Search" /></template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -44,6 +44,7 @@
           <el-col :span="6">
             <el-form-item label="发货日期" prop="deliverDate">
               <el-date-picker
+                :disabled="detailDisabled"
                 v-model="formData.deliverDate"
                 type="date"
                 value-format="x"
@@ -58,7 +59,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item prop="mouldName" label="模具名称">
-              <el-input v-model="formData.mouldName" />
+              <el-input disabled v-model="formData.mouldName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -71,6 +72,7 @@
           <el-col :span="12">
             <el-form-item label="发货备注" prop="remark">
               <el-input
+                :disabled="detailDisabled"
                 type="textarea"
                 v-model="formData.remark"
                 show-word-limit
@@ -87,17 +89,17 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="发货人姓名" prop="deliverPerson">
-              <UserSelect v-model="formData.deliverPerson" @update:newValue="handleSelectedUser" />
+              <UserSelect :disabled="detailDisabled" v-model="formData.deliverPerson" @update:newValue="handleSelectedUser" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发货人电话" prop="deliverPersonMobile">
-              <el-input v-model="formData.deliverPersonMobile" />
+              <el-input :disabled="detailDisabled" v-model="formData.deliverPersonMobile" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发货方式" prop="deliverMode">
-              <el-select v-model="formData.deliverMode" placeholder="请选择发货方式">
+              <el-select :disabled="detailDisabled" v-model="formData.deliverMode" placeholder="请选择发货方式">
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)"
                   :key="dict.value"
@@ -109,33 +111,62 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发货单位" prop="deliverCompany">
-              <el-input value="杭州合立机械有限公司" disabled />
+              <el-input v-model="formData.deliverCompany" disabled />
             </el-form-item>
           </el-col>
         </el-row>
       </el-card>
-      <el-card class="hl-card-info">
+
+      <el-card class="hl-card-info" v-if="formType != 'create'">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">收货信息</span>
         </template>
         <el-row>
           <el-col :span="6">
             <el-form-item label="收货人姓名" prop="receivePersonName">
-              <el-input v-model="formData.receivePersonName" />
+              <el-select :disabled="detailDisabled" v-model="formData.receivePersonName"
+                         filterable
+                         allow-create
+                         clearable
+                         @change="receiveOnChange"
+                         @blur="e => { if(e.target.value) formData.receivePersonName = e.target.value;}"
+              >
+                <el-option
+                  v-for="dict in receivePersonOptions"
+                  :key="dict.name"
+                  :label="dict.name"
+                  :value="dict.name"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="收货人电话" prop="receivePersonMobile">
-              <el-input v-model="formData.receivePersonMobile" />
+              <el-input :disabled="detailDisabled" v-model="formData.receivePersonMobile" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="收货详细地址" prop="receiveAddress">
-              <el-input v-model="formData.receiveAddress" />
+              <el-select v-model="formData.receiveAddress"
+                         filterable
+                         allow-create
+                         :disabled="detailDisabled"
+                         @blur="e => { if(e.target.value) formData.receiveAddress = e.target.value;}"
+                         clearable
+                         style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in receivePersonAddressOptions"
+                  :key="dict.address"
+                  :label="dict.address"
+                  :value="dict.address"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
       </el-card>
+
       <el-card class="hl-card-info">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物流信息</span>
@@ -143,34 +174,35 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="司机姓名" prop="transportDriverName">
-              <el-input v-model="formData.transportDriverName" />
+              <el-input :disabled="detailDisabled" v-model="formData.transportDriverName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="司机电话" prop="transportDriverMobile">
-              <el-input v-model="formData.transportDriverMobile" />
+              <el-input :disabled="detailDisabled" v-model="formData.transportDriverMobile" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="车牌号" prop="transportBusNumber">
-              <el-input v-model="formData.transportBusNumber" />
+              <el-input :disabled="detailDisabled" v-model="formData.transportBusNumber" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="重量(T)" prop="transportWeight">
-              <el-input v-model="formData.transportWeight" />
+              <el-input :disabled="detailDisabled" v-model="formData.transportWeight" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="位置(米)" prop="transportSize">
-              <el-input v-model="formData.transportSize" />
+              <el-input :disabled="detailDisabled" v-model="formData.transportSize" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-card>
-      <el-card class="hl-card-info">
+
+      <el-card class="hl-card-info" v-if="formType != 'create'">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">发货清单</span>
         </template>
@@ -195,10 +227,15 @@
                       {{scope.row.name}}
                     </template>
                   </el-table-column>
+                  <el-table-column label="项目编号" min-width="220" align="center">
+                    <template #default="scope">
+                      {{scope.row.saleOrderCode}}
+                    </template>
+                  </el-table-column>
                   <el-table-column label="子项目图号" min-width="150">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.blueprintNo`" :rules="subFormRules.blueprintNo" class="mb-0px!">
-                        <el-input v-model="row.blueprintNo" placeholder="请输入子项目图号" />
+                        <el-input :disabled="detailDisabled" v-model="row.blueprintNo" placeholder="请输入子项目图号" />
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -206,11 +243,18 @@
                     <template #header> <span class="hl-table_header">*</span>本次发货数量 </template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.amount`" :rules="subFormRules.amount" class="mb-0px!">
-                        <el-input v-model="row.amount" placeholder="请输入本次发货数量" />
+                        <el-input-number
+                          :disabled="detailDisabled"
+                          v-model="row.amount"
+                          placeholder="请输入本次发货数量"
+                          style="width: 100%"
+                          :min="1"
+                          :precision="0"
+                        />
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="单位" min-width="150">
+                  <el-table-column label="单位" width="80">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.unit`" :rules="subFormRules.unit" class="mb-0px!">
                         {{getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, row.unit)}}
@@ -220,27 +264,28 @@
                   <el-table-column label="重量(T)" min-width="150">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.weight`" class="mb-0px!">
-                        <el-input v-model="row.weight" placeholder="请输入重量(T)" />
+                        <el-input :disabled="detailDisabled" v-model="row.weight" placeholder="请输入重量(T)" />
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column label="尺寸(米)" min-width="150">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.size`" class="mb-0px!">
-                        <el-input v-model="row.size" placeholder="请输入尺寸(米)" />
+                        <el-input :disabled="detailDisabled" v-model="row.size" placeholder="请输入尺寸(米)" />
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="备注" min-width="150">
+                  <el-table-column label="备注" min-width="180">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
-                        <el-input v-model="row.remark" placeholder="请输入备注" />
+                        <el-input :disabled="detailDisabled" v-model="row.remark" placeholder="请输入备注" />
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="操作" align="center" width="240">
+                  <el-table-column label="操作" align="center" width="100">
                     <template #default="scope">
                       <el-button
+                        v-if="'update,create'.indexOf(query.active) > -1"
                         link
                         type="danger"
                         size="small"
@@ -257,12 +302,12 @@
         </el-row>
       </el-card>
 
-      <el-card class="hl-card-info">
+      <el-card class="hl-card-info" v-if="formType != 'create'">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">其他物料清单</span>
         </template>
         <el-row>
-          <el-col>
+          <el-col v-if="formType != 'detail'">
             <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem2"
             >新增</el-button
             >
@@ -283,14 +328,16 @@
                   <el-table-column label="序号" type="index" width="100" />
                   <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>名称 </template>
-                    <template #default="scope">
-                      {{scope.row.name}}
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.name`" :rules="subFormRules.name" class="mb-0px!">
+                        <el-input :disabled="detailDisabled" v-model="row.name" />
+                      </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column label="所属类型" min-width="150">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.subType`" :rules="subFormRules.subType" class="mb-0px!">
-                        <el-select v-model="row.subType" placeholder="请选择子项类型">
+                        <el-select :disabled="detailDisabled" v-model="row.subType" placeholder="请选择子项类型">
                           <el-option
                             v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MATERIAL_TYPE)"
                             :key="dict.value"
@@ -305,14 +352,21 @@
                     <template #header> <span class="hl-table_header">*</span>本次发货数量 </template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.amount`" :rules="subFormRules.amount" class="mb-0px!">
-                        <el-input v-model="row.amount" placeholder="请输入本次发货数量" />
+                        <el-input-number
+                          :disabled="detailDisabled"
+                          v-model="row.amount"
+                          placeholder="请输入本次发货数量"
+                          style="width: 100%"
+                          :min="1"
+                          :precision="0"
+                        />
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column label="单位" min-width="150">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.unit`" :rules="subFormRules.unit" class="mb-0px!">
-                        <el-select v-model="row.unit" placeholder="请选择单位">
+                        <el-select :disabled="detailDisabled" v-model="row.unit" placeholder="请选择单位">
                           <el-option
                             v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)"
                             :key="dict.value"
@@ -326,13 +380,14 @@
                   <el-table-column label="备注" min-width="150">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
-                        <el-input v-model="row.remark" placeholder="请输入备注" />
+                        <el-input :disabled="detailDisabled" v-model="row.remark" placeholder="请输入备注" />
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column label="操作" align="center" width="240">
                     <template #default="scope">
                       <el-button
+                        v-if="'update,create'.indexOf(query.active) > -1"
                         link
                         type="danger"
                         size="small"
@@ -349,12 +404,12 @@
         </el-row>
       </el-card>
 
-      <el-card class="hl-card-info">
+      <el-card class="hl-card-info" v-if="formType != 'create'">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
         </template>
         <el-row>
-          <el-col>
+          <el-col v-if="formType != 'detail'">
             <el-upload
               ref="attachmentUploadRef"
               multiple
@@ -384,6 +439,7 @@
                 <el-table-column label="操作" align="center">
                   <template #default="scope">
                     <el-button
+                      v-if="'update,create'.indexOf(query.active) > -1"
                       link
                       type="danger"
                       size="small"
@@ -407,13 +463,39 @@
           </el-col>
         </el-row>
       </el-card>
+
+      <el-card class="hl-card-info" v-if="query.active != 'create'">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">操作日志</span>
+        </template>
+        <el-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-table :data="formData.operateLogs" class="hl-table">
+                <el-table-column prop="type" label="操作" align="center">
+                  <template #default="scope">
+                    {{ getDictLabel(DICT_TYPE.SYSTEM_OPERATE_TYPE, scope.row.type) }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="userNickname" label="操作人" align="center" />
+                <el-table-column
+                  label="操作时间"
+                  align="center"
+                  prop="startTime"
+                  :formatter="dateFormatter"
+                />
+              </el-table>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-card>
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="goback" size="large">取 消</el-button>
-      <el-button @click="submitForm('SAVE')" type="success" :disabled="formLoading" size="large"
+      <el-button v-if="formType != 'detail' && formData.deliverStatus == 1" @click="submitForm('SAVE')" type="success" :disabled="formLoading" size="large"
         >保 存</el-button
       >
-      <el-button @click="submitForm('DELIVER')" type="primary" :disabled="formLoading" size="large"
+      <el-button v-if="formType != 'detail' && formData.deliverStatus == 1 && formData.id" @click="submitForm('DELIVER')" type="primary" :disabled="formLoading" size="large"
         >发 货</el-button
       >
     </div>
@@ -435,7 +517,8 @@ import {getAccessToken, getTenantId} from "@/utils/auth";
 import {dateFormatter} from "@/utils/formatTime";
 import download from "@/utils/download";
 import { inject } from 'vue'
-import {ProjectOrderVO} from "@/api/heli/projectorder";
+import {getProjectOrderSubListByProjectOrderId, ProjectOrderVO} from "@/api/heli/projectorder";
+import {getCustomer} from "@/api/heli/customer";
 const reload = inject('reload')
 
 const { t } = useI18n() // 国际化
@@ -469,16 +552,15 @@ const formData = ref({
   transportWeight: undefined,
   transportSize: undefined,
   remark: undefined,
-  status: undefined,
+  status: 1,
   receivePersonName: undefined,
   receiveAddress: undefined,
   deliverOrderSubs: [],
   deliverOrderOtherSubs: [],
   attachments: [],
   operateLogs: [],
-  idcard1: undefined,
-  idcard2: undefined,
   active: undefined,
+  deliverCompany: '杭州合立机械有限公司'
 })
 const formRules = reactive({
   saleOrderIds: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
@@ -512,16 +594,26 @@ const submitForm = async (active) => {
   formData.value.active = active
   await formRef.value.validate()
   // 校验子表单
-  try {
+  if(formType.value != 'create'){
     await subFormRef.value.validate()
     await otherSubFormRef.value.validate()
-  } catch (e) {
-    return
   }
   // 提交请求
   formLoading.value = true
   try {
+    // 设置类型
+    formData.value.deliverOrderSubs?.forEach(item => {
+      item.category = 'DELIVER_LIST'
+      item.status = 1
+    })
+    formData.value.deliverOrderOtherSubs?.forEach(item => {
+      item.category = 'OTHER_LIST'
+      item.status = 1
+    })
     const data = formData.value as unknown as DeliverOrderApi.DeliverOrderVO
+    if(formData.value.deliverOrderOtherSubs){
+      data.deliverOrderSubs = data.deliverOrderSubs.concat(formData.value.deliverOrderOtherSubs)
+    }
 
     const orderId = await DeliverOrderApi.operateDeliverOrder(data)
     message.success(t('common.operationSuccess'))
@@ -530,15 +622,6 @@ const submitForm = async (active) => {
       uploadData.value.businessId = orderId
       attachmentUploadRef.value!.submit()
     }
-    // 如身份证照片不为空 更新信息
-    if(formData.value.idcard1){
-      let fileParams = {
-        pageNo: 1,
-        pageSize: 1,
-        url: formData.value.idcard1
-      }
-      const idcard1FileRet = await getFilePage(fileParams);
-    }
 
     // 如非保存 返回列表页
     if (active != 'SAVE') {
@@ -554,7 +637,6 @@ const submitForm = async (active) => {
   }
 }
 const goback = () => {
-  resetForm()
   router.back()
 }
 /** 重置表单 */
@@ -581,16 +663,15 @@ const resetForm = () => {
     transportWeight: undefined,
     transportSize: undefined,
     remark: undefined,
-    status: undefined,
+    status: 1,
     receivePersonName: undefined,
     receiveAddress: undefined,
     deliverOrderSubs: [],
     deliverOrderOtherSubs: [],
     attachments: [],
     operateLogs: [],
-    idcard1: undefined,
-    idcard2: undefined,
     active: undefined,
+    deliverCompany: '杭州合立机械有限公司'
   }
   formRef.value?.resetFields()
 }
@@ -616,21 +697,15 @@ const onAddItem2 = () => {
 
 //接收职工传递的数据
 const handleSelectedUser = (newValue: any) => {
-  formData.value.deliverPerson = newValue.id
+  formData.value.deliverPerson = newValue?.id
+  formData.value.deliverPersonMobile = newValue?.mobile
 }
 
 const attachmentUploadRef = ref()
 const attachmentUploadFiles = ref<UploadUserFile[]>([])
 
-const idcardBusinessFileType = ref('ID_CARD')
-
 const businessType = ref('DELIVER_ORDER')
 const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL)
-const idCardUploadData = ref({
-  businessType: businessType.value,
-  businessId: formData.value.id,
-  businessFileType: idcardBusinessFileType.value
-})
 const uploadData = ref({
   businessType: businessType.value,
   businessId: formData.value.id
@@ -659,6 +734,10 @@ const attachmentUploadChange = (file, files) => {
 
 /** 删除子项操作 */
 const onDeleteItem = (index) => {
+  if(formData.value.deliverOrderSubs.length == 1){
+    message.warning('发货清单至少存在一条数据')
+    return
+  }
   formData.value.deliverOrderSubs.splice(index, 1)
 }
 
@@ -698,9 +777,27 @@ const queryData = async (type: string, id?: number) => {
   try {
     if (id) {
       formData.value = await DeliverOrderApi.getDeliverOrder(id)
+      formData.value.deliverCompany = '杭州合立机械有限公司'
       // 子项列表
-      formData.value.deliverOrderSubs =
-        await DeliverOrderApi.getDeliverOrderSubListByDeliveryOrderId(id)
+      const subArr = await DeliverOrderApi.getDeliverOrderSubListByDeliveryOrderId(id)
+      // 如未保存过 即子项为空 从关联项目带出
+      if(!subArr || subArr.length == 0){
+        formData.value.deliverOrderSubs = [];
+        let saleOrderIdArr = formData.value.saleOrderIds.split(",");
+        for (let i = 0; i < saleOrderIdArr.length; i++) {
+          formData.value.deliverOrderSubs = formData.value.deliverOrderSubs.concat(await getProjectOrderSubListByProjectOrderId(saleOrderIdArr[i]));
+          formData.value.deliverOrderSubs.forEach(sub => {
+            sub.remark = ''
+            sub.saleOrderSubId = sub.id
+            sub.id = ''
+            sub.saleOrderCode = sub.projectOrderCode
+          })
+        }
+      }else{
+        // 分类发货清单与其他物料清单
+        formData.value.deliverOrderSubs = subArr.filter(sub => sub.category == 'DELIVER_LIST');
+        formData.value.deliverOrderOtherSubs = subArr.filter(sub => sub.category == 'OTHER_LIST');
+      }
 
       // 操作日志
       let logParams = {
@@ -718,16 +815,38 @@ const queryData = async (type: string, id?: number) => {
         businessId: id,
         businessType: businessType.value
       }
-      const fileList = (await getFilePage(attParams)).list
-      // 分类赋值 区分身份证照片与附件
-      if(fileList && fileList.length > 0){
-        const idcardFiles = fileList.filter((file) => file.businessFileType == idcardBusinessFileType.value);
-        if(idcardFiles && idcardFiles.length > 0){
-          formData.value.idcard1 = idcardFiles[0].url;
-          formData.value.idcard2 = idcardFiles.length > 1 ? idcardFiles[1].url : undefined;
-        }
-        formData.value.attachments = fileList.filter((file) => file.businessFileType != idcardBusinessFileType.value);
+      formData.value.attachments = (await getFilePage(attParams)).list
+
+      // 收货人信息
+      const customer = await getCustomer(formData.value.customerId)
+      if(customer.contact1Name){
+        receivePersonOptions.value.push({
+          "name": customer.contact1Name,
+          "mobile": customer.contact1Method
+        })
+        receivePersonAddressOptions.value.push({
+          "address": customer.contact1Addr
+        })
       }
+      if(customer.contact2Name){
+        receivePersonOptions.value.push({
+          "name": customer.contact2Name,
+          "mobile": customer.contact2Method
+        })
+        receivePersonAddressOptions.value.push({
+          "address": customer.contact2Addr
+        })
+      }
+      if(customer.contact3Name){
+        receivePersonOptions.value.push({
+          "name": customer.contact3Name,
+          "mobile": customer.contact3Method
+        })
+        receivePersonAddressOptions.value.push({
+          "address": customer.contact3Addr
+        })
+      }
+
     }
   } finally {
     formLoading.value = false
@@ -739,11 +858,47 @@ const openProjectOrderDialog = () => {
   projectOrderDialog.value.open()
 }
 
-const handleSelectedProjectOrder = (val: ProjectOrderVO[]) => {
-  console.log(val)
+const handleSelectedProjectOrder = (arr: ProjectOrderVO[]) => {
+  if(arr && arr.length > 0){
+    let saleOrderIds = "";
+    let saleOrderCode = "";
+    let contractNo = "";
+    let property = "";
+    let mouldName = "";
+    for (let i = 0; i < arr.length; i++) {
+      let order = arr[i];
+      saleOrderIds += order.id + ",";
+      saleOrderCode += order.code + ",";
+      contractNo += order.contractNo + ",";
+      property += getDictLabel(DICT_TYPE.HELI_PROJECT_PROPERTY, order.property) + ",";
+      mouldName += order.mouldName + ",";
+    }
+    formData.value.saleOrderIds = saleOrderIds.substring(0, saleOrderIds.length-1);
+    formData.value.saleOrderCode = saleOrderCode.substring(0, saleOrderCode.length-1);
+    formData.value.contractNo = contractNo.substring(0, contractNo.length-1);
+    formData.value.property = property.substring(0, property.length-1);
+    formData.value.mouldName = mouldName.substring(0, mouldName.length-1);
+    formData.value.customerId = arr[0].customerId;
+    formData.value.customerName = arr[0].customerName;
+  }
 }
 
+// 收货人信息
+const receivePersonOptions = ref([])
+// 详细地址
+const receivePersonAddressOptions = ref([])
+
+const receiveOnChange = (val) => {
+  let matchedPerson = receivePersonOptions.value.find(p => p.name == val);
+  if(matchedPerson){
+    formData.value.receivePersonMobile = matchedPerson.mobile
+  }
+}
+const detailDisabled = ref(false)
 onMounted(() => {
+  if('detail' == query.active){
+    detailDisabled.value = true
+  }
   queryData(query.active, query.id)
 })
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
index 254a4eda..b1eda0a6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
@@ -6,7 +6,7 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="110px"
     >
       <el-form-item label="发货单号" prop="code">
         <el-input
@@ -99,49 +99,54 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column fixed label="序号" type="index" width="100" />
       <el-table-column fixed label="发货单号" align="center" prop="code" width="180" />
-      <el-table-column fixed label="项目编号" align="center" prop="saleOrderCode" width="180" />
+      <el-table-column fixed label="项目编号" align="center" prop="saleOrderCode" width="220" />
       <el-table-column
         fixed
         label="发货日期"
         align="center"
         prop="deliverDate"
-        :formatter="dateFormatter"
+        :formatter="dateFormatter2"
         width="180"
       />
-      <el-table-column label="客户名称" align="center" prop="customerName" width="180" />
+      <el-table-column label="客户名称" align="center" prop="customerName" width="220" />
       <el-table-column label="合同号" align="center" prop="contractNo" width="180" />
-      <el-table-column label="模具名称" align="center" prop="mouldName" width="120" />
+      <el-table-column label="模具名称" align="center" prop="mouldName" width="180" />
       <el-table-column label="性质" align="center" prop="property" width="100" />
       <el-table-column label="发货人姓名" align="center" prop="deliverPersonName" width="120" />
-      <el-table-column label="发货人电话" align="center" prop="deliverPersonMobile" width="120" />
+      <el-table-column label="发货人电话" align="center" prop="deliverPersonMobile" width="160" />
       <el-table-column label="收货人姓名" align="center" prop="receivePersonName" width="120" />
-      <el-table-column label="收货人电话" align="center" prop="receivePersonMobile" width="120" />
+      <el-table-column label="收货人电话" align="center" prop="receivePersonMobile" width="160" />
       <el-table-column label="收货详细地址" align="center" prop="receiveAddress" width="180" />
       <el-table-column label="司机姓名" align="center" prop="transportDriverName" width="120" />
-      <el-table-column label="司机电话" align="center" prop="transportDriverMobile" width="120" />
+      <el-table-column label="司机电话" align="center" prop="transportDriverMobile" width="160" />
       <el-table-column label="发货备注" align="center" prop="remark" width="180" />
       <el-table-column fixed="right" label="发货单状态" align="center" prop="deliverStatus" width="120">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.HELI_DELIVER_ORDER_STATUS" :value="scope.row.deliverStatus" />
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center" width="160">
+      <el-table-column fixed="right" label="操作" align="center" width="220">
         <template #default="scope">
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
           <el-button
             link
             type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['heli:deliver-order:update']"
+            @click="openDetail('update', scope.row.id)"
           >
             编辑
           </el-button>
           <el-button
             link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['heli:deliver-order:delete']"
+            type="primary"
+            @click="openDetail('detail', scope.row.id)"
           >
-            删除
+            查看详情
           </el-button>
         </template>
       </el-table-column>
@@ -159,7 +164,7 @@
 
 <script setup lang="ts">
 import {getStrDictOptions, DICT_TYPE, getIntDictOptions} from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as DeliverOrderApi from '@/api/heli/deliverorder'
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue
index 016a413e..0e3f5c66 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/projectOrderDialog.vue
@@ -171,8 +171,9 @@ const queryParams = reactive({
   pageSize: 10,
   contractNo: undefined,
   code: undefined,
-  orderStatus: undefined,
+  orderStatus: 32,
   deliveryStatus: undefined,
+  deliveryStatusList: [1, 2],
   businessDeptId: undefined,
   customerName: undefined,
   mouldName: undefined,
diff --git a/sql/v1.2.0/1.structure.sql b/sql/v1.2.0/1.structure.sql
index 1ebab041..b61f6ef4 100644
--- a/sql/v1.2.0/1.structure.sql
+++ b/sql/v1.2.0/1.structure.sql
@@ -21,9 +21,9 @@ CREATE TABLE `project_deliver_order` (
                                          `deliver_person` BIGINT(20) not null comment '发货人',
                                          `deliver_person_mobile` varchar(32) not null comment '发货人电话',
                                          `deliver_mode` char(1) not null comment '发货方式',
-                                         `receive_person_name` varchar(16) not null comment '收货人姓名',
-                                         `receive_person_mobile` varchar(32) not null comment '收货人电话',
-                                         `receive_address` varchar(255) not null comment '收货详细地址',
+                                         `receive_person_name` varchar(16) comment '收货人姓名',
+                                         `receive_person_mobile` varchar(32) comment '收货人电话',
+                                         `receive_address` varchar(255) comment '收货详细地址',
                                          `transport_driver_name` varchar(16) comment '司机姓名',
                                          `transport_driver_mobile` varchar(32) comment '司机电话',
                                          `transport_bus_number` varchar(32) comment '车牌号',
@@ -45,7 +45,9 @@ DROP TABLE IF EXISTS `project_deliver_order_sub`;
 CREATE TABLE `project_deliver_order_sub` (
                                              `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增字段，唯一',
                                              `delivery_order_id` bigint(20) NOT NULL COMMENT '订单id',
-                                             `category` char(1) not null comment '业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST',
+                                             `category` varchar(16) not null comment '业务类 发货清单|其他清单 DELIVER_LIST|OTHER_LIST',
+                                             `sale_order_sub_id` BIGINT(20) COMMENT '销售订单子项id',
+                                             `sale_order_code` varchar(64) COMMENT '销售订单编号',
                                              `name` varchar(128) NOT NULL COMMENT '名称，唯一',
                                              `blueprint_no` varchar(64) DEFAULT NULL COMMENT '图号',
                                              `amount` int(11) NOT NULL COMMENT '数量',
@@ -168,4 +170,4 @@ from (
         left join `mes-heli`.`base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`)))
     where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`lg`.`deleted` = 0))
 ) `t`
-group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`updater`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`material_type`,`t`.`spec`,`t`.`unit`,`t`.`wh_id`,`t`.`rg_id`,`t`.`pn_id`,`t`.`short_name`;
\ No newline at end of file
+group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`updater`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`material_type`,`t`.`spec`,`t`.`unit`,`t`.`wh_id`,`t`.`rg_id`,`t`.`pn_id`,`t`.`short_name`;

From 63977772dfdd395022631c50205e1304998f1545 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 16:38:03 +0800
Subject: [PATCH 64/64] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=88=B3=20=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/imgs/status/status2.png        | Bin 16408 -> 16230 bytes
 .../src/assets/imgs/status/status3.png        | Bin 15039 -> 15263 bytes
 .../src/assets/imgs/status/status32.png       | Bin 15996 -> 16221 bytes
 .../src/assets/imgs/status/status64.png       | Bin 15688 -> 16194 bytes
 .../src/assets/imgs/status/status8.png        | Bin 16008 -> 16211 bytes
 .../src/assets/imgs/status/statuszf.png       | Bin 16329 -> 16537 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status2.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status2.png
index 2ffc622d24ee9fe5ea808dcfeb0857ce517aa243..5d40c7916233c73318d8accceebd71645136e04b 100644
GIT binary patch
literal 16230
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

literal 16408
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
L8R1GnJ>UNaIgDlQ

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status3.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status3.png
index 9042e1b1b10ffbe55f4207f0cc3fe077ca00ec1c..cc94353c42f1915e48a67785f061ce06c7d4ce75 100644
GIT binary patch
literal 15263
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

literal 15039
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
U_b4Jea0nHoD5nOgl{F9lAJPMkj{pDw

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status32.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status32.png
index 699ed6bce0c924c7b79042cc98aaaa5e8eebd5f9..a5682f056ff48bf41d122fc1686cb50f43ad4f5a 100644
GIT binary patch
literal 16221
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
UO*W6fh&)J6N=dTngHiDR04JN_uK)l5

literal 15996
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%0D$>>P66sPA
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
B9xVU>

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status64.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status64.png
index 824a7122000f6b9dfd9ecbddbf95262108b70c49..32571ec4838898f00a280347d7f690e9301cb34b 100644
GIT binary patch
literal 16194
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
OAUP=|$y#yakpBa&mdSts

literal 15688
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

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status8.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status8.png
index b384b2fb362731435441b0de9f9f8d62612112ff..f4a81715a20e1f6d27838ca478f49b75f1e85c68 100644
GIT binary patch
literal 16211
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
JTGS}u{{XMjsVe{g

literal 16008
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

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statuszf.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statuszf.png
index 97c324a287fd0d125754834b2d3105b8ab5ed28e..24a95d490bec3c029780670ae4baa142a24582a7 100644
GIT binary patch
literal 16537
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

literal 16329
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
NwVbMKm9#nR{{V?K&iDWT