From 12c289d473effc957a5a6e8a02e38b7f2abf80f9 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 16 Apr 2024 16:45:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/package/index.ts                  |  6 +++++
 .../itemManage/itemarea/index.vue             |  2 ++
 .../itemManage/itemarea/itemarea.data.ts      | 26 +++++++++++++++++--
 .../supplierdeliverRequestMain.data.ts        | 11 ++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index d43f45766..b526fea04 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -94,3 +94,9 @@ export const importTemplate = () => {
 export const createPackageLabel = async (data: PackageVO) => {
   return await request.post({ url: `/wms/package/createLabel`, data })
 }
+
+
+// 创建标签
+export const createBatchPrintingLable = async (data: PackageVO) => {
+  return await request.post({ url: `/wms/package/batchPrintingLable`, data })
+}
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 0bbece782..ad1800088 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -141,6 +141,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         setV['outPackUnit'] = val[0]['packUnit']
       }else  if(formField == 'itemCode') {
         setV['itemCode'] = val[0]['code']
+      }else  if(formField == 'overflowLocationCode') {
+        setV['overflowLocationCode'] = val[0]['code']
       }else{ 
         setV[formField] = setV[0][searchField]
       }
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 7c4b61e89..d20f50532 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -83,6 +83,30 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '溢出库位',
+    field: 'overflowLocationCode',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择溢出库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+        }]
+      }
+    }
+  },
   {
     label: '入库包装规格',
     field: 'inPackUnit',
@@ -279,7 +303,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
-    isTable:false
   },
   {
     label: '出库自动转为出库包装规格',
@@ -300,7 +323,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
-    isTable:false
   },
   {
     label: '需要接收确认',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 5f193a0d1..c4b0bd08d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -648,6 +648,17 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: false
     }
   },
+  {
+    label: '供应商批次',
+    field: 'supplierBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false
+    }
+  },
   {
     label: '生产日期',
     field: 'produceDate',