From 8b10c101a4ad13f6c7e9eef55140c26fef11b8ef Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 12 Aug 2024 15:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=88=B6=E5=AD=90=E5=85=B3=E8=81=94=E3=80=81=E4=BB=8E?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81=E4=B8=8E=E5=88=B0=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E4=BB=A3=E7=A0=81=E4=B8=8D=E8=83=BD=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E3=80=81=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?'=E2=80=9D=E2=80=9C=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/inventoryManage/package/index.vue     |  2 ++
 .../productionreturnRequestMainNo/index.vue   | 22 +++++++++----------
 .../inventorymoveRecordMainNew/index.vue      |  6 ++++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index 4c4063eb9..58aa92a26 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -39,9 +39,11 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
+  <!-- isCheckStrictly：true 取消父子关联 -->
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
+    :isCheckStrictly="true" 
     :rules="PackageRules"
     :formAllSchemas="Package.allSchemas"
     :searchTableParams="searchTableParams"
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index d8c3b0c40..257dccab8 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -322,17 +322,17 @@ const butttondata = (row,$index) => {
       defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:update'}), // 编辑
       // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除
       // 创建标签
-      // {
-      //   label: '创建标签',
-      //   name: 'cjbq',
-      //   hide: isShowMainButton(row,['3']),
-      //   type: 'primary',
-      //   icon: '',
-      //   color: '',
-      //   hasPermi: '',
-      //   link: true, // 文本展现按钮
-      // },
-      // defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
     ]
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index 8ac3f7a95..b95074348 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -328,6 +328,10 @@ const flag = ref()
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
   let data = {...submitData}
+  if(data.fromWarehouseCode&&data.fromWarehouseCode == data.toWarehouseCode){
+    message.error(`从库位代码和到库位代码不能相同!`)
+    return
+  }
   if(data.masterId){
     data.id = data.masterId
   }
@@ -339,7 +343,7 @@ const submitForm = async (formType, submitData) => {
     item.toInventoryStatus = data.toInventoryStatus
     
     if(item.qty == 0){
-      message.error(`到数量不能为0!`)
+      message.error(`数量不能为0!`)
       flag.value = true
       return;
     }