包装信息取消父子关联、从库位代码与到库位代码不能相同、隔离退料申请显示“创建标签'”“打印标签”

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"

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: '创建标签',
+        label: '创建标签',
-      //   name: 'cjbq',
+        name: 'cjbq',
-      //   hide: isShowMainButton(row,['3']),
+        hide: isShowMainButton(row,['3']),
-      //   type: 'primary',
+        type: 'primary',
-      //   icon: '',
+        icon: '',
-      //   color: '',
+        color: '',
-      //   hasPermi: '',
+        hasPermi: '',
-      //   link: true, // 文本展现按钮
+        link: true, // 文本展现按钮
-      // },
+      },
-      // defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
     ]
 }
 

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;
     }