From e3d71cf5a4200b0daccd1232e965dc443cfa0bec Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 30 Nov 2024 09:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB=E6=8C=89?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymove/inventorymoveRequestMainMOVE/index.vue | 7 ++++---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
index 0309cf776..66c9118a3 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@@ -339,6 +339,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 		      locationCode: val[0][searchField]
         }).then((res) => {
           toManagementPrecision.value = res[0].ManagementPrecision
+          row.toManagementPrecision = toManagementPrecision.value
         })
         if (toManagementPrecision.value == 'BY_BATCH') {
           if(row['fromBatch']==''){
@@ -704,10 +705,10 @@ const submitForm = async (formType, submitData) => {
     message.warning('从库位和到库位不能相同')
     return
   }
-  let batchList = tableData.value.filter(item=>item.toBatchFormItemType&&item.toBatchFormItemType == 'FormDate')
-  let noBatch = batchList.some(item => !item.toBatch)
+  let batchList = tableData.value.filter(item=>item.fromBatchFormItemType&&item.fromBatchFormItemType == 'FormDate' && item.toManagementPrecision == 'BY_BATCH')
+  let noBatch = batchList.find(item => !item.fromBatch)
   if(noBatch){
-    message.warning('请选择到批次')
+    message.warning(`${noBatch.itemCode}没有填写批次，请填写`)
     return
   }
   data.subList = tableData.value // 拼接子表数据参数
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 963d0b55f..968e7311b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -1079,15 +1079,15 @@ const genRecords = async (id: number) => {
   })
   // 发起处理
   SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
-    .then((res) => {
+    .then(async (res) => {
       console.log('res',res)
       message.success(t('ts.处理成功!'))
       // 刷新列表
-      getList()
+     await getList()
       getLoading?.close()
 
       // 单据打印
-      handleDocumentPrint(res,id)
+      await handleDocumentPrint(res,id)
     })
     .catch((err) => {
       getLoading?.close()
@@ -1243,7 +1243,8 @@ const print = async () => {
 const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
 // 物料状态是号试显示生准订单的发货单模版
 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
-const handleDocumentPrint = async (id,stausId) => {
+const handleDocumentPrint = async (id, stausId) => {
+  debugger
   await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => {
     if (res) {
       //号试（生准订单）模板