From a75c79f273349fcb30a5a7a1ba0d9fe19981710d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 29 Aug 2024 15:50:06 +0800
Subject: [PATCH 01/13] =?UTF-8?q?HL-5710WMS=E5=BA=93=E5=AD=98=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=20?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=94=A8=E7=9A=84=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRecordRequestMain.data.ts             | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
index ab33c30ed..e1ef00e2e 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
@@ -61,11 +61,6 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'isIn',
         value: 'out',
         isMainValue: false
-      },
-      {
-        key:'available', // 查询列表中字段
-        value:'TRUE', // 指查询具体值
-        isMainValue: false // 表示查询条件不是主表的字段的值
       }],
       isRepeat:true,
       verificationParams: [{
@@ -96,11 +91,6 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
             key: 'isIn',
             value: 'out',
             isMainValue: false
-          },
-          {
-            key:'available', // 查询列表中字段
-            value:'TRUE', // 指查询具体值
-            isMainValue: false // 表示查询条件不是主表的字段的值
           }],
         verificationParams: [{
           key: 'code',

From dc66d8f00bc9be9327a4af7666585ef59d1273e7 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 29 Aug 2024 15:57:39 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5588?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E5=90=8E=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain/index.vue         | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index abc99b0a1..9048ed113 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -371,6 +371,20 @@ const isASNShowMainButton = (row,val) => {
   }
 }
 
+
+// 根据状态返回该按钮是否显示
+const isASNShowMainButtonCreateLabel = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt' && row.asnOutLabel == '2'){
+      return true;
+    }else{
+      return false;
+    }
+  } else {
+    return true;
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -386,7 +400,7 @@ const butttondata = (row,$index) => {
     {
       label: '生成标签',
       name: 'ssbq',
-      hide: isASNShowMainButton(row, ['3']),
+      hide: isASNShowMainButtonCreateLabel(row, ['3']),
       type: 'primary',
       icon: '',
       color: '',

From 23f26df0ab024fd0635d64dbbe23a0114a79e2a3 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 29 Aug 2024 16:47:51 +0800
Subject: [PATCH 03/13] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5694=20=20WMS-PDA?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=90=8E=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshJobMain/repleinshJobMain.data.ts | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 6051b154e..c7b5ae643 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -763,6 +763,26 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '从库区',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isTable: true
+  },
+  {
+    label: '到库区',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isTable: true
+  },
   {
     label: '物料代码',
     field: 'itemCode',

From 779a6adda0d2c9899c31156810e82b53a6a7725c Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 29 Aug 2024 17:15:37 +0800
Subject: [PATCH 04/13] =?UTF-8?q?HL-5588=E5=88=9B=E5=BB=BA=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=94=9F=E6=88=90=E5=AE=8C=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceipt/purchasereceiptRequestMain/index.vue         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 9048ed113..ff6e0b1cf 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -501,6 +501,7 @@ const submitFormLabel = async (formType, submitData) => {
   } finally {
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
+    buttonBaseClick('refresh',null);
   }
 }
 

From 823ab80e0d8724184cfff52b3d6647c50a820181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 29 Aug 2024 18:47:08 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=B8=BA=E9=A1=B9=E7=9B=AE=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=BF=85=E5=A1=AB=EF=BC=88=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=80=BC=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=BA?=
 =?UTF-8?q?=E5=90=A6=EF=BC=89/=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=88=E5=AD=97=E7=AC=A6=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E5=A1=AB=EF=BC=89=EF=BC=8C=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=8F=96=E7=8E=B0=E6=9C=89=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=90=9C=E7=B4=A2=E5=B8=AE=E5=8A=A9=20=20HL-?=
 =?UTF-8?q?5743?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/subjectAccount/subjectAccount.data.ts                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
index 125def636..7c10eabf2 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
@@ -17,6 +17,7 @@ export const SubjectAccountRules = reactive({
   projectId: [required],
   projectCode: [required],
   available: [required],
+  isProject: [required],
   isFromPlMstr: [required]
 })
 

From e52662e20d2f288ad1e13b1536eec475649f2c1b Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 29 Aug 2024 19:38:29 +0800
Subject: [PATCH 06/13] =?UTF-8?q?1=E3=80=81HL-3515?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/LoginForm.vue  | 2 +-
 src/views/login/updatePasswordNewTips.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 3af1028c8..9dde5c918 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -279,7 +279,7 @@
     }catch (e) {
       if(e.code === 1002000010){
         setTimeout(function (){
-          window.location.href = "/updatePasswordNewTips?username="+loginData.loginForm.username
+          router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}})
         },3000)
       }
     } finally {
diff --git a/src/views/login/updatePasswordNewTips.vue b/src/views/login/updatePasswordNewTips.vue
index cf6709065..06a74b6b6 100644
--- a/src/views/login/updatePasswordNewTips.vue
+++ b/src/views/login/updatePasswordNewTips.vue
@@ -31,6 +31,7 @@
 </template>
 <script lang="ts" setup name="bb">
   import type { RouteLocationNormalizedLoaded } from 'vue-router'
+  import router from "@/router";
   import { useIcon } from '@/hooks/web/useIcon'
   import { setTenantId, setToken } from '@/utils/auth'
   import { usePermissionStore } from '@/store/modules/permission'

From 2ac38804fd2b0a7c0840ef4c722b4bfc446ccb31 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 30 Aug 2024 08:18:22 +0800
Subject: [PATCH 07/13] =?UTF-8?q?HL-525313=E7=8E=AF=E5=A2=83=E9=A2=84?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=88=9B=E5=BB=BA=E4=BA=86=E6=A0=87=E7=AD=BE=E5=92=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceipt/productreceiptRequestMain/index.vue           | 1 +
 .../productreceiptAssembleRequestMain/index.vue                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 518185c62..92efd109a 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -591,6 +591,7 @@ const buttonTableClick = async (val, row) => {
         buttonBaseClick('refresh', null)
       })
       .catch((err) => {
+        tableObject.loading = false
         console.log(err)
       })
   } else if (val == 'edit') {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 8f14cd9e8..68213f1a7 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -511,6 +511,7 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       buttonBaseClick('refresh',null)
     }).catch(err => {
+      tableObject.loading = false
       console.log(err)
     })
   } else if (val == 'edit') { // 编辑

From 319184dddd125d6e185f1ef88655a294c2b729ca Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 30 Aug 2024 09:15:16 +0800
Subject: [PATCH 08/13] =?UTF-8?q?HL-5499:=E5=9B=9E=E8=BD=AC=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E5=B9=B4=E6=9C=88=E6=97=A5=E6=97=B6?=
 =?UTF-8?q?=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts                         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 3363adf80..252a8ae0a 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -1766,7 +1766,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
     },
   },
   {
-    label: '回转日期',
+    label: '回转日期11',
     field: 'reversepostingdate',
     formatter: dateFormatter,
     detail: {
@@ -1782,7 +1782,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
       componentProps: {
         style: {width:'100%'},
         type: 'date',
-        dateFormat: 'YYYY-MM-DD',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     },

From 9732096388f5bb3324b2d11e4a4cb63acae37c9e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 30 Aug 2024 09:33:40 +0800
Subject: [PATCH 09/13] =?UTF-8?q?HL-5752=E7=89=A9=E6=96=99=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E6=96=B0=E5=A2=9E=E6=98=8E=E7=BB=86=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=20=E6=8A=8A=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=8E=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=B8=AD=E6=94=BE=E5=88=B0=E4=B8=8A=E6=96=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=EF=BC=8C=E8=B5=8B=E4=B8=8E=E6=98=8E=E7=BB=86=E4=B8=AD?=
 =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D=E5=90=8C=E6=A0=B7=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMainOKHOLD/index.vue  | 170 +++---------------
 .../inventorymoveRequestMain.data.ts          |  48 ++++-
 2 files changed, 70 insertions(+), 148 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index 045d10869..c5196cd9d 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -94,7 +94,8 @@ import { formatDate } from '@/utils/formatTime'
 import dayjs from 'dayjs'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
-// 库存转移申请
+// 物料隔离申请
+// 只有物料隔离申请在使用的
 defineOptions({ name: 'InventorymoveRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -115,81 +116,15 @@ const { tableObject, tableMethods } = useTable({
   getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口
 })
 
-// 判断 路由名称 进行条件过滤
-/**
- * OktoholdRequestMain 合格转隔离
- */
-if ( routeName.value == 'OktoholdRequestMain') {
-  tableObject.params = {
-    // fromInventoryStatus: 'OK',
-    // toInventoryStatus:'HOLD',
-    businessType :'OkToHold'
-  }
-  // fromInventoryStatus.value = 'OK'
-  // toInventoryStatus.value = "HOLD"
-  businessType.value = 'OkToHold'
-  importFileName.value = '物料转隔离申请'
-}
-else if ( routeName.value == 'NoktoholdRequestMain') {
-  tableObject.params = {
-    // fromInventoryStatus: 'NOK',
-    // toInventoryStatus:'HOLD',
-    businessType :'NokToHold'
-  }
-  // fromInventoryStatus.value = 'NOK'
-  // toInventoryStatus.value = "HOLD"
-  businessType.value = 'NokToHold'
-  importFileName.value = '不合格转隔离申请'
-}
-else if ( routeName.value == 'HoldtookRequestMain') {
-  tableObject.params = {
-    // fromInventoryStatus: 'HOLD',
-    // toInventoryStatus:'OK',
-    businessType :'HoldToOk'
-  }
-  // fromInventoryStatus.value = 'HOLD'
-  // toInventoryStatus.value = "OK"
-  businessType.value = 'HoldToOk'
-  importFileName.value = '隔离转合格申请'
-} else if ( routeName.value == 'HoldtoscrapRequestMain') {
-  tableObject.params = {
-    // fromInventoryStatus: 'HOLD',
-    // toInventoryStatus:'SCRAP',
-    businessType:'HoldToScrap'
-  }
-  // fromInventoryStatus.value = 'HOLD'
-  // toInventoryStatus.value = "SCRAP"
-  businessType.value = 'HoldToScrap'
-  importFileName.value = '隔离转报废申请'
-} else if ( routeName.value == 'OktoscrapRequestMain') {
-  tableObject.params = {
-    // fromInventoryStatus: 'OK',
-    // toInventoryStatus:'SCRAP',
-    businessType :'OkToScrap'
-  }
-  // fromInventoryStatus.value = 'OK'
-  // toInventoryStatus.value = "SCRAP"
-  businessType.value = 'OkToScrap'
-  importFileName.value = '合格转报废申请'
+tableObject.params = {
+  // fromInventoryStatus: 'OK',
+  // toInventoryStatus:'HOLD',
+  businessType :'OkToHold'
 }
-else if ( routeName.value == 'ScraptoholdRequestMain') {
-  tableObject.params = {
-    // fromInventoryStatus: 'SCRAP',
-    // toInventoryStatus:'HOLD',
-    businessType :'ScrapToHold'
-  }
-  // fromInventoryStatus.value = 'SCRAP'
-  // toInventoryStatus.value = "HOLD"
-  businessType.value = 'ScrapToHold'
-  importFileName.value = '报废转隔离申请'
-} else {
-  tableObject.params = {
-    businessType :'Move'
-  }
-  businessType.value = 'Move'
-  importFileName.value = '库存移动申请'
-}
-console.log(99 ,  businessType.value)
+// fromInventoryStatus.value = 'OK'
+// toInventoryStatus.value = "HOLD"
+businessType.value = 'OkToHold'
+importFileName.value = '物料转隔离申请'
 
 InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
   if(item.field == 'fromWarehouseCode') {
@@ -349,27 +284,20 @@ const updataTableColumns = (val) => {
 // 物料隔离-获取到库位默认值
 const getDefaultToLocationCode = async ()=>{
   let searchCondition = []
-  InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
+  InventorymoveRequestMain.allSchemas.formSchema.map(item => {
     if(item.field == "toLocationCode"){
-      searchCondition = item.tableForm.searchCondition
+      searchCondition = item.componentProps.searchCondition
     }
   })
   let params = {}
   searchCondition.forEach(item=>{
-    if(item['isMainValue']){
-      params[item['key']] = formRef.value.formRef.formModel[item['value']]
-    }else{
-      params[item['key']] = item['value']
-    }
+    params[item['key']] = item['value']
   })
+  console.log('params',params)
   let res = await LocationApi.selectBusinessTypeToLocation(params)
-  console.log('res',res)
+  console.log('获取到库位默认值',res)
  if(res&&res.list.length>0){
-  tableData.value.forEach(item=>{
-    if(!item['toLocationCode']){
-      item['toLocationCode'] = res.list[0]['code']
-    }
-  })
+  formRef.value.formRef.formModel["toLocationCode"] = res.list[0]['code']
  }
 }
 // 查询页面返回
@@ -389,26 +317,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromLocationCode'] = item['locationCode']
           newRow['uom'] = item['uom']
           newRow['qty'] = item['qty']
-          if(routeName.value == 'OktoholdRequestMain'){
-            newRow['toInventoryStatus'] = "HOLD"
-          }else if(routeName.value == 'NoktoholdRequestMain'){
-            newRow['toInventoryStatus'] = "HOLD"
-          }else if ( routeName.value == 'HoldtookRequestMain') {
-            newRow['toInventoryStatus'] = "OK"
-          }else if ( routeName.value == 'HoldtoscrapRequestMain') {
-            newRow['toInventoryStatus'] = "SCRAP"
-          }else if ( routeName.value == 'OktoscrapRequestMain') {
-            newRow['toInventoryStatus'] = "SCRAP"
-          }else if ( routeName.value == 'ScraptoholdRequestMain') {
-            newRow['toInventoryStatus'] = "HOLD"
-          }else{
-            newRow['toInventoryStatus'] = item['inventoryStatus']
-          }
+          newRow['toInventoryStatus'] = "HOLD" // 物料隔离申请
           tableData.value.push(newRow)
         })
-        if(routeName.value == 'OktoholdRequestMain'){
-          getDefaultToLocationCode()
-        }
       } else {
         row[formField] = val[0][searchField]
       }
@@ -446,21 +357,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['fromInventoryStatus'] = val[0]['inventoryStatus']
       setV['fromLocationCode'] = val[0]['locationCode']
       setV['uom'] = val[0]['uom']
-      if(routeName.value == 'OktoholdRequestMain'){
-        setV['toInventoryStatus'] = "HOLD"
-      }else  if(routeName.value == 'NoktoholdRequestMain'){
-        setV['toInventoryStatus'] = "HOLD"
-      }else if ( routeName.value == 'HoldtookRequestMain') {
-        setV['toInventoryStatus'] = "OK"
-      }else if ( routeName.value == 'HoldtoscrapRequestMain') {
-        setV['toInventoryStatus'] = "SCRAP"
-        }else if ( routeName.value == 'OktoscrapRequestMain') {
-        setV['toInventoryStatus'] = "SCRAP"
-      }else if ( routeName.value == 'ScraptoholdRequestMain') {
-        setV['toInventoryStatus'] = "HOLD"
-      }else{
-        setV['toInventoryStatus'] = val[0]['inventoryStatus']
-      }
+      setV['toInventoryStatus'] = "HOLD"
+      
     } else {
       setV[formField] = val[0][searchField]
     }
@@ -638,6 +536,8 @@ const openForm =async (type: string, row?: number) => {
   }
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
+  getDefaultToLocationCode()
+
 }
 
 /**
@@ -695,27 +595,9 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    if(routeName.value == 'OktoholdRequestMain'){
-      const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }else if ( routeName.value == 'HoldtookRequestMain') {
-          const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params)
-          download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
-          const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params)
-          download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }else if ( routeName.value == 'OktoscrapRequestMain') {
-          const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params)
-         download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }
-        // else if ( routeName.value == 'ScraptoholdRequestMain') {
-        //   const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params)
-        //   download.excel(data, '报废转隔离申请主.xlsx')
-        // }
-        else{
-          const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params)
-          download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }
+    const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+        
   } catch {
   } finally {
     loadDone()
@@ -754,7 +636,8 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  let findLocation = tableData.value.find(item=>item.fromLocationCode&&item.toLocationCode&&item.fromLocationCode==item.toLocationCode)
+  let toLocationCode = data['toLocationCode'] // 到库位
+  let findLocation = tableData.value.find(item=>item.fromLocationCode&&toLocationCode&&item.fromLocationCode==toLocationCode)
   if(findLocation){
     message.warning('从库位和到库位不能相同')
     return
@@ -762,6 +645,7 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
+    item['toLocationCode'] = toLocationCode
     let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
     console.log(rs,5666);
    if(rs.length > 1) isExist = true
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
index ba810d477..56874d08b 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@@ -152,6 +152,44 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '到库位代码', // 子表数据--新增在form上展示
+    field: 'toLocationCode',
+    sort: 'custom',
+    isForm:true,
+    isTable:false,
+    isDetail:false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'businessType',
+            value: 'OkToHold',
+            isMainValue: false
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
   {
     label: '截止时间',
     field: 'dueTime',
@@ -464,6 +502,9 @@ export const InventorymoveRequestMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'blur' }
   ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
   status: [
     { required: true, message: '请选择状态', trigger: 'change' }
   ],
@@ -703,7 +744,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTableForm:true,
+    isTableForm:false, //放在主表展示了--喜婷
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
@@ -751,7 +792,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
             key: 'isIn',
             value: 'in',
             isMainValue: false
-          }],
+            }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -940,9 +981,6 @@ export const InventorymoveRequestDetailRules = reactive({
   fromInventoryStatus: [
     { required: true, message: '请选择从库存状态', trigger: 'change' }
   ],
-  toLocationCode: [
-    { required: true, message: '请选择到库位代码', trigger: 'change' }
-  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],

From c77f769090ec9320375f47531310824c02ca34de Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 30 Aug 2024 13:14:02 +0800
Subject: [PATCH 10/13] =?UTF-8?q?HL-5257:=E8=AE=A1=E5=88=92=E5=A4=96?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=8C=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=EF=BC=8C=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=99=E5=9B=9B=E4=B8=AA=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=92=A4=E9=94=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrapRecordMain/scrapRecordMain.data.ts   | 53 +++++++++++++------
 .../unplannedissueRecordMain.data.ts          | 19 +++++++
 .../unplannedreceiptRecordMain.data.ts        | 20 +++++++
 .../productscrapRecordMain.data.ts            | 19 +++++++
 4 files changed, 95 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 487282f3a..2ddf27dce 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -380,6 +380,25 @@ export const ScrapRecordMain = useCrudSchemas(
         width: 150
       }
     },
+    {
+      label: '是否已撤销',
+      field: 'revokeFlag',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      table: {
+        width: 150
+      },
+      detail:{
+        // dictType:'primary',
+        // valueFilter:(value)=>{
+        //   if(value=='TRUE'){
+        //     return `是`
+        //   }else{
+        //     return '否'
+        //   }
+        // }
+      }
+    },
     {
       label: '创建时间',
       field: 'createTime',
@@ -462,22 +481,6 @@ export const ScrapRecordMain = useCrudSchemas(
     //     width: 150
     //   },
     // },
-    {
-      label: '是否可用',
-      field: 'available',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string',
-      isSearch: false,
-      isTable: true,
-      form: {
-        component: 'Switch',
-        value: 'TRUE',
-        componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE'
-        }
-      }
-    },
     {
       label: '操作',
       field: 'action',
@@ -732,6 +735,24 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '是否已撤销',
+    field: 'revokeFlag',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    detail:{
+      dictType:'primary',
+      valueFilter:(value)=>{
+        if(value=='TRUE'){
+          return `是`
+        }else{
+          return '否'
+        }
+      }
+    }
+  },
   {
     label: '接口类型',
     field: 'interfaceType',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index 559cf7f47..d1100c8fa 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -382,6 +382,25 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
+  {
+    label: '是否已撤销',
+    field: 'revokeFlag',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    table: {
+      width: 150
+    },
+    detail:{
+      // dictType:'primary',
+      // valueFilter:(value)=>{
+      //   if(value=='TRUE'){
+      //     return `是`
+      //   }else{
+      //     return '否'
+      //   }
+      // }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index 8d03144d5..ab00714be 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -366,6 +366,25 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     }
   },
+  {
+    label: '是否已撤销',
+    field: 'revokeFlag',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    table: {
+      width: 150
+    },
+    detail:{
+      // dictType:'primary',
+      // valueFilter:(value)=>{
+      //   if(value=='TRUE'){
+      //     return `是`
+      //   }else{
+      //     return '否'
+      //   }
+      // }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -820,6 +839,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
   },
+ 
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 23dd4094f..c195119cc 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -279,6 +279,25 @@ export const ProductscrapRecordMain = useCrudSchemas(
       },
       isTable: false
     },
+    {
+      label: '是否已撤销',
+      field: 'revokeFlag',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      table: {
+        width: 150
+      },
+      detail:{
+        // dictType:'primary',
+        // valueFilter:(value)=>{
+        //   if(value=='TRUE'){
+        //     return `是`
+        //   }else{
+        //     return '否'
+        //   }
+        // }
+      }
+    },
     {
       label: '创建者',
       field: 'creator',

From c15c684f513e45fa7bb91d142d2afcdaa5a9d280 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 30 Aug 2024 14:44:36 +0800
Subject: [PATCH 11/13] =?UTF-8?q?HL-5257=EF=BC=9A=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8E=BB=E6=8E=89=E5=AD=90=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=98=AF=E5=90=A6=E5=B7=B2=E6=92=A4=E9=94=80?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrapRecordMain/scrapRecordMain.data.ts    | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 2ddf27dce..1411a2dcf 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -735,24 +735,6 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '是否已撤销',
-    field: 'revokeFlag',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    detail:{
-      dictType:'primary',
-      valueFilter:(value)=>{
-        if(value=='TRUE'){
-          return `是`
-        }else{
-          return '否'
-        }
-      }
-    }
-  },
   {
     label: '接口类型',
     field: 'interfaceType',

From 482483e747d05f14665398b11cee9af6a74bced5 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 30 Aug 2024 14:53:45 +0800
Subject: [PATCH 12/13] =?UTF-8?q?HL-5780=E5=8F=96=E6=B6=88=E5=9C=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=AD=E8=A6=81=E6=89=93=E5=8D=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=9A=84=E9=99=90=E5=88=B6=E4=B8=BA9999=EF=BC=8C?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E6=94=B9=E4=B8=BA999999?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain.data.ts                     | 4 ++--
 .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 4 ++--
 .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts   | 8 ++++----
 .../stockup/stockupMainRequest/stockupMainRequest.data.ts | 2 +-
 .../productionplan/productionMain/productionMain.data.ts  | 4 ++--
 .../productionMainAssemble/productionMainAssemble.data.ts | 4 ++--
 .../productionMainAssembleSparePart.data.ts               | 4 ++--
 .../productionMainPredictSparePart.data.ts                | 4 ++--
 .../productreceiptscrapRequestMain.data.ts                | 4 ++--
 .../productscrapRequestMain.data.ts                       | 4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index d255a9fa8..8ab2566c3 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -952,14 +952,14 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     }
   },
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 2cdfb6bb1..11eb1d0c1 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -867,14 +867,14 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     }
   },
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 8c8b5c11c..fed0ab264 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -658,14 +658,14 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     }
   },
@@ -968,14 +968,14 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     }
   },
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 515fe5a9d..e1506338b 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -742,7 +742,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 76e26ea30..d860cf298 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -840,14 +840,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 7b43f9b8d..a920bd933 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -839,14 +839,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index de69f82d7..e1df5f1ea 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -804,14 +804,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 11019d913..df30224c1 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -792,14 +792,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 951cf42af..eebc5c8e0 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -1172,14 +1172,14 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       },
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     }
   },
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 839122910..498015838 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -943,7 +943,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max:999999,
         // precision: 6
       },
     },
@@ -951,7 +951,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'InputNumber',
       default:1,
       min: 0,
-      max:9999,
+      max:999999,
       // precision: 6
     }
   },

From 00c035790294b5706a14e8b0d6c3e6310c989ea2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 30 Aug 2024 15:16:29 +0800
Subject: [PATCH 13/13] =?UTF-8?q?HL-5780=E5=8F=96=E6=B6=88=E5=9C=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=AD=E8=A6=81=E6=89=93=E5=8D=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=9A=84=E9=99=90=E5=88=B6=E4=B8=BA9999=EF=BC=8C?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E6=94=B9=E4=B8=BA999999?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts   | 8 ++++----
 .../productionplan/productionMain/productionMain.data.ts  | 4 ++--
 .../productionMainAssemble/productionMainAssemble.data.ts | 4 ++--
 .../productionMainAssembleSparePart.data.ts               | 4 ++--
 .../productionMainPredictSparePart.data.ts                | 4 ++--
 .../productreceiptscrapRequestMain.data.ts                | 4 ++--
 .../productscrapRequestMain.data.ts                       | 4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index fed0ab264..8c8b5c11c 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -658,14 +658,14 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:999999,
+        max:9999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:999999,
+      max:9999,
       // precision: 6
     }
   },
@@ -968,14 +968,14 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:999999,
+        max:9999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:999999,
+      max:9999,
       // precision: 6
     }
   },
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index d860cf298..76e26ea30 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -840,14 +840,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:999999,
+        max:9999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:999999,
+      max:9999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index a920bd933..7b43f9b8d 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -839,14 +839,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:999999,
+        max:9999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:999999,
+      max:9999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index e1df5f1ea..de69f82d7 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -804,14 +804,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:999999,
+        max:9999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:999999,
+      max:9999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index df30224c1..11019d913 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -792,14 +792,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:999999,
+        max:9999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:999999,
+      max:9999,
       // precision: 6
     },
   },
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index eebc5c8e0..951cf42af 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -1172,14 +1172,14 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:999999,
+        max:9999,
         // precision: 6
       },
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:999999,
+      max:9999,
       // precision: 6
     }
   },
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 498015838..839122910 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -943,7 +943,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:999999,
+        max:9999,
         // precision: 6
       },
     },
@@ -951,7 +951,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'InputNumber',
       default:1,
       min: 0,
-      max:999999,
+      max:9999,
       // precision: 6
     }
   },