From f71b0f379907c2cdc47568fc1d38eeb97cecaa28 Mon Sep 17 00:00:00 2001
From: tengxiaofei <302828528@qq.com>
Date: Mon, 2 Sep 2024 19:32:12 +0800
Subject: [PATCH 01/18] =?UTF-8?q?HL-5424=EF=BC=9A=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BA=BA=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreceiptRequestMain.data.ts        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index c1d9a38db..7c8e0d094 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -366,9 +366,9 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isTable: true,
+    isTable: false,
     isForm: false,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -393,7 +393,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isTable: true,
+    isTable: false,
     isForm: false
   },
   {
@@ -691,7 +691,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -700,6 +700,15 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      },
+    },
     isTableForm: false,
     isForm: false
   },
@@ -710,7 +719,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
     isTableForm: false,
     isForm: false
   },

From 7dd0b69cda9411d5e8a14f8fd069636d0e521087 Mon Sep 17 00:00:00 2001
From: tengxiaofei <302828528@qq.com>
Date: Mon, 2 Sep 2024 19:32:53 +0800
Subject: [PATCH 02/18] =?UTF-8?q?HL-5424=EF=BC=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containermanage/containerMainRequest/index.vue    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index dee78a7a2..0e52f7c66 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="searchList" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -106,6 +106,7 @@ const toLocationCode = ref()
 const importFileName = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
+const searchType = ref()
 routeName.value = route.name
 const tableColumns = ref(ContainerMainRequest.allSchemas.tableColumns)
 console.log(99 ,  routeName.value)
@@ -120,6 +121,7 @@ const { tableObject, tableMethods } = useTable({
   tableObject.params = {
     type:'RETURN'
   }
+   searchType.value = 'RETURN'
   ContainerMainRequest.allSchemas.formSchema.forEach(item=>{
     if(item.field == 'type'){
         item.value = "RETURN"
@@ -130,6 +132,7 @@ const { tableObject, tableMethods } = useTable({
   tableObject.params = {
     type:'MOVE'
   }
+   searchType.value = 'MOVE'
   ContainerMainRequest.allSchemas.formSchema.forEach(item=>{
     if(item.field == 'type'){
         item.value = "MOVE"
@@ -140,6 +143,7 @@ const { tableObject, tableMethods } = useTable({
   tableObject.params = {
     type: 'DELIVER',
   }
+   searchType.value = 'DELIVER'
   //主表字段赋值
   ContainerMainRequest.allSchemas.formSchema.forEach(item=>{
     if(item.field == 'type'){
@@ -273,6 +277,11 @@ ContainerDetailRequest.allSchemas.tableFormColumns.map(item => {
   }
 })
 
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val

From 61ad99b101a022af4a004831c16067bc6ae0a994 Mon Sep 17 00:00:00 2001
From: tengxiaofei <302828528@qq.com>
Date: Mon, 2 Sep 2024 19:35:23 +0800
Subject: [PATCH 03/18] =?UTF-8?q?HL-5424=EF=BC=9A=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=9B=E5=BB=BA=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverRequestMain.data.ts                  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 9b36f3867..714ec07e9 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -585,7 +585,7 @@ export const DeliverRequestMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: true,
+      isTable: false,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -596,7 +596,7 @@ export const DeliverRequestMain = useCrudSchemas(
         }
       },
       isForm: false,
-      isSearch: true,
+      isSearch: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -1050,7 +1050,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -1060,6 +1060,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      },
+    },
     isTableForm: false,
     isForm: false
   },
@@ -1070,7 +1079,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
     isTableForm: false,
     isForm: false
   },

From 4cb4d2bbae45330a0e22ac0ac9d410bc453013bf Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Mon, 2 Sep 2024 19:56:41 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E6=8A=B1=E6=80=A8=E5=8D=95=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=9C=A8=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=B8=AD=E6=89=93=E5=8D=B0=20=20HL-5794?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRecordMain/index.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 646d22353..b32e4d42e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -136,14 +136,14 @@ const butttondata = (row,$index) => {
   if(findIndex>-1&&findIndex<$index){
     return []
   }
-  return [defaultButtons.mainListDocumentPrintBtn(null)]
+  // return [defaultButtons.mainListDocumentPrintBtn(null)]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.requestNumber,row.itemCode)
+    // handleDocumentPrint(row.requestNumber,row.itemCode)
   }
 }
 

From bc4e941e60147649ab148f61db21f1d2b815a38b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 08:55:55 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5--=E6=96=B9=E4=BE=BF=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/issueJobMain/issueJobMain.data.ts   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 5df9040e1..16b89d90f 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -683,27 +683,27 @@ export const IssueJobDetail = useCrudSchemas(
       sortTableDefault: 3
     },
     {
-      label: '批次',
-      field: 'batch',
+      label: '数量',
+      field: 'qty',
       sort: 'custom',
       table: {
         width: 150
       },
-      isSearch: true,
-      sortSearchDefault: 3,
-      sortTableDefault: 4
+      sortTableDefault: 4,
+      form: {
+        component: 'InputNumber'
+      },
     },
     {
-      label: '数量',
-      field: 'qty',
+      label: '批次',
+      field: 'batch',
       sort: 'custom',
       table: {
         width: 150
       },
-      form: {
-        component: 'InputNumber'
-      },
-      hiddenInMain: true
+      isSearch: true,
+      sortSearchDefault: 3,
+      sortTableDefault: 4
     },
     {
       label: '计量单位',

From 722e5cda6b6e9c6b488f31a1dd4bee472d187fe2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 09:45:52 +0800
Subject: [PATCH 06/18] =?UTF-8?q?HL-5812=20=E5=85=A8=E5=B1=80=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=88=87=E6=8D=A2=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C=E7=AC=A6=E6=97=B6=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=90=8E=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E5=8E=9F=E7=B1=BB=E5=9E=8B=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E7=9B=B8=E5=90=8C=E6=97=B6=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BE=93=E5=85=A5=E5=AD=97=E6=AE=B5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchHigh/src/SearchHigh.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index 40ad186f9..ce55279e5 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -245,6 +245,7 @@ const moreListPush = () => {
   moreListData.value.filters.push(data)
 }
 
+const lastestType = ref('')
 // 筛选条件改变重置其他项
 const resetSelect = (val) => {
    if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date') {
@@ -254,8 +255,11 @@ const resetSelect = (val) => {
     val.action = 'like'
     val.disabled = false
   }
-  val.value1 = ""
-  val.value = ""
+  if(lastestType.value&&lastestType.value!=getInputType(val.column)){
+    val.value1 = ""
+    val.value = ""
+  }
+  lastestType.value = getInputType(val.column)
 }
 // 范围改变
 const actionSelect = (val)=>{
@@ -264,11 +268,11 @@ const actionSelect = (val)=>{
   }else{
     val.disabled = false
   }
-  val.value1 = undefined
-  nextTick(()=>{
-    val.value1 =[]
-    val.value = ''
-  })
+  // val.value1 = undefined
+  // nextTick(()=>{
+  //   val.value1 =[]
+  //   val.value = ''
+  // })
 
 }
 

From 9df811e620e200b09eb652a30c582b4c3ad1115b Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 3 Sep 2024 11:08:31 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=20=20=20HL-5794?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRequestMain/index.vue        | 4 +---
 .../purchasereturn/purchasereturnRequestMainNew/index.vue     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index e45740eed..58b7ad142 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -563,9 +563,7 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereturn-request-main:update'
     }), // 编辑
-    defaultButtons.mainListDocumentPrintBtn({
-      hide: isShowMainButton(row, ['8']) 
-    })// 打印标签
+    defaultButtons.mainListDocumentPrintBtn(null)// 打印标签
     // {
     //   label: '生成标签',
     //   name: 'ssbq',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 5b99c542c..cde0b5255 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -466,9 +466,7 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereturn-request-main:update'
     }),// 编辑
-    defaultButtons.mainListDocumentPrintBtn({
-      hide: isShowMainButton(row, ['8']) 
-    })// 打印标签
+    defaultButtons.mainListDocumentPrintBtn(null)// 打印标签
     // {
     //   label: '生成标签',
     //   name: 'ssbq',

From 5fd1543c97643e6e23f1f232bf92f63b21f415c1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 3 Sep 2024 11:11:27 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/selectedProject/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/selectedProject/index.vue b/src/views/qms/selectedProject/index.vue
index 4b9b793bd..37d449f26 100644
--- a/src/views/qms/selectedProject/index.vue
+++ b/src/views/qms/selectedProject/index.vue
@@ -203,7 +203,7 @@ const formsSuccess = async (formType, data) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSelectedProject')
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSelectedSet')
 }
 
 /** 删除按钮操作 */

From ab3c39361a913471d252da7b517f633f1e49bc38 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 13:10:23 +0800
Subject: [PATCH 09/18] =?UTF-8?q?HL-5823WMS=E5=8F=91=E6=96=99=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueManage/issue/issueRecordMain/issueRecordMain.data.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index 5069205cc..2e9e0871e 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -365,7 +365,7 @@ export const IssueRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      sortTableDefault: 6
+      sortTableDefault: 9
     },
     {
       label: '批次', //  子表数据 只是为了展示

From e3e15574c0ce62c18f311b69edb6627e96d3bf80 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 3 Sep 2024 13:22:24 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChangeRecord/src/ChangeRecord.vue         | 21 ++++++--
 src/components/Detail/src/Detail.vue          |  2 +-
 src/components/Distinction/index.ts           |  3 ++
 .../Distinction/src/Distinction.vue           | 51 +++++++++++++++++++
 4 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 src/components/Distinction/index.ts
 create mode 100644 src/components/Distinction/src/Distinction.vue

diff --git a/src/components/ChangeRecord/src/ChangeRecord.vue b/src/components/ChangeRecord/src/ChangeRecord.vue
index df1855f7e..59d24cb5d 100644
--- a/src/components/ChangeRecord/src/ChangeRecord.vue
+++ b/src/components/ChangeRecord/src/ChangeRecord.vue
@@ -21,11 +21,12 @@
           </template>
           <template #description>
             <slot>
-              <div class="dic color-#303133">
-                {{ item.nickname }} {{ item.content }}
-              </div>
-
+                <div class="dic color-#303133" >
+                  {{ item.nickname }} {{ item.content }}
+                </div>
+                <el-button type="primary" bg text style="margin-top: 5px;" @click="seeDistinction(item)">查看变更数据</el-button>
 
+              
               <!-- <div class="tips" v-if="item.type == 2">
                 <span class="color-#f56c6c" style="text-decoration:line-through">原值</span>><span
                   class="color-#67c23a">新值</span>
@@ -41,6 +42,7 @@
           </template>
         </el-step>
       </el-steps>
+      <Distinction ref="distinctionRef" :schema="schema"/>
     </div>
   </div>
 </template>
@@ -48,6 +50,7 @@
 <script lang="ts" setup>
 import download from '@/utils/download'
 import { formatDate } from '@/utils/formatTime'
+import Distinction from '@/components/Distinction/src/Distinction.vue'
 defineComponent({
   name: 'ChangeRecord'
 })
@@ -56,12 +59,22 @@ const props = defineProps({
   changeRecordData: {
     type: Object,
     required: true
+  },
+  schema: {
+    type: Array,
+    required: true
   }
 })
 // 下载文件
 const downFile = (cur) => {
   download.excel(cur.url, cur.name)
 }
+const distinctionRef = ref()
+const seeDistinction = (row) => {
+  console.log(props.schema)
+  console.log(distinctionRef.value)
+  distinctionRef.value.openDistinction(row)
+}
 </script>
 
 
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index e589f0cdc..6b485a7fe 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -166,7 +166,7 @@
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 变更记录组件 -->
-            <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px"  :key="count"/>
+            <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px"  :key="count" :schema="allSchemas.detailSchema"/>
           </ElScrollbar> 
         </ContentWrap>
       </div>
diff --git a/src/components/Distinction/index.ts b/src/components/Distinction/index.ts
new file mode 100644
index 000000000..ba8af4136
--- /dev/null
+++ b/src/components/Distinction/index.ts
@@ -0,0 +1,3 @@
+import Distinction from './src/Distinction.vue'
+
+export { Distinction }
diff --git a/src/components/Distinction/src/Distinction.vue b/src/components/Distinction/src/Distinction.vue
new file mode 100644
index 000000000..6ef0c4081
--- /dev/null
+++ b/src/components/Distinction/src/Distinction.vue
@@ -0,0 +1,51 @@
+<!-- 变更记录组件 -->
+<template>
+  <el-dialog v-model="dialogVisible" title="变更详情" width="80%" :before-close="handleClose">
+    <div style="display: flex">
+      <div style="flex: 1; width: 0px">
+        <div style="font-size: 16px; font-weight: bold; margin-bottom: 10px"> 变更前 </div>
+        <Descriptions :data="beforeContent" :schema="schema" :columns="2" />
+      </div>
+      <div style="flex: 1; width: 0px; margin-left: 20px">
+        <div style="font-size: 16px; font-weight: bold; margin-bottom: 10px"> 变更后 </div>
+        <Descriptions :data="afterContent" :schema="schema" :columns="2" />
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" setup>
+defineComponent({
+  name: 'Distinction'
+})
+// 接收父组件数据
+const props = defineProps({
+  schema: {
+    type: Array,
+    required: true
+  }
+})
+const schema = ref(props.schema.filter(item => {
+ return item.field !='updater' &&  item.field !='updateTime' &&  item.field !='creator' &&  item.field !='createTime'
+}))
+const dialogVisible = ref(false)
+const afterContent = ref('')
+const beforeContent = ref('')
+const openDistinction = (row) => {
+  afterContent.value = JSON.parse(row.afterContent)
+  beforeContent.value = JSON.parse(row.beforeContent)
+  console.log(222,props.schema)
+  dialogVisible.value = true
+}
+
+defineExpose({ dialogVisible, openDistinction }) // 提供 open 方法，用于打开弹窗
+</script>
+
+
+<style scoped lang="scss">
+</style>

From b9dc933266018c38f7a7b51d4571967aaa0d9c7c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 14:09:39 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7-?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8F=90=E7=A4=BA=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueManage/issue/issueRequestMain/index.vue    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index bc2885c7d..6c84aa7c4 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -513,8 +513,17 @@ const submitForm = async (formType, submitData) => {
   formRef.value.formLoading = true
   try {
     if (formType === 'create') {
-      await IssueRequestMainApi.createIssueRequestMain(data)
-      message.success(t('common.createSuccess'))
+      let remarkRes =  await IssueRequestMainApi.createIssueRequestMain(data)
+      if(remarkRes){
+        let remarkList = remarkRes.split(';')
+        ElMessageBox.alert(remarkList.join('<br/>'),'提示',{
+          dangerouslyUseHTMLString: true,
+        })
+      }else{
+        message.success(t('common.createSuccess'))
+      }
+      console.log('remarkRes',remarkRes)
+      
     } else {
       await IssueRequestMainApi.updateIssueRequestMain(data)
       message.success(t('common.updateSuccess'))

From ea882f57aa54e8dada25d4a5c700294781df76d7 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 3 Sep 2024 14:33:46 +0800
Subject: [PATCH 12/18] =?UTF-8?q?HL-5815=E9=80=89=E5=AE=9A=E9=9B=86?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C1.=E6=98=8E=E7=BB=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=9D=E5=AD=98=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/selectedSet/index.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue
index e6d6c27e2..08d1a9d4e 100644
--- a/src/views/qms/selectedSet/index.vue
+++ b/src/views/qms/selectedSet/index.vue
@@ -418,7 +418,16 @@ const validateNotRepetition = (data) => {
 
 const detailValidate = (formType, data) => {
   let tag = true
-  existValue.value.forEach((item) => {
+  const array = ref([])
+  if (data.id) {
+    array.value = existValue.value.filter((item) => {
+          return data?.id != item.id
+        })
+  } else {
+    array.value =existValue.value
+  }
+  console.log(44,array.value)
+  array.value.forEach((item) => {
     if (data.dictionaryValue == item.dictionaryValue) {
       message.warning('选定集字典项不能重复！')
       tag = false

From 92295fc4eb5cb09f37058535c48d32a88747b7d7 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 14:57:22 +0800
Subject: [PATCH 13/18] =?UTF-8?q?HL-5809=E5=A2=9E=E5=8A=A0=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=B1=87=E6=80=BB=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=8F=82=E8=80=83=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=88=AA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../balanceSummary/balanceSummary.data.ts     | 112 ++++++++++++++++++
 .../inventoryManage/balanceSummary/index.vue  |  85 +++++++++++++
 2 files changed, 197 insertions(+)
 create mode 100644 src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
 create mode 100644 src/views/wms/inventoryManage/balanceSummary/index.vue

diff --git a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
new file mode 100644
index 000000000..83774c39f
--- /dev/null
+++ b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
@@ -0,0 +1,112 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+/**
+ * @returns {Array} 库存余额
+ */
+
+
+export const BalanceSummarySearch = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      search: {
+        componentProps: {
+          enterSearch: true, //可输入回车
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '物料基础信息', // 查询弹窗标题
+          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: 'true',
+            isFormModel: true
+          }], // 失去焦点校验参数
+        }
+      }
+    },{
+      label: '物料描述',
+      field: 'desc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      search: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    }
+  ])
+)
+  
+export const BalanceSummary = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: ' ',
+      field: 'name',
+      sort: 'custom',
+    },
+    {
+      label: '总数',
+      field: 'num1',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '合格数',
+      field: 'num2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '待检数',
+      field: 'num2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '隔离数',
+      field: 'num2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '不合格数',
+      field: 'num2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    }
+  ])
+)
diff --git a/src/views/wms/inventoryManage/balanceSummary/index.vue b/src/views/wms/inventoryManage/balanceSummary/index.vue
new file mode 100644
index 000000000..a5e412529
--- /dev/null
+++ b/src/views/wms/inventoryManage/balanceSummary/index.vue
@@ -0,0 +1,85 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="BalanceSummarySearch.allSchemas.searchSchema" @search="searchList" @reset="searchList" @searchTableSuccess="searchQueryTableSuccess"/>
+  </ContentWrap>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      row-key="id"
+      border
+      lazy
+      :load="load"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+    <el-table-column v-for="column in tableColumns" :prop="column['field']" :label="column['label']" :width="column['width']" :fixed="column['fixed']" :align="column['align']||'center'"/>
+    </el-table>
+</template>
+<script setup lang="ts">
+import { BalanceSummary,BalanceSummarySearch } from './balanceSummary.data'
+const tableColumns = ref(BalanceSummary.allSchemas.tableColumns)
+console.log('tableColumns',tableColumns)
+const tableData= ref([
+  {
+    id: 1,
+    date: '2016-05-02',
+    name: 'wangxiaohu',
+    num: 1,
+  },
+  {
+    id: 2,
+    date: '2016-05-04',
+    name: 'wangxiaohu',
+    num: 2,
+  },
+  {
+    id: 3,
+    date: '2016-05-01',
+    name: 'wangxiaohu',
+    hasChildren: true,
+    num: 3,
+  },
+  {
+    id: 4,
+    date: '2016-05-03',
+    name: 'wangxiaohu',
+    num: 4,
+  },
+])
+const load = ( row, treeNode,resolve) => {
+  console.log('load',row, treeNode,resolve)
+  setTimeout(() => {
+    resolve([
+      {
+        id: Math.random(),
+        date: '2016-05-01',
+        name: 'wangxiaohu',
+        num: 5,
+      },
+      {
+        id: Math.random(),
+        date: '2016-05-01',
+        name: 'wangxiaohu',
+        num: 6,
+        hasChildren: true,
+      },
+    ])
+  }, 1000)
+}
+
+const searchList = (model)=>{
+  console.log('searchList',model)
+
+}
+
+const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  console.log('searchQueryTableSuccess',formField, searchField, val, formRef, type, row )
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['desc1'] = val[0]['desc1']
+    formRef.setValues(setV)
+  })
+}
+</script>
+<style lang="scss" scoped></style>
\ No newline at end of file

From fb5bc181c75934d0351142bd0deb3d9ca9243cd3 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 3 Sep 2024 14:58:21 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5807?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/recommendLocationHistory/index.ts |  57 ++++
 .../recommendLocationHistory/index.vue        | 244 ++++++++++++++++++
 .../recommendLocationHistory.data.ts          |  93 +++++++
 3 files changed, 394 insertions(+)
 create mode 100644 src/api/wms/recommendLocationHistory/index.ts
 create mode 100644 src/views/wms/agvManage/recommendLocationHistory/index.vue
 create mode 100644 src/views/wms/agvManage/recommendLocationHistory/recommendLocationHistory.data.ts

diff --git a/src/api/wms/recommendLocationHistory/index.ts b/src/api/wms/recommendLocationHistory/index.ts
new file mode 100644
index 000000000..f19147d5d
--- /dev/null
+++ b/src/api/wms/recommendLocationHistory/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface RecommendLocationHistoryVO {
+  id: number
+  businessNumber: string
+  businessId: number
+  toLocation: string
+  ruleName: string
+  priority: string
+  locationCollect: string
+  balanceLocationCollect: string
+  expectinLocationCollect: string
+  remark: string
+  extraProperties: string
+  concurrencyStamp: number
+}
+
+// 查询推荐库位推荐记录列表
+export const getRecommendLocationHistoryPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/recommend-location-history/senior', data })
+  } else {
+    return await request.get({ url: `/wms/recommend-location-history/page`, params })
+  }
+}
+
+// 查询推荐库位推荐记录详情
+export const getRecommendLocationHistory = async (id: number) => {
+  return await request.get({ url: `/wms/recommend-location-history/get?id=` + id })
+}
+
+// 新增推荐库位推荐记录
+export const createRecommendLocationHistory = async (data: RecommendLocationHistoryVO) => {
+  return await request.post({ url: `/wms/recommend-location-history/create`, data })
+}
+
+// 修改推荐库位推荐记录
+export const updateRecommendLocationHistory = async (data: RecommendLocationHistoryVO) => {
+  return await request.put({ url: `/wms/recommend-location-history/update`, data })
+}
+
+// 删除推荐库位推荐记录
+export const deleteRecommendLocationHistory = async (id: number) => {
+  return await request.delete({ url: `/wms/recommend-location-history/delete?id=` + id })
+}
+
+// 导出推荐库位推荐记录 Excel
+export const exportRecommendLocationHistory = async (params) => {
+  return await request.download({ url: `/wms/recommend-location-history/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/recommend-location-history/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/agvManage/recommendLocationHistory/index.vue b/src/views/wms/agvManage/recommendLocationHistory/index.vue
new file mode 100644
index 000000000..9c060f5f4
--- /dev/null
+++ b/src/views/wms/agvManage/recommendLocationHistory/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RecommendLocationHistory.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RecommendLocationHistory.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="RecommendLocationHistoryRules"
+    :formAllSchemas="RecommendLocationHistory.allSchemas"
+    :apiUpdate="RecommendLocationHistoryApi.updateRecommendLocationHistory"
+    :apiCreate="RecommendLocationHistoryApi.createRecommendLocationHistory"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="RecommendLocationHistory.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/recommend-location-history/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RecommendLocationHistory,RecommendLocationHistoryRules } from './recommendLocationHistory.data'
+import * as RecommendLocationHistoryApi from '@/api/wms/recommendLocationHistory'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'RecommendLocationHistory' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RecommendLocationHistory.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RecommendLocationHistoryApi.getRecommendLocationHistoryPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:recommendLocationHistory:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:recommendLocationHistory:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:recommendLocationHistory:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:recommendLocationHistory:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:recommendLocationHistory:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =RecommendLocationHistory.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await RecommendLocationHistoryApi.createRecommendLocationHistory(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await RecommendLocationHistoryApi.updateRecommendLocationHistory(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicRecommendLocationHistory')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RecommendLocationHistoryApi.deleteRecommendLocationHistory(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RecommendLocationHistoryApi.exportRecommendLocationHistory(tableObject.params)
+    download.excel(data, '推荐库位推荐记录.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '推荐库位推荐记录导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await RecommendLocationHistoryApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/agvManage/recommendLocationHistory/recommendLocationHistory.data.ts b/src/views/wms/agvManage/recommendLocationHistory/recommendLocationHistory.data.ts
new file mode 100644
index 000000000..da69e3332
--- /dev/null
+++ b/src/views/wms/agvManage/recommendLocationHistory/recommendLocationHistory.data.ts
@@ -0,0 +1,93 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const RecommendLocationHistoryRules = reactive({
+  concurrencyStamp: [required],
+})
+
+export const RecommendLocationHistory = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '业务编号',
+    field: 'businessNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '业务ID',
+    field: 'businessId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '推荐的库位',
+    field: 'toLocation',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '规则名称',
+    field: 'ruleName',
+    sort: 'custom',
+  },
+  {
+    label: '规则优先级',
+    field: 'priority',
+    sort: 'custom',
+  },
+  {
+    label: '规则可选库位集合',
+    field: 'locationCollect',
+    sort: 'custom',
+  },
+  {
+    label: '库存余额库位集合',
+    field: 'balanceLocationCollect',
+    sort: 'custom',
+  },
+  {
+    label: '预计入库位集合',
+    field: 'expectinLocationCollect',
+    sort: 'custom',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isTable:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isTable:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+]))

From bfca78552a33d44727cc536f14c3add95823c725 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 15:04:28 +0800
Subject: [PATCH 15/18] =?UTF-8?q?HL-5809=20=E5=BA=93=E5=AD=98=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=20=E5=AE=BD=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../balanceSummary/balanceSummary.data.ts       | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
index 83774c39f..58e127dc3 100644
--- a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
+++ b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
@@ -67,45 +67,30 @@ export const BalanceSummary = useCrudSchemas(
     {
       label: '总数',
       field: 'num1',
-      sort: 'custom',
-      table: {
-        width: 150
-      }
+      sort: 'custom'
     },
     {
       label: '合格数',
       field: 'num2',
       sort: 'custom',
-      table: {
-        width: 150
-      },
       isSearch: true
     },
     {
       label: '待检数',
       field: 'num2',
       sort: 'custom',
-      table: {
-        width: 150
-      },
       isSearch: true
     },
     {
       label: '隔离数',
       field: 'num2',
       sort: 'custom',
-      table: {
-        width: 150
-      },
       isSearch: true
     },
     {
       label: '不合格数',
       field: 'num2',
       sort: 'custom',
-      table: {
-        width: 150
-      },
       isSearch: true
     }
   ])

From 57f07227fc5b888effa1850dd1814cc2bb12529e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 15:45:03 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E5=B0=81=E8=A3=85ts=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=EF=BC=9AisMainValue=3Dtrue=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E5=8F=AF=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                  | 1 +
 src/components/BasicForm/src/BasicForm.vue | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f3c150968..d73d0dd7b 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ form: {
           value:'prodLine', // 指主表某字段 
           message: '请选择生产线信息！', // 当前置条件为空时 弹出信息提示
           isMainValue: true // 表示查询条件是主表的字段的值
+          isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
           isFilterValue:true // 字段拼到filters里，和isMainValue配合使用
           action: '==', // 查询拼接条件
         },
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5c772061e..7daea779c 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -516,7 +516,9 @@ const opensearchTable = (
             _searchCondition[searchCondition[i].key] == '' ||
             _searchCondition[searchCondition[i].key] == undefined
           ) {
-            isNull = true
+            if(!searchCondition[i].isOptional){ // 添加参数可选可空的判断
+              isNull = true
+            }
           }
           if (isNull) {
             message.warning(

From 03e8ba3f2eddea9d273d21e4b2c78fccdfb75048 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 16:08:11 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E5=A4=A7=E5=93=A5=E8=AE=A9=E6=88=91?=
 =?UTF-8?q?=E5=88=A0=E6=8E=89=20=E5=93=88=E5=93=88=E5=93=88=E5=93=88?=
 =?UTF-8?q?=E5=93=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/documentSetting/switch/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
index 7084363e1..9085a6238 100644
--- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
@@ -134,7 +134,6 @@ const buttonBaseClick = (val, item) => {
 
 const butttondata = (row, $index)=>{
   const hiddenArray = ['CreatePutawayRequestAfterInspectRecordCreated',
-    'CreateBackflushRecordAfterProductreceiptRecordCreated',
     'CreatePurchasePlanAfterDiscretePurchaseOrderPublished',
     'ExemptItemCreatePutawayRequestAfterPurchaseReceiptRecordCreated',
     'CreatePurchaseReceiptRequestAfterSupplierDeliverRecordCreated'

From 01a451bcc8c6523811f5bb17c526ea00a495b6a6 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 16:18:20 +0800
Subject: [PATCH 18/18] =?UTF-8?q?HL-5785=E5=88=B6=E5=93=81=E5=AD=90?=
 =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain/index.vue         | 139 ++--
 .../productscrapRequestMain.data.ts           | 663 ++++++++++--------
 2 files changed, 449 insertions(+), 353 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 9e93edc0e..b92bb9d2b 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="workStationCode"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductscrapRequestMainRules"
     :formAllSchemas="ProductscrapRequestMain.allSchemas"
@@ -100,6 +100,7 @@
     @searchTableSuccess="searchTableBomSuccess"
     :footButttondata="footButttondata"
     @footButtonClick="buttonBaseClickBom"
+    @formSelectChange="formSelectChange"
 
   />
 
@@ -167,7 +168,7 @@ const isShowFooterButtton = ref(true)
 const isShowReduceButtonSelection = ref(true)
 
 const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
-  getListApi: BomDismantleApi.getProductscrapBomRecordPage
+  getListApi: BomDismantleApi.getProductscrapBomRecordPageBatch
 })
 const { getList:getDetailListBom } = detatableMethodsBom
 detatableDataBom.params.isRecord = false
@@ -264,6 +265,8 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
   detailQty.value = row.qty
   bomModelVisible.value = true
   detatableDataBom.params.isRecord = false
+  detatableDataBom.params.fromLocationCode = row.fromLocationCode
+  
   await getDetailListBom()
   console.log(row.fromLocationCode);
   detatableDataBom.tableList.forEach(async (item) => {
@@ -296,9 +299,9 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
     // }else {
       item.qty = item.bomQty * row.qty
     // }
-    const obj = await banchBomPage(row.fromLocationCode, item)
-    console.log('obj',obj)
-    item.batch = obj.batch
+    // const obj = await banchBomPage(row.fromLocationCode, item)
+    // console.log('obj',obj)
+    // item.batch = obj.batch
   })
   if(isSave){
     buttonBaseClickBom('save')
@@ -381,51 +384,66 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
-  nextTick(() => {
+  console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
+  nextTick(async () => {
     if (type == 'tableForm') {
       // 明细查询页赋值
       if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
-      }else if(formField == 'workStationCode'){
-        val.forEach(item=>{
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['workStationCode'] = item['code']
-          newRow['fromLocationCode'] = item['rawLocationCode']
-          tableData.value.push(newRow)
-        })
-        
+      }else if(formField == 'fromLocationCode'){
+        // val.forEach(item=>{
+          // const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          row['workStationCode'] = val[0]['code']
+          row['fromLocationCode'] = val[0]['rawLocationCode']
+          // tableData.value.push(newRow)
+        // })
+          buttonOperationClick(row,'Bom',tableData.value.indexOf(row),true)
+
       }else if(formField == 'processCode'){
         row['processCode'] = val[0]['code']
       }else if(formField == 'itemCode'){
-        row['itemCode'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['bomVersion'] = ''
-        row['childList'] = []
-        // 查询标准价格
-        let param = {'itemCodes':val[0]['itemCode'] as string}
-        StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-          console.log(res)
-          if(res&&res.length>0){
-            row['uom'] = res[0].uom
-            row['singlePrice'] = res[0].price
-          }
-        }) 
-        // 查看BOM版本
-        const param1 =  {
-          productItemCode: val[0]['itemCode'],
-          available: 'TRUE',
-          pageSize: 20,
-          pageNo: 1,
-          sort: '',
-          by: 'ASC',
-        }
-        BomApi.getBomPage(param1).then(res => {
-          console.log(res)
-          if(res?.list?.length>0){
-            row['bomVersion'] = res.list[0].version
-            buttonOperationClick(row,'Bom',tableData.value.indexOf(row),true)
+
+        val.forEach(async item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys}))
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['childList'] = []
+          newRow['singlePrice'] = item['singlePrice']
+          newRow['amount'] = newRow['qty']*item['singlePrice']
+
+          if(item['bomList'].length>0){
+            newRow['bomVersionInitOptions'] = item['bomList'].map(item1=>({
+              label:item1,
+              value:item1
+            }))
+            newRow['bomVersion'] = item['bomList'][0]
           }
-        }) 
+          // // 查询标准价格
+          // let param = {'itemCodes':item['itemCode'] as string}
+          // let resyStdcost = await StdcostpriceApi.queryStdcostpriceByItemCode(param)
+          // console.log('resyStdcost',resyStdcost)
+          // if(resyStdcost&&resyStdcost.length>0){
+          //   newRow['uom'] = resyStdcost[0].uom
+          //   newRow['singlePrice'] = resyStdcost[0].price
+          // }
+          // 查看BOM版本
+          // const param1 =  {
+          //   productItemCode: item['itemCode'],
+          //   available: 'TRUE',
+          //   pageSize: 20,
+          //   pageNo: 1,
+          //   sort: '',
+          //   by: 'ASC',
+          // }
+          // let resBom = await BomApi.getBomPage(param1)
+          // console.log('resBom',resBom)
+          // if(resBom?.list?.length>0){
+          //   newRow['bomVersion'] = resBom.list[0].version
+          //   buttonOperationClick(newRow,'Bom',tableData.value.indexOf(newRow),true)
+          // }
+          tableData.value.push(newRow)
+        })
+
       }else if(formField == 'bomVersion'){
         row['bomVersion'] = val[0]['version']
         buttonOperationClick(row,'Bom',tableData.value.indexOf(row),true)
@@ -436,37 +454,20 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
+      if(formField == 'costCenterCode'){
+        //成本中心代码
+        //成本中心类型
+        setV['costCenterType'] = val[0]['costcentreType']
+      }
       formRef.setValues(setV)
     }
   })
 }
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
-  nextTick(() => {
-    const setV = {}
-    console.log("formField=="+formField+",val=="+val)
-    // 明细查询页赋值
-    if(formField == 'productionLineCode'){
-      setV['productionLineCode'] = val[0]['code']
-    }else if(formField == 'workStationCode'){
-      setV['workStationCode'] = val[0]['code']
-      setV['fromLocationCode'] = val[0]['fgLocationCode']
-    }else if(formField == 'processCode'){
-      setV['processCode'] = val[0]['code']
-    }else if(formField == 'itemCode'){
-      setV['itemCode'] = val[0]['itemCode']
-      setV['bomVersion'] = ''
-      setV['childList'] = []
-      // 查询标准价格
-      let param = {'itemCodes':val[0]['itemCode'] as string}
-      StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-        console.log(res)
-      })
-    }else if(formField == 'bomVersion'){
-      setV['bomVersion'] = val[0]['version']
-    }
-    formRef.setValues(setV)
-  })
+// 切换bom版本
+const formSelectChange= (field, val, row) => {
+  if (field == 'bomVersion') {
+    buttonOperationClick(row,'Bom',tableData.value.indexOf(row),true)
+  }
 }
 
 // 子表新增的时候选择表格之后需要会显得字段
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 839122910..fa27a4d5e 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -20,9 +20,13 @@ import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 import * as BomApi from '@/api/wms/bom'
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
 
 import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
 import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
 
 const { t } = useI18n() // 国际化
 
@@ -104,6 +108,138 @@ export const ProductscrapRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '报废原因',
+      field: 'scrappingReason',
+      dictType: DICT_TYPE.SCRAPPING_REASON,
+      dictClass: 'string',
+      isForm: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
+    {
+      label: '成本中心代码',
+      field: 'costCenterCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码',
+        searchField: 'costcentreCode',
+        searchTitle: '成本中心代码',
+        searchAllSchemas: QadCostcentre.allSchemas,
+        searchPage: QadCostcentreApi.getQadCostcentrePage,
+        verificationParams: [{
+          key: 'costcentreCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+          searchField: 'costcentreCode', // 查询弹窗赋值字段
+          searchTitle: '成本中心代码', // 查询弹窗标题
+          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }],
+          verificationParams: [{
+            key: 'costcentreCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '原因代码',
+      field: 'reasonCodeRequisition',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心原因代码',
+        searchField: 'code',
+        searchTitle: '原因代码',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costCenterCode',
+          value: 'costCenterCode',
+          message: '成本中代码不能为空!',
+          isMainValue: true
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择领用原因代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '领用原因代码', // 查询弹窗标题
+          searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+          searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },{
+            key: 'costcentreType',
+            value: 'costCenterType',
+            message: '成本中心类型不能为空!',
+            isMainValue: true
+            }],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '状态',
       field: 'status',
@@ -236,92 +372,6 @@ export const ProductscrapRequestMain = useCrudSchemas(
         }
       }
     },
-    {
-      label: '班组',
-      field: 'team',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          isSearchList: true,
-          searchListPlaceholder: '请选择班组',
-          searchField: 'code',
-          searchTitle: '班组信息',
-          searchAllSchemas: Team.allSchemas,
-          searchPage: TeamApi.getTeamPage,
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'code',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
-    {
-      label: '班次',
-      field: 'shift',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          isSearchList: true,
-          searchListPlaceholder: '请选择班次',
-          searchField: 'code',
-          searchTitle: '班次信息',
-          searchAllSchemas: Shift.allSchemas,
-          searchPage: ShiftApi.getShiftPage,
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'code',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
-    {
-      label: '报废原因',
-      field: 'scrappingReason',
-      dictType: DICT_TYPE.SCRAPPING_REASON,
-      dictClass: 'string',
-      isForm: true,
-      isTable: true,
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-    },
     {
       label: '从仓库代码',
       field: 'fromWarehouseCode',
@@ -629,12 +679,12 @@ export const ProductscrapRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间代码', trigger: 'change' }
   ],
+  costCenterCode: [
+    { required: true, message: '请选择成本中心代码', trigger: 'change' }
+  ],
   // dueTime: [
   //   { required: true, message: '请选择截止时间', trigger: 'change' }
   // ],
-  productionLineCode: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
-  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
@@ -666,28 +716,185 @@ export const ProductscrapRequestMainRules = reactive({
  */
 export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
-      width: 150,
-      show: false
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPageBom, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key:'workshopCode',
+            value:'workshopCode',
+            message: '请填写车间代码！',
+            isMainValue: true
+          },{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true,
+          isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'itemCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    },
+    tableForm:{
+      multiple: true,
+      enterSearch:true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPageBom, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'workshopCode',
+        value:'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      },{
+        key:'productionLineCode',
+        value:'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true,
+        isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+        }],
+      verificationParams: [{
+        key: 'itemCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
-    isTable: false,
-    isForm: false,
-    isTableForm: false,
   },
-
   {
-    label: '来源工位代码',
-    field: 'workStationCode',
+    label: 'Bom版本',
+    field: 'bomVersion',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      multiple: true,
+    tableForm: {
+      type:'Select',
       // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      // searchField: 'version', // 查询弹窗赋值字段
+      // searchTitle: '物料清单信息', // 查询弹窗标题
+      // searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      // searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      // searchCondition: [{
+      //   key:'productItemCode',
+      //   value:'itemCode',
+      //   message: '请填写物料代码！',
+      //   isMainValue: true
+      // },{
+      //   key: 'available',
+      //   value: 'TRUE',
+      //   isMainValue: false
+      // }]
+    },
+    form: {
+      componentProps: {
+        type:'Select',
+        // isSearchList: true, // 开启查询弹窗
+        // searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        // searchField: 'version', // 查询弹窗赋值字段
+        // searchTitle: '物料清单信息', // 查询弹窗标题
+        // searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        // searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        // searchCondition: [{
+        //   key:'productItemCode',
+        //   value:'itemCode',
+        //   message: '请填写物料代码！',
+        //   isMainValue: true
+        // },{
+        //   key: 'available',
+        //   value: 'TRUE',
+        //   isMainValue: false
+        // }]
+      }
+    },
+  },
+  {
+    label: '报废数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        max:9999,
+        // precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      default:1,
+      min: 0,
+      max:9999,
+      precision: 0
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      enterSearch:true,
+      isInpuFocusShow: true,
       disabled:true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
@@ -699,15 +906,27 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         value: 'TRUE',
         isMainValue: false
       },{
-        key: 'productionLineCode',
-        value: 'productionLineCode',
-        message: '请填写生产线代码！',
+        key:'workshopCode',
+        value:'workshopCode',
+        message: '请填写车间代码！',
         isMainValue: true
-        }],
+      },{
+        key:'productionLineCode',
+        value:'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true,
+        isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+      },{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请选择物料代码',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        isMainValue:false
+      }],
       verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
       isShowTableFormSearch: true,
       verificationParams: [{
-        key: 'code',
+        key: 'rawLocationCode',
         action: '==',
         value: '',
         isMainValue: false,
@@ -729,11 +948,23 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'TRUE',
           isMainValue: false
         },{
-          key: 'productionLineCode',
-          value: 'productionLineCode',
-          message: '请填写生产线代码！',
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
           isMainValue: true
-          }],
+        },{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true,
+          isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择物料代码',
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
+          isMainValue:false
+        }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -743,8 +974,40 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true,
         }], // 失去焦点校验参数
       }
-    }
+    },
+    isTable:true,
+    isTableForm:true,
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    
   },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isTable: false,
+    isForm: false,
+    isTableForm: false,
+  },
+  
   {
     label: '工序代码',
     field: 'processCode',
@@ -800,71 +1063,6 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'itemCode', // 查询弹窗赋值字段
-        searchTitle: '生产线物料关系信息', // 查询弹窗标题
-        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'productionLineCode',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-          }],
-        verificationParams: [{
-          key: 'itemCode',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
-      }
-    },
-    tableForm:{
-      enterSearch:true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-      searchField: 'itemCode', // 查询弹窗赋值字段
-      searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'productionLineCode',
-        value:'productionLineCode',
-        message: '请填写生产线代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-        }],
-      verificationParams: [{
-        key: 'itemCode',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
-    },
-  },
   {
     label: '物料名称',
     field: 'itemName',
@@ -875,52 +1073,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTableForm: false,
   },
-  {
-    label: 'Bom版本',
-    field: 'bomVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
-      searchField: 'version', // 查询弹窗赋值字段
-      searchTitle: '物料清单信息', // 查询弹窗标题
-      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
-      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'productItemCode',
-        value:'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
-        searchField: 'version', // 查询弹窗赋值字段
-        searchTitle: '物料清单信息', // 查询弹窗标题
-        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
-        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productItemCode',
-          value:'itemCode',
-          message: '请填写物料代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-  },
+  
   {
     label: '批次',
     field: 'batch',
@@ -932,49 +1085,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isTableForm:false,
   },
-  {
-    label: '报废数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        max:9999,
-        // precision: 6
-      },
-    },
-    tableForm: {
-      type: 'InputNumber',
-      default:1,
-      min: 0,
-      max:9999,
-      // precision: 6
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
+  
   {
     label: '单价',
     field: 'singlePrice',
@@ -1023,24 +1135,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isTableForm:false,
   },
-  {
-    label: '来源库位',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps:{
-        disabled: true
-      }
-    },
-    isTable:false,
-    isTableForm:false,
-  },
+  
 
   {
     label: '包装号',
@@ -1285,7 +1380,7 @@ export const ProductscrapRequestDetailRules = reactive({
     { required: true, message: '请选择生产线代码', trigger: 'change' }
   ],
   workStationCode: [
-    { required: true, message: '请选择工位代码', trigger: 'change' }
+    { required: true, message: '请选择来源工位代码', trigger: 'change' }
   ],
   qty:[
     { validator:validateQty, message: '数量必须大于0', trigger: 'change'}