From d36987c8233f1e4170534f0c9ab9a123f334ee6f Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 7 Jun 2024 16:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  3 ++-
 .../inventoryinitRecordMain/index.vue         |  2 +-
 .../inventoryinitRequestMain/index.vue        | 23 ++++++++++++++++++-
 .../inventoryinitRequestMain.data.ts          | 17 ++++++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 226390604..dd9d89dee 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -364,5 +364,6 @@ export enum DICT_TYPE {
   EAM_MAINTENANCE_LEVEL = 'eam_maintenance_level', // 维保维修级别
   EAM_REPAIR_STATUS = 'eam_repair_status', // 维修状态
   OFF_BACK_STATUS = 'off_back_status',
-  SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum'// 流程状态
+  SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum',// 流程状态
+  IS_LINE_ITEM = 'is_line_item', // 是否是线边
 }
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
index b3f3f93b1..e00ac3d7d 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
@@ -222,7 +222,7 @@ const handleSelectionPoint = async ()=>{
       window.open(src.value+'&asn_number='+res.cgLabel)
     }
     if(!res.cgLabel&&!res.zzLabel){
-      message.error('包装不存在，无法打印')
+      message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!')
     }
   }).catch(err => {
     console.log(err)
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 3d4e61e40..ec7d59008 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -77,6 +77,9 @@
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/inventoryinit-request-main/import" :importTemplateData="importTemplateData" 
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
+  <ImportForm ref="importFormRefLine" url="/wms/inventoryinit-request-main/importLine" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
 <script setup lang="ts">
@@ -151,6 +154,15 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:inventoryinit-request-main:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:inventoryinit-request-main:import'}), // 导入
+  {
+    label: '线边导入',
+    name: 'importLine',
+    hide: false,
+    type: 'warning',
+    icon: 'ep:upload',
+    color: '',
+    hasPermi: ''
+  },
   defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -171,7 +183,9 @@ const buttonBaseClick = (val, item) => {
     openForm('create')
   } else if (val == 'import') { // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if(val == 'importLine'){
+    handleImportLine()
+  }else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -403,6 +417,13 @@ const handleImport = () => {
   importFormRef.value.open()
 }
 
+
+/** 线边导入 */
+const importFormRefLine = ref()
+const handleImportLine = () => {
+  importFormRefLine.value.open()
+}
+
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index dd1a97c83..840cb9fb8 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -941,6 +941,22 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         }]
     }
   },
+  {
+    label: '是否线边',
+    field: 'dataTypeLine',
+    dictType: DICT_TYPE.IS_LINE_ITEM,
+    dictClass: 'string',
+    isSearch: false,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -1069,4 +1085,5 @@ export const InventoryinitRequestDetailRules = reactive({
   balancePackUnit:[
     { required: true, message: '请选择入库存包装规格', trigger: 'change' }
   ],
+  dataTypeLine:[{ required: true, message: '请选择是否是线边需要生成包装', trigger: 'change' }]
 })