From 8dbc45fac33b1600eeeebe91b2b1f6c67f679ce4 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 18 Oct 2024 12:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=88=E6=96=B0=EF=BC=89=E6=89=93=E5=8D=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=97=A0=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=20YT-435?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRecordMain.data.ts           | 16 ++++++++--------
 .../inventorymoveRecordMainNew/index.vue         |  4 +++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
index b80264573..9d49cc04a 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
@@ -414,14 +414,14 @@ export const ProductionreturnRecordMainRules = reactive({
  * @returns {Array} 生产退料记录子表
  */
 export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '生产线代码',
+  //   field: 'productionLineCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '工位代码',
     field: 'workStationCode',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index 0e1f26bf6..13e7a41e8 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -223,7 +223,9 @@ const getLabelType = async (row,useToPackingNumber)=>{
 const getLabelDetailPage = async (row,useToPackingNumber)=>{
   let defaultParams = {'moduleName':'move','recordNumber':row.number}
   if(useToPackingNumber){
-    defaultParams = {'moduleName':'move','recordNumber':row.toPackingNumber}
+    // defaultParams = {'moduleName':'move','recordNumber':row.toPackingNumber}
+    ////英泰项目没有包装号 所以只能通过物料号，批次，到库位代码去查询对应的包装
+    defaultParams = {'moduleName':'move','recordNumber':'','itemCode': row.itemCode}
   }
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,