From e3d065d01fe61aef0a775064a8346afe825de5a0 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 11 Oct 2024 13:29:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=A7=E5=93=A5=EF=BC=9A=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 2d8b4948c..b8aecaf42 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -629,7 +629,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    sortTableDefault:8,
     form: {
       component: 'InputNumber',
       componentProps: {

From 4b48134de586c9e5650037a83ad91f9971f3e616 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 11 Oct 2024 14:15:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?WMS=20bug=20HL-6222=EF=BC=9A=E5=99=A8?=
 =?UTF-8?q?=E5=85=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81=E5=BA=94?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containerRecordMain.data.ts               | 10 +++++-----
 .../containerRecordMain/index.vue             | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
index 579f2a28a..8b65a711b 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
@@ -233,11 +233,11 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'containerNumber',
     sort: 'custom'
   },
-  // {
-  //   label: '来源库位代码',
-  //   field: 'fromLocationCode',
-  //   sort: 'custom',
-  // },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+  },
   {
     label: '目标库位代码',
     field: 'toLocationCode',
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
index e3ea5e8cb..1709cedf0 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@@ -136,6 +136,25 @@ else if ( routeName.value == 'ScrapContainerManageRecord') {
   importFileName.value = '器具管理记录'
 }
 
+if ( routeName.value == 'InitialContainerManageRecord') {
+  console.log('dodododo1')
+  console.log('dodododo1',tableColumns.value)
+  tableColumns.value = tableColumns.value.filter(item=>item.field != "fromLocationCode")
+  console.log('dodododo1',tableColumns.value)
+  // ContainerRecordDetail.allSchemas.formSchema.forEach((item) => {
+  //   if(item.field == 'fromLocationCode'){
+  //     console.log('dodododo2')
+  //     item.hidden = true
+  //   }
+  // })
+}else{
+  ContainerRecordDetail.allSchemas.formSchema.forEach((item) => {
+    if(item.field == 'fromLocationCode'){
+      item.hidden = false
+    }
+  })
+}
+
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {

From 27caea6e42ea6488b7c6ccf8aa5d2fdb25ea007e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 11 Oct 2024 15:50:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=99=A8=E5=85=B7=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=8E=BB=E6=8E=89=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containerRecordMain/index.vue             | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
index 1709cedf0..ebf7f6445 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@@ -12,7 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ContainerRecordMain.allSchemas"
-      :detailAllSchemas="ContainerRecordDetail.allSchemas"
+      :detailAllSchemas="ContainerRecordDetailAllSchemas"
     />
 
   <!-- 列表 -->
@@ -67,7 +67,9 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ContainerRecordMain,ContainerRecordMainRules,ContainerRecordDetail,ContainerRecordDetailRules } from './containerRecordMain.data'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './containerRecordMain.data'
+
+console.log(3444,ContainerRecordDetail)
 import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
 import * as ContainerRecordDetailApi from '@/api/wms/containerRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -76,6 +78,7 @@ import Detail from '@/components/Detail/src/Detail.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { json } from 'stream/consumers'
 const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ContainerRecordMain' })
 const message = useMessage() // 消息弹窗
@@ -85,7 +88,10 @@ const routeName = ref()
 routeName.value = route.name
 const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
+// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
+const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
+console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
 const searchType = ref()
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
@@ -135,27 +141,18 @@ else if ( routeName.value == 'ScrapContainerManageRecord') {
   businessType.value = 'ContainerManage'
   importFileName.value = '器具管理记录'
 }
-
-if ( routeName.value == 'InitialContainerManageRecord') {
-  console.log('dodododo1')
-  console.log('dodododo1',tableColumns.value)
-  tableColumns.value = tableColumns.value.filter(item=>item.field != "fromLocationCode")
-  console.log('dodododo1',tableColumns.value)
-  // ContainerRecordDetail.allSchemas.formSchema.forEach((item) => {
-  //   if(item.field == 'fromLocationCode'){
-  //     console.log('dodododo2')
-  //     item.hidden = true
-  //   }
-  // })
-}else{
-  ContainerRecordDetail.allSchemas.formSchema.forEach((item) => {
-    if(item.field == 'fromLocationCode'){
-      item.hidden = false
-    }
-  })
+ if ( routeName.value == 'InitialContainerManageRecord') {
+  const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
+  ContainerRecordDetailAllSchemas.value.tableMainColumns = array
+   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
+ }
+ else {
+   ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
+   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
 }
 
 
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val

From b6b913eff600e5374b38aa88eeaa374b7a7a915a Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 11 Oct 2024 16:21:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?WMS=20bug=20HL-6231=EF=BC=9A=E5=99=A8?=
 =?UTF-8?q?=E5=85=B7=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96QTY=E8=B5=8B=E5=80=BC=20=E5=88=A0=E9=99=A4=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containermanage/containerMainRequest/index.vue               | 1 +
 .../containermanage/scrapContainerMainRequest/index.vue          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index 3f81139fe..a04b85824 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -176,6 +176,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           newRow['uom'] = item['uom']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['toQty'] = item['qty']
           tableData.value.push(newRow)
         })
     }else if(formField == 'toLocationCode'){
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index d66fec63d..302f86923 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -158,6 +158,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           newRow['fromLocationCode'] = item['locationCode']
           newRow['fromInventoryStatus'] = item['inventoryStatus']
           newRow['toInventoryStatus'] = 'SCRAP'
+          newRow['toQty'] = item['qty']
           tableData.value.push(newRow)
         })
     }else if(formField == 'toLocationCode'){