优化

src/api/warehouse/labelQuery.js

@@ -14,6 +14,15 @@ export const deleteLabel = data => createAPI('/warehouse/labelQuery/deleteLabel'
 // 修改标签库位 - rqrq
 export const updateLabelLocation = data => createAPI('/warehouse/labelQuery/updateLabelLocation', 'POST', data)
 
+// 修改标签库存信息（批次、库位、WDR、engChgLevel、失效日期、数量、是否在库）- rqrq
+export const updateHandlingUnitInventory = data => createAPI('/warehouse/labelQuery/updateHandlingUnitInventory', 'POST', data)
+
+// 去除非栈板库存 - rqrq
+export const removeNonPalletInventory = data => createAPI('/warehouse/labelQuery/removeNonPalletInventory', 'POST', data)
+
+// 恢复非栈板库存 - rqrq
+export const restoreNonPalletInventory = data => createAPI('/warehouse/labelQuery/restoreNonPalletInventory', 'POST', data)
+
 // 获取失败的打印任务列表
 export const getFailedPrintTasks = data => createAPI('/warehouse/labelQuery/getFailedPrintTasks', 'POST', data)
 

src/views/modules/warehouse/labelQueryLocation.vue

@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import { getHandlingUnitLabelList, reprintLabel, deleteLabel, getHandlingUnitLabelAll } from '@/api/warehouse/labelQuery'
+import { getHandlingUnitLabelList, reprintLabel, deleteLabel, getHandlingUnitLabelAll, } from '@/api/warehouse/labelQuery'
 import { searchSysLanguagePackList, saveUserFavorite, searchUserFavorite } from '@/api/sysLanguage'
 import { createOtherInboundHU, printLabel } from '@/api/warehouse/otherInbound'
 import {getHandlingUnitLabelListLocation} from '../../../api/warehouse/labelQuery'
@@ -137,10 +137,14 @@ export default {
         {columnProp: "reserveFlag", headerAlign: "center", align: "center", columnLabel: "是否预留", columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: ""},
         {columnProp: "reserveOrderRef1", headerAlign: "center", align: "center", columnLabel: "预留单号1", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
         {columnProp: "reserveOrderRef2", headerAlign: "center", align: "center", columnLabel: "预留单号2", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
-        {columnProp: "reserveOrderRef3", headerAlign: "center", align: "center", columnLabel: "预留单号3", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""}
+        {columnProp: "reserveOrderRef3", headerAlign: "center", align: "center", columnLabel: "预留单号3", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "wdr", headerAlign: "center", align: "center", columnLabel: "WDR", columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "engChgLevel", headerAlign: "center", align: "center", columnLabel: "版本号", columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "expiredDate", headerAlign: "center", align: "center", columnLabel: "失效日期", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "receiveDate", headerAlign: "center", align: "center", columnLabel: "接收日期", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
       ],
       queryHeaderData: {
-        inStockFlag: '',
+        inStockFlag: 'Y',
         partNo: '',
         batchNo: '',
         locationId: '',
@@ -246,7 +250,7 @@ export default {
     // 重置查询条件
     resetQuery() {
       this.queryHeaderData = {
-        inStockFlag: '',
+        inStockFlag: 'Y',
         partNo: '',
         batchNo: '',
         locationId: '',
@@ -302,7 +306,7 @@ export default {
         page: 1,
         size: 999999  // 设置一个很大的数字来获取全部数据 - rqrq
       }
-      const {data} = await getHandlingUnitLabelAll(queryParams)
+      const {data} = await getHandlingUnitLabelListLocation(queryParams)
       if (data && data.code === 0) {
         return (data.page.list || []).map(item => {
           return {