1. 增加loading

2. 增加盘点查询界面
3. 增加配料单删除

dev_wms_client/src/api/kateWork.js

@@ -188,4 +188,13 @@ export const getGoodsRequirement = (params) => {
     data: params,
     timeout: 5000
   })
-}
+}
+// 删除配料单
+export const deleteKittingBom = (params) => {
+  return request({
+    url: '/kate/deleteKittingBom',
+    method: 'post',
+    data: params,
+    timeout: 5000
+  })
+}

dev_wms_client/src/api/taskQuery.js

@@ -39,4 +39,12 @@ export const queryOutsByPage = (params) => {
     method: 'post',
     data: params
   })
+}
+// 分页查询盘点信息
+export const queryInventoryRecordByPage = (params) => {
+  return request({
+    url: '/taskQuery/queryInventoryRecordByPage',
+    method: 'post',
+    data: params
+  })
 }

dev_wms_client/src/layout/goodsOut.vue

@@ -286,7 +286,7 @@ const confirmOut = () => {
     userName: USER_NAME,
     standId: STAND_ID
   }
-  loading.open('请求中，请稍等...')
+  loading.open('处理中...')
   requireStockOut(request).then(res => {
     const response = res.data
     if (response.code === 0) {
@@ -328,6 +328,7 @@ const confirmOrRelease = () => {
     standId: STAND_ID,
     userName: USER_NAME
   }
+  loading.open('确认中...')
   confirmCurrentTask(request).then(res => {
     const response = res.data
     if (response.code === 0) {
@@ -345,6 +346,8 @@ const confirmOrRelease = () => {
   }).catch(err => {
     console.log(err)
     errorBox('请求错误，请检查完原因后刷新界面。')
+  }).finally(() => {
+    loading.close()
   })
 }
 // 当拣选数量修改时，要对应的修改

dev_wms_client/src/layout/inventory.vue

@@ -84,6 +84,7 @@ import {ElMessage} from "element-plus";
 import {confirmInventory, getInventoryConfirm, requestInventory} from "@/api/task";
 import {labelPosition} from "@/constant/form";
 import UploadExcelInventory from "@/excel/UploadExcelInventory.vue";
+import {loading} from "@/utils/loading";
 
 const STAND_ID = store.getters.getStandId
 const USER_NAME = store.getters.getUserName
@@ -168,7 +169,7 @@ const getInventory = () => {
 const sendInventoryRequest = () => {
   inventoryRequestFormEntity.goodsId = inventoryRequestFormEntity.goodsId.trim().toUpperCase()
   inventoryRequestFormEntity.vehicleId = inventoryRequestFormEntity.vehicleId.trim().toUpperCase()
-  if (inventoryRequestFormEntity.goodsId == '') {
+  if (inventoryRequestFormEntity.goodsId === '') {
     ElMessage.error("料号为必须项。")
     return
   }
@@ -178,9 +179,10 @@ const sendInventoryRequest = () => {
     standId: STAND_ID,
     userName: USER_NAME
   }
+  loading.open('处理中...')
   requestInventory(request).then(res => {
     const response = res.data
-    if (response.code == 0) {
+    if (response.code === 0) {
       ElMessage.success(response.message)
       pauseGetPickFlag.value = false
     } else {
@@ -189,6 +191,8 @@ const sendInventoryRequest = () => {
   }).catch(err => {
     console.log(err)
     ElMessage.error("发生异常。")
+  }).finally(() => {
+    loading.close()
   })
 }
 // 确认/放行
@@ -202,14 +206,15 @@ const confirmOrRelease = () => {
     standId:STAND_ID,
     userName: USER_NAME
   }
+  loading.open('处理中...')
   confirmInventory(request).then(res => {
     const response = res.data
-    if (response.code == 0) {
+    if (response.code === 0) {
       // 设置form
       resetConfirmEntity()
       ElMessage.success(response.message)
       pauseGetPickFlag.value = false
-    } else if (response.code == 400) {
+    } else if (response.code === 400) {
       // 设置form
       resetConfirmEntity()
       warningBox(response.message)
@@ -221,6 +226,8 @@ const confirmOrRelease = () => {
   }).catch(err => {
     console.log(err)
     errorBox('请求错误，请检查完原因后刷新界面。')
+  }).finally(() => {
+    loading.close()
   })
 }
 // 重置确认信息

dev_wms_client/src/layout/inventoryRecord.vue

@@ -12,8 +12,8 @@
                                 :options="queryTypeOptions"
                                 @change="search()"></el-select-v2>
                 </el-form-item>
-                <el-form-item label="任务类型">
+                <el-form-item label="盘点结果">
-                  <el-select-v2 style="width: 196px" v-model="searchQueryFormEntity.invResult" placeholder="任务类型"
+                  <el-select-v2 style="width: 196px" v-model="searchQueryFormEntity.invResult" placeholder="盘点结果"
                                 :options="addAllOptionOfOptions(invResultOptions, DEFAULT_TOTAL_OPTIONS)"
                                 @change="search()"></el-select-v2>
                 </el-form-item>
@@ -40,43 +40,39 @@
                     @sort-change="handleSortChange">
             <el-table-column width="65px" fixed="left">
               <template v-slot="scope">
-                <el-radio :label="scope.row.taskId" v-model="taskId">&nbsp;</el-radio>
+                <el-radio :label="scope.row.inventoryId" v-model="inventoryId">&nbsp;</el-radio>
               </template>
             </el-table-column>
-            <el-table-column prop="taskId" label="任务号" fixed="left" min-width="120px" sortable="custom"
+            <el-table-column prop="inventoryId" label="任务号" fixed="left" min-width="120px" sortable="custom"
                              show-overflow-tooltip/>
-            <el-table-column prop="outType" label="任务类型" fixed="left" :formatter="outsTypeFormat" min-width="120px"
+            <el-table-column prop="goodsId" label="料号" min-width="120px"
                              sortable="custom"
                              show-overflow-tooltip/>
-            <el-table-column prop="vehicleId" label="箱号" fixed="left" min-width="120px" sortable="custom"
+            <el-table-column prop="vehicleId" label="箱号" min-width="120px" sortable="custom"
                              show-overflow-tooltip/>
-            <el-table-column prop="goodsId" label="料号" min-width="120px" sortable="custom"
+            <el-table-column prop="stockNum" label="库存数量" min-width="120px" sortable="custom"
                              show-overflow-tooltip/>
-            <el-table-column prop="needNum" label="需求数量"
+            <el-table-column prop="confirmNum" label="确认数量"
                              min-width="120px" sortable="custom" show-overflow-tooltip/>
-            <el-table-column prop="distributeNum" label="已分配数量" min-width="120px" sortable="custom"
+            <el-table-column prop="invStand" label="盘点站台" min-width="120px" sortable="custom"
                              show-overflow-tooltip/>
-            <el-table-column prop="pickNum" label="已拣选数量" min-width="120px"
+            <el-table-column prop="invUser" label="盘点人" min-width="120px"
                              sortable="custom" show-overflow-tooltip/>
-            <el-table-column prop="destination" label="目标站台" min-width="120px" sortable="custom"
+            <el-table-column prop="invType" label="盘点类型" :formatter="invTypeFormat" min-width="120px" sortable="custom"
                              show-overflow-tooltip/>
-            <el-table-column prop="userName" label="用户" min-width="120px"
+            <el-table-column prop="invStatus" label="任务状态" :formatter="invStatusFormat" min-width="120px"
                              sortable="custom" show-overflow-tooltip/>
-            <el-table-column prop="reason" label="原因" min-width="120px" sortable="custom"
+            <el-table-column prop="invResult" label="盘点结果" :formatter="invResultFormat" min-width="120px" sortable="custom"
                              show-overflow-tooltip/>
-            <el-table-column prop="requestTime" label="请求时间" :formatter="timeFormat" min-width="120px"
+            <el-table-column prop="invCreateTime" label="创建时间" :formatter="timeFormat" min-width="120px"
+                             sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column prop="invConfirmTime" label="确认时间" :formatter="timeFormat" min-width="120px"
+                             sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column prop="invOrderId" label="任务组" min-width="120px"
                              sortable="custom"
                              show-overflow-tooltip/>
-            <el-table-column fixed="right" label="操作" width="170px" v-if="searchQueryFormEntity.queryType === 1">
-              <template v-slot="scope">
-                <div style="display: inline-block; align-content: center;">
-                  <el-button type="danger"
-                             @click="cancelOuts(scope.row)">取消</el-button>
-                  <el-button type="success"
-                             @click="finishOuts(scope.row)">完成</el-button>
-                </div>
-              </template>
-            </el-table-column>
           </el-table>
           <br/>
           <el-pagination v-model:current-page="baseTableQuery.currentPage"
@@ -93,16 +89,14 @@
 <script setup>
 import store from '@/store'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-import {queryOutsByPage} from '@/api/taskQuery.js'
+import {queryInventoryRecordByPage} from '@/api/taskQuery.js'
-import {timeFormatter, outTaskTypeFormatter} from '@/utils/formatter.js'
+import {timeFormatter} from '@/utils/formatter.js'
 import {ref, reactive, onMounted, nextTick, onBeforeUnmount} from 'vue'
 import {ElMessage} from 'element-plus'
 import {genTableRequest} from '@/utils/generator.js'
 import {labelPosition} from '@/constant/form.js'
-import {invResultOptions, outTypeOptions} from '@/constant/options.js'
+import {invResultOptions} from '@/constant/options.js'
 import {addAllOptionOfOptions} from '@/utils/generator.js'
-import {loading} from '@/utils/loading'
-import {updateOutsTask} from "@/api/taskOperation";
 
 /**
  * 常量定义
@@ -131,14 +125,14 @@ let searchQueryFormEntity = reactive({
   queryType: 1
 })
 let searchQueryFormRef = ref()
-let taskId = ''
+let inventoryId = ''
 const queryTypeOptions = [
   {
-    label: '任务',
+    label: '未关闭',
     value: 1
   },
   {
-    label: '记录',
+    label: '已关闭',
     value: 2
   }
 ]
@@ -169,9 +163,9 @@ const search = () => {
   // 设定查询参数
   request.vehicleId = searchQueryFormEntity.vehicleId.trim()
   request.goodsId = searchQueryFormEntity.goodsId.trim()
-  request.outType = searchQueryFormEntity.outType === DEFAULT_TOTAL_OPTIONS ? null : searchQueryFormEntity.outType
+  request.invResult = searchQueryFormEntity.invResult === DEFAULT_TOTAL_OPTIONS ? null : searchQueryFormEntity.invResult
   request.queryType = searchQueryFormEntity.queryType// 查询类型
-  queryOutsByPage(request).then((res) => {
+  queryInventoryRecordByPage(request).then((res) => {
     const response = res.data
     if (response.code === 0) {
       const data = response.data
@@ -204,61 +198,48 @@ const handleSortChange = (data) => {
   search()
 }
 const getCurrentRow = (row) => {
-  taskId = row.taskId
+  inventoryId = row.inventoryId
 }
 const timeFormat = (row, column, cellValue, index) => {
   return timeFormatter(cellValue)
 }
-const outsTypeFormat = (row, column, cellValue, index) => {
+// 盘点任务状态format
-  return outTaskTypeFormatter(cellValue)
+const invStatusFormat = (row, column, cellValue, index) => {
-}
+  switch (cellValue) {
-// 取消出库单
+    case 0:
-const cancelOuts = (row) => {
+      return '初始化'
-  const request = {
+    case 1:
-    taskId: row.taskId,
+      return '已解析'
-    updateType: 1,
+    case 2:
-    userName: USER_NAME,
+      return '已确认'
-    standId: STAND_ID
+    default:
+      return '未知状态'
   }
-  loading.open('取消中...')
-  updateOutsTask(request).then(res => {
-    const response = res.data
-    if (response.code === 0) {
-      ElMessage.success(response.message)
-    } else {
-      ElMessage.error(response.message)
-    }
-  }).catch(err => {
-    console.log(err)
-    ElMessage.error('取消发生异常。')
-  }).finally(() => {
-    loading.close()
-    search()
-  })
 }
-// 完成出库单
+// 盘点类型format
-const finishOuts = (row) => {
+const invTypeFormat = (row, column, cellValue, index) => {
-  const request = {
+  if (cellValue === 1) {
-    taskId: row.taskId,
+    return '明盘'
-    updateType: 2,
+  } else if (cellValue === 2) {
-    userName: USER_NAME,
+    return '盲盘'
-    standId: STAND_ID
+  } else {
+    return '未知类型'
+  }
+}
+// 盘点结果format
+const invResultFormat = (row, column, cellValue, index) => {
+  switch (cellValue) {
+    case -99:
+      return '未盘'
+    case -1:
+      return '盘亏'
+    case 0:
+      return '正常'
+    case 1:
+      return '盘盈'
+    default:
+      return '未知结果'
   }
-  loading.open('完成中...')
-  updateOutsTask(request).then(res => {
-    const response = res.data
-    if (response.code === 0) {
-      ElMessage.success(response.message)
-    } else {
-      ElMessage.error(response.message)
-    }
-  }).catch(err => {
-    console.log(err)
-    ElMessage.error('完成发生异常。')
-  }).finally(() => {
-    loading.close()
-    search()
-  })
 }
 </script>
 <style scoped>

dev_wms_client/src/layout/kitting.vue

@@ -445,7 +445,7 @@ const confirmStart = () => {
     standId: standId,
     userName: userName
   }
-  loading.open()
+  loading.open('处理中...')
   initWorks(request).then(res => {
     const response = res.data
     if (response.code === 0) {
@@ -616,6 +616,7 @@ const confirmOrRelease = () => {
     standId: standId,
     userName: userName
   }
+  loading.open('确认中...')
   confirmCurrentWork(request).then(res => {
     const response = res.data
     if (response.code === 0) {
@@ -635,6 +636,8 @@ const confirmOrRelease = () => {
   }).catch(err => {
     console.log(err)
     errorBox('请求错误，请检查完原因后刷新界面。')
+  }).finally(() => {
+    loading.close()
   })
 }
 const resetConfirmEntity = () => {

dev_wms_client/src/layout/kittingList.vue

@@ -1,205 +1,101 @@
 <template>
-    <el-config-provider :locale="zhCn">
+  <el-config-provider :locale="zhCn">
-        <el-container class="content">
+    <el-container class="content">
-            <div class="work-area">
+      <div class="work-area">
-                <fieldset class="search-area">
+        <fieldset class="search-area">
-                    <el-form ref="kittingBomQueryFormRef" :model="kittingBomQueryFormEntity"
+          <el-form ref="kittingBomQueryFormRef" :model="kittingBomQueryFormEntity"
-                        :label-position="labelPosition" label-width="158px" style="max-width: 100%" status-icon>
+                   :label-position="labelPosition" label-width="158px" style="max-width: 100%" status-icon>
-                        <div style="display: flex;justify-content: space-between;">
+            <div style="display: flex;justify-content: space-between;">
-                            <el-row>
+              <el-row>
-                                <el-form-item label="配料单类型">
+                <el-form-item label="配料单类型">
-                                    <el-select-v2 style="width: 196px" v-model="kittingBomQueryFormEntity.bomType" placeholder="配料单类型"
+                  <el-select-v2 style="width: 196px" v-model="kittingBomQueryFormEntity.bomType"
-                                        :options="kittingBomTypeOptions" @change="search()"></el-select-v2>
+                                placeholder="配料单类型"
-                                </el-form-item>
+                                :options="kittingBomTypeOptions" @change="search()"></el-select-v2>
-                                <el-form-item label="机型">
+                </el-form-item>
-                                    <el-input v-model="kittingBomQueryFormEntity.model" @keyup.enter="search()" clearable />
+                <el-form-item label="机型">
-                                </el-form-item>
+                  <el-input v-model="kittingBomQueryFormEntity.model" @keyup.enter="search()" clearable/>
-                                <el-form-item label="成品号">
+                </el-form-item>
-                                    <el-input v-model="kittingBomQueryFormEntity.productId" @keyup.enter="search()" clearable />
+                <el-form-item label="成品号">
-                                </el-form-item>
+                  <el-input v-model="kittingBomQueryFormEntity.productId" @keyup.enter="search()" clearable/>
-                                <el-form-item label="原材料号">
+                </el-form-item>
-                                    <el-input v-model="kittingBomQueryFormEntity.goodsId" @keyup.enter="search()" clearable />
+                <el-form-item label="原材料号">
-                                </el-form-item>
+                  <el-input v-model="kittingBomQueryFormEntity.goodsId" @keyup.enter="search()" clearable/>
-                                <el-form-item label="料盒号">
+                </el-form-item>
-                                    <el-input v-model="kittingBomQueryFormEntity.boxNo" @keyup.enter="search()" clearable />
+                <el-form-item label="料盒号">
-                                </el-form-item>
+                  <el-input v-model="kittingBomQueryFormEntity.boxNo" @keyup.enter="search()" clearable/>
-                            </el-row>
+                </el-form-item>
-                            <div style="align-content: center;">
+              </el-row>
-                                <el-row>
+              <div style="align-content: center;">
-                                    <el-button type="primary" class="btn-search" @click="search()">查询</el-button>
+                <el-row>
-                                    <el-button type="warning" class="btn-search" @click="clearQuery()">清除输入</el-button>
+                  <el-button type="primary" class="btn-search" @click="search()">查询</el-button>
-                                </el-row>
+                  <el-button type="warning" class="btn-search" @click="clearQuery()">清除输入</el-button>
-                                <el-row>
+                </el-row>
-                                    <el-button style="background-color: #00CED1;" class="btn-search"
+                <el-row>
-                                        @click="openUploadDialog()">导入配料单</el-button>
+                  <el-button style="background-color: #00CED1;" class="btn-search"
-                                    <el-button type="success" class="btn-search"
+                             @click="openUploadDialog()">导入配料单
-                                        @click="exportExcel()">导出excel</el-button>
+                  </el-button>
-                                </el-row>
+                  <el-button type="success" class="btn-search"
-                            </div>
+                             @click="exportExcel()">导出excel
-                        </div>
+                  </el-button>
-                    </el-form>
+                </el-row>
-                </fieldset>
+              </div>
-                <div class="table-area">
-                    <el-table :data="displayKittingList" stripe border v-loading="tableLoading" class="table-class"
-                        :max-height="maxHeight" highlight-current-row @row-click="getCurrentRow"
-                        :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
-                        @sort-change="handleSortChange">
-                        <el-table-column width="65px" fixed="left">
-                            <template v-slot="scope">
-                                <el-radio :label="scope.row.templateId" v-model="templateId">&nbsp;</el-radio>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="bomType" label="配料单类型" fixed="left" min-width="120px" sortable="custom"
-                            :formatter="bomTypeFormat" show-overflow-tooltip />
-                        <el-table-column prop="model" label="机型" min-width="120px" sortable="custom"
-                            show-overflow-tooltip />
-                        <el-table-column prop="productId" :label="kittingBomQueryFormEntity.bomType == 1 ? '成品号' : '服务件成品号'" fixed="left" min-width="120px" sortable="custom"
-                            show-overflow-tooltip />
-                        <el-table-column prop="goodsId" label="原材料号" min-width="120px" sortable="custom"
-                            show-overflow-tooltip />
-                        <el-table-column prop="goodsDescription" label="物料描述" min-width="120px" sortable="custom"
-                            show-overflow-tooltip />
-                        <el-table-column prop="quantity1Pair" label="单套数量" min-width="120px" sortable="custom"
-                            show-overflow-tooltip />
-                        <el-table-column prop="boxNo" label="料盒号" min-width="120px" sortable="custom"
-                            show-overflow-tooltip />
-                        <el-table-column prop="quantityOfPair" label="套数" min-width="120px" sortable="custom"
-                            show-overflow-tooltip />
-                        <!-- <el-table-column fixed="right" label="操作" width="120px">
-                            <template v-slot="scope">
-                                <el-button plain type="primary" @click="editCurrentRowStock(scope.row)">编辑</el-button>
-                            </template>
-                        </el-table-column> -->
-                    </el-table>
-                    <br />
-                    <el-pagination v-model:current-page="baseTableQuery.currentPage"
-                        v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
-                        :disabled="false" :background="false" :default-page-size="10" @size-change="search"
-                        @current-change="search" layout="total, sizes, prev, pager, next, jumper"
-                        :total="baseTableQuery.total" />
-                </div>
-                <!-- <el-dialog v-model="dialogVisible" title="库存信息" width="40%" draggable :show-close="false">
-                    <el-form ref="stockFormRef" :model="stockFormEntity" :label-position="labelPosition"
-                        label-width="100px" style="max-width: 100%" :rules="rules" status-icon>
-                        <el-row :gutter="16">
-                            <el-col :span="12" :offset="0">
-                                <el-form-item label="库存编号" prop="stockId">
-                                    <el-input v-model="stockFormEntity.stockId" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="箱号" prop="vehicleId">
-                                    <el-input v-model="stockFormEntity.vehicleId" disabled />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="16">
-                            <el-col :span="12" :offset="0">
-                                <el-form-item label="料号" prop="goodsId">
-                                    <el-input v-model="stockFormEntity.goodsId" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="料名" prop="goodsName">
-                                    <el-input v-model="stockFormEntity.goodsName" disabled />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="16">
-                            <el-col :span="12" :offset="0">
-                                <el-form-item label="入库数量" prop="totalNum">
-                                    <el-input-number v-model.number="stockFormEntity.totalNum" controls-position="right"
-                                        :min="0" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="剩余数量（为0时删除库存）" prop="remainNum">
-                                    <el-input-number v-model.number="stockFormEntity.remainNum"
-                                        controls-position="right" :min="0" :max="stockFormEntity.totalNum" clearable />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="16">
-                            <el-col :span="12" :offset="0">
-                                <el-form-item label="库位" prop="locationId">
-                                    <el-input v-model="stockFormEntity.locationId" clearable />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="未使用天数" prop="noUseDays">
-                                    <el-input-number v-model.number="stockFormEntity.noUseDays"
-                                        controls-position="right" :min="0" disabled />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="16">
-                            <el-col :span="12" :offset="0">
-                                <el-form-item label="库存状态" prop="stockStatus">
-                                    <el-select-v2 v-model="stockFormEntity.stockStatus" placeholder="请选择库存状态"
-                                        :options="stockStatusOptions"></el-select-v2>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="物料状态" prop="goodsStatus">
-                                    <el-select-v2 v-model="stockFormEntity.goodsStatus" placeholder="请选择物料状态"
-                                        :options="goodsStatusOptions"></el-select-v2>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="16">
-                            <el-col :span="12" :offset="0">
-                                <el-form-item label="盘点任务号" prop="inventoryTaskId">
-                                    <el-input v-model="stockFormEntity.inventoryTaskId" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="是否盘点" prop="isInventory">
-                                    <el-input v-model="stockFormEntity.isInventory" disabled />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="16">
-                            <el-col :span="12" :offset="0">
-                                <el-form-item label="创建时间" prop="createTime">
-                                    <el-input v-model="stockFormEntity.createTime" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="最近更新时间" prop="lastUpdateTime">
-                                    <el-input v-model="stockFormEntity.lastUpdateTime" disabled />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="16">
-                            <el-col :span="12" :offset="0">
-                                <el-form-item label="最近更新用户" prop="lastUpdateUser">
-                                    <el-input v-model="stockFormEntity.lastUpdateUser" disabled />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form>
-                    <template #footer>
-                        <span class="dialog-footer">
-                            <el-button @click="dialogVisible = false">取消</el-button>
-                            <el-button type="primary" @click="submitStockInfo(stockFormEntity)">
-                                确定
-                            </el-button>
-                        </span>
-                    </template>
-                </el-dialog> -->
-                <el-dialog v-model="showKittingBomUploadDialog" title="上传配料单" width="40%" draggable :show-close="true">
-                    <fieldset class="search-area" v-if="kittingBomQueryFormEntity.bomType == 1">
-                        <legend>导入非服务件配料单</legend>
-                        <UploadExcelProduct></UploadExcelProduct>
-                    </fieldset>
-                    <fieldset class="search-area" v-if="kittingBomQueryFormEntity.bomType == 2">
-                        <legend>导入服务件配料单</legend>
-                        <UploadExcelSingleProduct></UploadExcelSingleProduct>
-                    </fieldset>
-                </el-dialog>
             </div>
-        </el-container>
+          </el-form>
-    </el-config-provider>
+        </fieldset>
+        <div class="table-area">
+          <el-table :data="displayKittingList" stripe border v-loading="tableLoading" class="table-class"
+                    :max-height="maxHeight" highlight-current-row @row-click="getCurrentRow"
+                    :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
+                    @sort-change="handleSortChange">
+            <el-table-column width="65px" fixed="left">
+              <template v-slot="scope">
+                <el-radio :label="scope.row.templateId" v-model="templateId">&nbsp;</el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column prop="bomType" label="配料单类型" fixed="left" min-width="120px" sortable="custom"
+                             :formatter="bomTypeFormat" show-overflow-tooltip/>
+            <el-table-column prop="model" label="机型" min-width="120px" sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column prop="productId"
+                             :label="kittingBomQueryFormEntity.bomType === 1 ? '成品号' : '服务件成品号'" fixed="left"
+                             min-width="120px" sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column prop="goodsId" label="原材料号" min-width="120px" sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column prop="goodsDescription" label="物料描述" min-width="120px" sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column prop="quantity1Pair" label="单套数量" min-width="120px" sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column prop="boxNo" label="料盒号" min-width="120px" sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column prop="quantityOfPair" label="套数" min-width="120px" sortable="custom"
+                             show-overflow-tooltip/>
+            <el-table-column fixed="right" label="操作" width="120px">
+              <template v-slot="scope">
+                <el-button plain type="danger" @click="deleteThisProduct(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <br/>
+          <el-pagination v-model:current-page="baseTableQuery.currentPage"
+                         v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
+                         :disabled="false" :background="false" :default-page-size="10" @size-change="search"
+                         @current-change="search" layout="total, sizes, prev, pager, next, jumper"
+                         :total="baseTableQuery.total"/>
+        </div>
+        <el-dialog v-model="showKittingBomUploadDialog" title="上传配料单" width="40%" draggable :show-close="true">
+          <fieldset class="search-area" v-if="kittingBomQueryFormEntity.bomType === 1">
+            <legend>导入非服务件配料单</legend>
+            <UploadExcelProduct></UploadExcelProduct>
+          </fieldset>
+          <fieldset class="search-area" v-if="kittingBomQueryFormEntity.bomType === 2">
+            <legend>导入服务件配料单</legend>
+            <UploadExcelSingleProduct></UploadExcelSingleProduct>
+          </fieldset>
+        </el-dialog>
+      </div>
+    </el-container>
+  </el-config-provider>
 </template>
 
 <script setup>
@@ -207,17 +103,20 @@ import store from '@/store'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import UploadExcelProduct from '@/excel/UploadExcelProduct.vue'
 import UploadExcelSingleProduct from '@/excel/UploadExcelSingleProduct.vue'
-import { queryKittingBomByPage } from '@/api/kateWork.js'
+import {deleteKittingBom, queryKittingBomByPage} from '@/api/kateWork.js'
-import { dateFormatter } from '@/utils/formatter.js'
+import {dateFormatter} from '@/utils/formatter.js'
-import { ref, reactive, onMounted, nextTick, onBeforeUnmount } from 'vue'
+import {ref, reactive, onMounted, nextTick, onBeforeUnmount} from 'vue'
-import { ElMessage } from 'element-plus'
+import {ElMessage, ElMessageBox} from 'element-plus'
-import { genTableRequest } from '@/utils/generator.js'
+import {genTableRequest} from '@/utils/generator.js'
-import { labelPosition } from '@/constant/form.js'
+import {labelPosition} from '@/constant/form.js'
-import { kittingBomTypeOptions } from '@/constant/options.js'
+import {kittingBomTypeOptions} from '@/constant/options.js'
-import { exportKittingBomWithExcel } from '@/api/excel.js'
+import {exportKittingBomWithExcel} from '@/api/excel.js'
+import {loading} from "@/utils/loading";
 /**
  * 常量定义
  */
+const USER_NAME = store.getters.getUserName
+const STAND_ID = store.getters.getStandId
 /**
  * 变量定义
  */
@@ -225,272 +124,263 @@ let maxHeight = ref(window.innerHeight * 0.55)
 let tableLoading = ref(false)
 let displayKittingList = ref([])
 let baseTableQuery = reactive({
-    currentPage: 1,
+  currentPage: 1,
-    pageSize: 10,
+  pageSize: 10,
-    total: 0,
+  total: 0,
-    sortBy: new Map([['productId', true]]),// 按照成品号顺序排序
+  sortBy: new Map([['productId', true]]),// 按照成品号顺序排序
-    standId: store.getters.getStandId,
+  standId: STAND_ID,
-    userName: store.getters.getUserName
+  userName: USER_NAME
 })
 let kittingBomQueryFormEntity = reactive({
-    bomType: 1,
+  bomType: 1,
-    model: '',
+  model: '',
-    productId: '',
+  productId: '',
-    goodsId: '',
+  goodsId: '',
-    boxNo: ''
+  boxNo: ''
 })
 let kittingBomQueryFormRef = ref()
-let showKittingBomEditFlag = ref(false)
 let templateId = ''
-let kittingBomEditFormRef = ref()
-let dbsEditFormEntity = reactive({})
 let showKittingBomUploadDialog = ref(false)
 /**
  * 系统方法
  */
 onMounted(() => {
-    nextTick(() => {
+  nextTick(() => {
-        window.addEventListener('resize', resizeHeight)
+    window.addEventListener('resize', resizeHeight)
-        search()
+    search()
-    })
+  })
 })
 onBeforeUnmount(() => {
-    nextTick(() => {
+  nextTick(() => {
-        window.removeEventListener('resize', resizeHeight)
+    window.removeEventListener('resize', resizeHeight)
-    })
+  })
 })
 const resizeHeight = () => {
-    maxHeight.value = window.innerHeight * 0.55
+  maxHeight.value = window.innerHeight * 0.55
 }
 /**
  * 自定义方法
  */
 // 查询
 const search = () => {
-    tableLoading.value = true
+  tableLoading.value = true
-    let request = genTableRequest(baseTableQuery)
+  let request = genTableRequest(baseTableQuery)
-    // 设定查询参数
+  // 设定查询参数
-    request.bomType = kittingBomQueryFormEntity.bomType
+  request.bomType = kittingBomQueryFormEntity.bomType
-    request.model = kittingBomQueryFormEntity.model.trim()
+  request.model = kittingBomQueryFormEntity.model.trim()
-    request.productId = kittingBomQueryFormEntity.productId.trim()
+  request.productId = kittingBomQueryFormEntity.productId.trim()
-    request.goodsId = kittingBomQueryFormEntity.goodsId.trim()
+  request.goodsId = kittingBomQueryFormEntity.goodsId.trim()
-    request.boxNo = kittingBomQueryFormEntity.boxNo.trim()
+  request.boxNo = kittingBomQueryFormEntity.boxNo.trim()
-    queryKittingBomByPage(request).then((res) => {
+  queryKittingBomByPage(request).then((res) => {
-        const response = res.data
+    const response = res.data
-        if (response.code == 0) {
+    if (response.code === 0) {
-            const data = response.data
+      const data = response.data
-            if (data != null) {
+      if (data != null) {
-                displayKittingList.value = data.lists
+        displayKittingList.value = data.lists
-                baseTableQuery.total = data.total
+        baseTableQuery.total = data.total
-            } else {
+      } else {
-                displayKittingList.value = []
+        displayKittingList.value = []
-                baseTableQuery.total = 0
+        baseTableQuery.total = 0
-            }
+      }
-        } else {
+    } else {
-            ElMessage.error(response.message)
+      ElMessage.error(response.message)
-        }
+    }
-    }).catch(err => {
+  }).catch(err => {
-        console.log(err)
+    console.log(err)
-        ElMessage.error('查询配料单异常。')
+    ElMessage.error('查询配料单异常。')
-    }).finally(() => {
+  }).finally(() => {
-        tableLoading.value = false
+    tableLoading.value = false
-    })
+  })
 }
 const clearQuery = () => {
-    kittingBomQueryFormEntity.model = ''
+  kittingBomQueryFormEntity.model = ''
-    kittingBomQueryFormEntity.productId = ''
+  kittingBomQueryFormEntity.productId = ''
-    kittingBomQueryFormEntity.goodsId = ''
+  kittingBomQueryFormEntity.goodsId = ''
-    kittingBomQueryFormEntity.boxNo = ''
+  kittingBomQueryFormEntity.boxNo = ''
 }
 const bomTypeFormat = (row, column, cellValue, index) => {
-    switch (cellValue) {
+  switch (cellValue) {
-        case 1:
+    case 1:
-            return '非服务件'
+      return '非服务件'
-        case 2:
+    case 2:
-            return '服务件'
+      return '服务件'
-        default:
+    default:
-            return '未知类型'
+      return '未知类型'
-    }
+  }
 }
 const handleSortChange = (data) => {
-    if (baseTableQuery.sortBy.has(data.prop)) {
+  if (baseTableQuery.sortBy.has(data.prop)) {
-        baseTableQuery.sortBy.delete(data.prop)
+    baseTableQuery.sortBy.delete(data.prop)
-    }
+  }
-    baseTableQuery.sortBy.set(data.prop, data.order == 'ascending')
+  baseTableQuery.sortBy.set(data.prop, data.order.toLowerCase() === 'ascending')
-    search()
+  search()
 }
 const getCurrentRow = (row) => {
-    templateId = row.templateId
+  templateId = row.templateId
 }
 const exportExcel = () => {
-    const params = {
+  const params = {
-        bomType: kittingBomQueryFormEntity.bomType,
+    bomType: kittingBomQueryFormEntity.bomType,
-        model: kittingBomQueryFormEntity.model,
+    model: kittingBomQueryFormEntity.model,
-        productId: kittingBomQueryFormEntity.productId,
+    productId: kittingBomQueryFormEntity.productId,
-        rgoodsId: kittingBomQueryFormEntity.goodsId,
+    goodsId: kittingBomQueryFormEntity.goodsId,
-        boxNo: kittingBomQueryFormEntity.boxNo
+    boxNo: kittingBomQueryFormEntity.boxNo
-    }
+  }
-    exportKittingBomWithExcel(params).then(res => {
+  exportKittingBomWithExcel(params).then(res => {
-        const link = document.createElement('a');//创建a标签
+    const link = document.createElement('a');//创建a标签
-        try {
+    try {
-            // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
+      // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
-            let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
+      let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
-            // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
+      // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
-            const preName = kittingBomQueryFormEntity.bomType == 1 ? '非服务件' : '服务件'
+      const preName = kittingBomQueryFormEntity.bomType === 1 ? '非服务件' : '服务件'
-            let _fileName = preName + '配料单' + dateFormatter(new Date) + '.xlsx'
+      let _fileName = preName + '配料单' + dateFormatter(new Date) + '.xlsx'
-            link.style.display = 'none'//隐藏
+      link.style.display = 'none'//隐藏
 
-            // 兼容不同浏览器的URL对象
+      // 兼容不同浏览器的URL对象
-            const url = window.URL || window.webkitURL || window.moxURL
+      const url = window.URL || window.webkitURL || window.moxURL
-            link.href = url.createObjectURL(blob)
+      link.href = url.createObjectURL(blob)
-            link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
+      link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
-            document.body.appendChild(link)
+      document.body.appendChild(link)
-            link.click()
+      link.click()
-            document.body.removeChild(link)
+      document.body.removeChild(link)
-            url.revokeObjectURL(link.href)//移除url对象
+      url.revokeObjectURL(link.href)//移除url对象
-        } catch (e) {
+    } catch (e) {
-            console.log(e)
+      console.log(e)
-            ElMessage.error('下载文件失败')
+      ElMessage.error('下载文件失败')
-        }
-    }).catch(err => {
-        console.log(err)
-        ElMessage.error('导出失败')
-    })
-}
-const editCurrentRowStock = (row) => {
-    this.stockFormEntity = {
-        stockId: row.stockId,
-        locationId: row.locationId,
-        vehicleId: row.vehicleId,
-        stockStatus: row.stockStatus,
-        createTime: row.createTime,
-        lastUpdateTime: row.lastUpdateTime,
-        lastUpdateUser: row.lastUpdateUser,
-        isInventory: row.isInventory,
-        inventoryTaskId: row.inventoryTaskId,
-        noUseDays: row.noUseDays,
-        goodsId: row.goodsId,
-        goodsName: row.goodsName,
-        goodsStatus: row.goodsStatus,
-        remainNum: row.remainNum,
-        totalNum: row.totalNum
     }
-    this.dialogVisible = true
+  }).catch(err => {
+    console.log(err)
+    ElMessage.error('导出失败')
+  })
 }
-const submitStockInfo = () => {
+// 删除当前成品的配料单
+const deleteThisProduct = (row) => {
+  const toDeleteProductId = row.productId
+  ElMessageBox.confirm(
+      '当前操作会删除' + toDeleteProductId + '的整个配料单' + '。\n是否确认',
+      '警告',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+  ).then(() => {
     const request = {
-        stockId: this.stockFormEntity.stockId,
+      bomType: row.bomType,
-        locationId: this.stockFormEntity.locationId,
+      productId: row.productId,
-        vehicleId: this.stockFormEntity.vehicleId,
+      userName: USER_NAME,
-        stockStatus: this.stockFormEntity.stockStatus,
+      standId: STAND_ID
-        goodsId: this.stockFormEntity.goodsId,
-        goodsStatus: this.stockFormEntity.goodsStatus,
-        remainNum: this.stockFormEntity.remainNum,
-        userName: store.getters.getUserName
     }
-    updateStockInfo(request).then(res => {
+    loading.open('删除中...')
-        if (res.data.code == 0) {
+    deleteKittingBom(request).then(res => {
-            this.dialogVisible = false
+      const response = res.data
-            ElMessage.success('更新库存成功')
+      if (response.code === 0) {
-            this.search()
+        ElMessage.success(response.message)
-        } else {
+      } else {
-            errorBox(res.data.message)
+        ElMessage.error(response.message)
-        }
+      }
     }).catch(err => {
-        console.log(err)
+      console.log(err)
-        errorBox('更新库存失败')
+      ElMessage.error('删除异常')
+    }).finally(() => {
+      search()
+      loading.close()
     })
+  }).catch((err) => {
+    console.log(err)
+    ElMessage.info('操作取消')
+  })
 }
 const openUploadDialog = () => {
-    showKittingBomUploadDialog.value = true
+  showKittingBomUploadDialog.value = true
 }
 </script>
 <style scoped>
 .content {
-    display: flex;
+  display: flex;
-    width: 100%;
+  width: 100%;
 }
 
 .work-area {
-    width: 100%;
+  width: 100%;
-    /* padding: 5px; */
+  /* padding: 5px; */
 }
 
 .search-area {
-    margin: auto;
+  margin: auto;
-    min-height: fit-content;
+  min-height: fit-content;
-    max-height: 40%;
+  max-height: 40%;
-    margin-bottom: 10px;
+  margin-bottom: 10px;
-    min-width: inherit;
+  min-width: inherit;
-    border: solid 1px;
+  border: solid 1px;
-    border-radius: 10px;
+  border-radius: 10px;
-    box-shadow: 0px 15px 10px -15px #000;
+  box-shadow: 0px 15px 10px -15px #000;
-    overflow: auto;
+  overflow: auto;
-    padding: 10px;
+  padding: 10px;
 }
 
 .table-area {
-    margin: auto;
+  margin: auto;
-    min-height: fit-content;
+  min-height: fit-content;
-    max-height: 60%;
+  max-height: 60%;
-    margin-bottom: 10px;
+  margin-bottom: 10px;
-    min-width: inherit;
+  min-width: inherit;
-    border: solid 1px;
+  border: solid 1px;
-    border-radius: 10px;
+  border-radius: 10px;
-    box-shadow: 0px 15px 10px -15px #000;
+  box-shadow: 0px 15px 10px -15px #000;
-    overflow: auto;
+  overflow: auto;
-    padding: 10px;
+  padding: 10px;
 }
 
 .el-form-item {
-    margin: 5px 5px 5px 5px;
+  margin: 5px 5px 5px 5px;
 }
 
 .el-form-item .el-input {
-    width: 196px;
+  width: 196px;
 }
 
 .table-class {
-    margin: 5px 5px 5px 5px;
+  margin: 5px 5px 5px 5px;
-    width: inherit;
+  width: inherit;
 }
 
 .el-pagination {
-    padding-left: 5px;
+  padding-left: 5px;
 }
 
 .my-autocomplete li {
-    width: 196px;
+  width: 196px;
-    line-height: normal;
+  line-height: normal;
-    padding: 7px;
+  padding: 7px;
 }
 
 .my-autocomplete li .name {
-    text-overflow: ellipsis;
+  text-overflow: ellipsis;
-    overflow: hidden;
+  overflow: hidden;
 }
 
 .my-autocomplete li .addr {
-    font-size: 12px;
+  font-size: 12px;
-    color: #b4b4b4;
+  color: #b4b4b4;
 }
 
 .my-autocomplete li .highlighted .addr {
-    color: #ddd;
+  color: #ddd;
 }
 
 .my-autocomplete li .goods_id {
-    color: brown;
+  color: brown;
 }
 
 .my-autocomplete li .goods_name {
-    color: cornflowerblue;
+  color: cornflowerblue;
 }
 
 .btn-search {
-    height: 30px;
+  height: 30px;
-    width: 80px;
+  width: 80px;
-    margin: auto 5px 5px auto;
+  margin: auto 5px 5px auto;
-    color: black;
+  color: black;
 }
 </style>

dev_wms_client/src/layout/workSummary.vue

@@ -178,13 +178,13 @@
             <el-row :gutter="16">
               <el-col :span="12" :offset="0">
                 <el-form-item label="工作状态">
-                  <el-select-v2 v-model="rowFormEntity.workStatus" placeholder="请选择工作状态"
+                  <el-select-v2 style="width: 196px;" v-model="rowFormEntity.workStatus" placeholder="请选择工作状态"
                                 :options="workStatusOptions"></el-select-v2>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="缺料状态">
-                  <el-select-v2 v-model="rowFormEntity.lackStatus" placeholder="请选择缺料状态"
+                  <el-select-v2 style="width: 196px;" v-model="rowFormEntity.lackStatus" placeholder="请选择缺料状态"
                                 :options="lackStatusOptions"></el-select-v2>
                 </el-form-item>
               </el-col>

dev_wms_client/src/utils/generator.js

@@ -25,7 +25,6 @@ export const genTableRequest = (baseTableQuery) => {
  * @returns
  */
 export const addAllOptionOfOptions = (options, defaultValue) => {
-    console.log(defaultValue)
     const allOption = [
         {
             value: defaultValue === undefined || defaultValue === null ? -99 : defaultValue,

dev_wms_serve/src/main/java/com/wms_main/controller/wms/KateWorkController.java

@@ -232,4 +232,14 @@ public class KateWorkController {
     public BaseWmsApiResponse deleteDbsPlan(@RequestBody DbsRequest dbsRequest) {
         return kateWorkControllerService.deleteDbsPlan(dbsRequest);
     }
+
+    /**
+     * 删除配料单
+     * @param kittingBomRequest 删除请求
+     * @return 删除结果
+     */
+    @PostMapping("/deleteKittingBom")
+    public BaseWmsApiResponse deleteKittingBom(@RequestBody KittingBomRequest kittingBomRequest) {
+        return kateWorkControllerService.deleteKittingBom(kittingBomRequest);
+    }
 }

dev_wms_serve/src/main/java/com/wms_main/model/dto/query/KittingBomQuery.java

@@ -16,8 +16,8 @@ import lombok.NoArgsConstructor;
 public class KittingBomQuery extends PageQuery {
     /**
      * 配料单类型
-     * 1：总成
+     * 1：非服务件
-     * 2：单片
+     * 2：服务件
      */
     @JsonProperty("bomType")
     private Integer bomType;

dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/KittingBomRequest.java

@@ -0,0 +1,44 @@
+package com.wms_main.model.dto.request.wms;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 配料单请求
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class KittingBomRequest extends BaseWmsRequest{
+    /**
+     * 配料单类型
+     * 1：非服务件
+     * 2：服务件
+     */
+    @JsonProperty("bomType")
+    private Integer bomType;
+    /**
+     * 机型
+     */
+    @JsonProperty("model")
+    private String model;
+    /**
+     * 成品号
+     */
+    @JsonProperty("productId")
+    private String productId;
+    /**
+     * 原材料号
+     */
+    @JsonProperty("goodsId")
+    private String goodsId;
+    /**
+     * 料盒号
+     */
+    @JsonProperty("boxNo")
+    private String boxNo;
+}

dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/InventoryRecordVo.java

@@ -61,10 +61,9 @@ public class InventoryRecordVo {
     private Integer invType;
     /**
      * 盘点状态
-     * 1. 初始化
+     * 0. 初始化
-     * 2. 已解析
+     * 1. 已解析
-     * 3. 数量确认
+     * 2. 已确认
-     * 4. 盘点关闭
      */
     @JsonProperty("invStatus")
     private Integer invStatus;

dev_wms_serve/src/main/java/com/wms_main/service/controller/IKateWorkControllerService.java

@@ -159,4 +159,11 @@ public interface IKateWorkControllerService {
      * @return 删除结果
      */
     BaseWmsApiResponse deleteDbsPlan(DbsRequest dbsRequest);
+
+    /**
+     * 删除配料单
+     * @param kittingBomRequest 删除请求
+     * @return 删除结果
+     */
+    BaseWmsApiResponse deleteKittingBom(KittingBomRequest kittingBomRequest);
 }

dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java

@@ -1331,6 +1331,36 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
         return appDbsService.removeById(targetDbs.getDbsId()) ? BaseWmsApiResponse.success("删除DBS成功。") : BaseWmsApiResponse.error("删除DBS失败。");
     }
 
+    /**
+     * 删除配料单---实现
+     * @param kittingBomRequest 删除请求
+     * @return 删除结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public BaseWmsApiResponse deleteKittingBom(KittingBomRequest kittingBomRequest) {
+        if (kittingBomRequest == null) {
+            // 请求为NULL
+            return BaseWmsApiResponse.error("请求参数不能为NULL。");
+        }
+        if (kittingBomRequest.getBomType() == null || StringUtils.isEmpty(kittingBomRequest.getProductId())) {
+            return BaseWmsApiResponse.error("请求参数中，配料单类型bomType与成品号productId为必须项。");
+        }
+        if (kittingBomRequest.getBomType() == 1) {
+            // 删除非服务件配料单
+            LambdaQueryWrapper<TAppProduct> deleteWrapper = new LambdaQueryWrapper<TAppProduct>()
+                    .eq(TAppProduct::getProductId, kittingBomRequest.getProductId());
+            return appProductService.remove(deleteWrapper) ? BaseWmsApiResponse.success("删除非服务件配料单成功。") : BaseWmsApiResponse.error("删除非服务件配料单失败。");
+        } else if (kittingBomRequest.getBomType() == 2) {
+            // 删除非服务件配料单
+            LambdaQueryWrapper<TAppSingleProduct> deleteServiceWrapper = new LambdaQueryWrapper<TAppSingleProduct>()
+                    .eq(TAppSingleProduct::getProductId, kittingBomRequest.getProductId());
+            return appSingleProductService.remove(deleteServiceWrapper) ? BaseWmsApiResponse.success("删除服务件配料单成功。") : BaseWmsApiResponse.error("删除服务件配料单失败。");
+        } else {
+            return BaseWmsApiResponse.error("请求参数中，配料单类型bomType错误。");
+        }
+    }
+
     /**
      * 获取服务件成品号的物料需求
      *