diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index c0975c49a..4de2d428a 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -107,8 +107,8 @@ export const batchPrintingLableGet = async (params: any) => {
 }
 
 // 批量打印标签+创建新标签
-export const batchPrintingBalanceLableForCreate = async (params: any) => {
-  return await request.get({ url: `/wms/package/batchPrintingBalanceLableForCreate`, params })
+export const batchPrintingBalanceLableForCreate = async (data: any) => {
+  return await request.post({ url: `/wms/package/batchPrintingBalanceLableForCreate`, data })
 }
 // 批量打印标签多选
 export const batchPrintingLables = async (data: any) => {
diff --git a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue
index d7ffa66c5..2e5fdae96 100644
--- a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue
+++ b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue
@@ -6,11 +6,12 @@
       :model="queryParams"
       class="demo-form-inline"
       style="margin-bottom: 10px"
-      label-width="70px"
+      label-width="80px"
+      :rules="rules"
     >
       <el-row>
         <el-col :span="12">
-          <el-form-item label="客户代码">
+          <el-form-item label="客户代码" prop="customerCode">
             <el-select
               v-model="queryParams.customerCode"
               placeholder="请选择客户代码"
@@ -21,7 +22,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="年月">
+          <el-form-item label="年月" prop="yearsMonthStr">
             <el-date-picker
               v-model="queryParams.yearsMonthStr"
               type="month"
@@ -436,7 +437,14 @@ const queryParams = reactive({
   customerCode: '',
   yearsMonthStr: '',
 })
-
+const rules = ref({
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' },
+  ],
+  yearsMonthStr: [
+    { required: true, message: '请选择年月', trigger: 'change' },
+  ],
+})
 const getCustomerList = async () => {//获取客户列表
   var param ={}
   const list = await CustomerApi.getCustomerListPc(param);
diff --git a/src/components/ImportForm/src/ImportCustomerStatementForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForm.vue
index 368dddc93..a54f52544 100644
--- a/src/components/ImportForm/src/ImportCustomerStatementForm.vue
+++ b/src/components/ImportForm/src/ImportCustomerStatementForm.vue
@@ -6,11 +6,12 @@
       :model="queryParams"
       class="demo-form-inline"
       style="margin-bottom: 10px"
-      label-width="70px"
+      label-width="80px"
+      :rules="rules"
     >
       <el-row>
         <el-col :span="12">
-          <el-form-item label="客户代码">
+          <el-form-item label="客户代码" prop="customerCode">
             <el-select
               v-model="queryParams.customerCode"
               placeholder="请选择客户代码"
@@ -21,7 +22,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="年月">
+          <el-form-item label="年月" prop="yearsMonthStr">
             <el-date-picker
               v-model="queryParams.yearsMonthStr"
               type="month"
@@ -437,6 +438,15 @@ const queryParams = reactive({
   yearsMonthStr: '',
 })
 
+const rules = ref({
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' },
+  ],
+  yearsMonthStr: [
+    { required: true, message: '请选择年月', trigger: 'change' },
+  ],
+})
+
 const getCustomerList = async () => {//获取客户列表
   var param ={}
   const list = await CustomerApi.getCustomerListPc(param);
diff --git a/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue b/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue
index 922ff5143..5eb16a5ed 100644
--- a/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue
+++ b/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue
@@ -275,7 +275,6 @@ const verifyData = async () => {
     // buttonBaseClick('refresh',null)
   } catch {
     //取消走的
-    alert(123);
   }
   }else if(data.status==3){
     await message.alertWarning('已存在相同客户代码及年月的客户对账单，且已确认分摊金额，无法导入')
diff --git a/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue b/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue
index 21390cacc..c628365ab 100644
--- a/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue
+++ b/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue
@@ -7,10 +7,11 @@
       class="demo-form-inline"
       style="margin-bottom: 10px"
       label-width="70px"
+      :rules="rules"
     >
       <el-row>
         <el-col :span="12">
-          <el-form-item label="供应商代码" label-width="85px">
+          <el-form-item label="供应商代码" label-width="95px" prop="supplierCode">
             <el-select
               v-model="queryParams.supplierCode"
               placeholder="请选择供应商代码"
@@ -21,7 +22,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="年月">
+          <el-form-item label="年月" prop="yearsMonthStr">
             <el-date-picker
               v-model="queryParams.yearsMonthStr"
               type="month"
@@ -435,7 +436,14 @@ const queryParams = reactive({
   supplierCode: '',
   yearsMonthStr: '',
 })
-
+const rules = ref({
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' },
+  ],
+  yearsMonthStr: [
+    { required: true, message: '请选择年月', trigger: 'change' },
+  ],
+})
 const getCustomerList = async () => {//获取客户列表
   
   const list = await SuppliperMoldCostMainApi.getCustomerList();
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index 7c8e0d094..2051d9ead 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -415,7 +415,6 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isTable: false,
     isForm: false
   },
   {
@@ -425,7 +424,6 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable: false,
     isForm: false
   },
   {
@@ -734,7 +732,6 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
-    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -753,7 +750,6 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTable: false,
     isTableForm: false,
     isForm: false
   },
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index 2d88c6ca3..58dfb231b 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -585,6 +585,7 @@ export const DeliverJobMain = useCrudSchemas(
       },
       isTable: false
     },
+   
     {
       label: '创建时间',
       field: 'createTime',
@@ -635,7 +636,6 @@ export const DeliverJobMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: false,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -652,7 +652,6 @@ export const DeliverJobMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
     },
     {
       label: '操作',
@@ -906,6 +905,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
+  
   {
     label: '创建时间',
     field: 'createTime',
@@ -945,6 +945,36 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: true,
   },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x'
+      }
+    }
+  },
+
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+ 
 ]))
 
 //表单校验
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index a3cdf6aa5..8f7b962f3 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -402,6 +402,34 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isTable: false
     },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     // {
     //   label: '代码',
     //   field: 'code',
@@ -816,6 +844,34 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: true,
   },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 9ffaa9d3b..ba7796931 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -1115,7 +1115,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -1135,7 +1134,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
     isTableForm: false,
     isForm: false
   },
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
index f8f69a610..f7fda27e5 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -176,15 +176,6 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -216,14 +207,13 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '最后更新者',
-    field: 'updater',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
     },
     isForm: false,
-    isTable: false
   },
   {
     label: '最后更新时间',
@@ -245,7 +235,15 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
-    isTable: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
   },
   {
     label: '当前阶段',
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
index 226862371..94c449112 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
@@ -410,6 +410,34 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isTable: false
     },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     // {
     //   label: '代码',
     //   field: 'code',
@@ -828,6 +856,34 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: true,
   },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
index 124616c97..1a5904214 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
@@ -116,7 +116,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'YYYY-MM'
+        valueFormat: 'YYYY-MM',
       }
     },
   },
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
index 8588cce12..fb2dde87c 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
@@ -117,7 +117,7 @@
     <template #adjustmentAmount="{ row }" v-if="tabCurrent.prop == 'ShareReconciliation'">
       <div style="position: relative">
         <span>{{ row.adjustmentAmount }}</span>
-        <Icon
+        <Icon v-if="row.status==4"
           icon="ep:edit"
           color="#409eff"
           @click="openDetailForm(row)"
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts
index 733960b88..8f4280e27 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts
+++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts
@@ -9,10 +9,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     fixed: 'left',
-    isSearch: true,
-    table:{
-      width: 200
-    }
+    isSearch: true
   },
   {
     label: '状态',
@@ -31,9 +28,6 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
         multiple:true,
       }
     },
-    table:{
-      width: 100
-    }
   },
   {
     label: '版本号',
@@ -45,18 +39,12 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true
   },
   {
     label: '供应商名称',
     field: 'supplierName',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true
   },
   {
@@ -69,7 +57,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         valueFormat: 'YYYY-MM',
-        type: 'daterange',
+        type: 'monthrange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
@@ -82,9 +70,6 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
         type: 'datetime',
         valueFormat: 'YYYY-MM'
       }
-    },
-    table:{
-      width: 100
     }
   },
   {
@@ -93,10 +78,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail:true,
     isForm: false,
-    isTable:true,
-    table:{
-      width: 150
-    }
+    isTable:true
   },
   {
     label: '创建时间',
@@ -115,10 +97,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
     isTable:true,
-    isForm: false,
-    table:{
-      width:180
-    }
+    isForm: false
   },
   {
     label: '更新者',
@@ -145,10 +124,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
     isTable:false,
-    isForm: false,
-    table:{
-      width:180
-    }
+    isForm: false
   },
   {
     label: '操作',
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index a371bf107..b91e07ca5 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -1,6 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import { validatePositiveNumber } from "@/utils/validator";
 /**
  * @returns {Array} 库存余额
  */
@@ -821,3 +827,128 @@ export const BalanceRules = reactive({
     { required: true, message: '请选择生产日期', trigger: 'change' }
   ],
 })
+
+// 表单校验
+export const BalancePackageRules = reactive({
+ 
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  printQty: [
+    { required: true, message: '请输入打印数量', trigger: 'blur' },
+    { validator: validatePositiveNumber, message: '必须是一个正数', trigger: 'change' }
+  ],
+})
+export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      type: 'FormDate',
+      format: 'YYYYMMDD',
+      valueFormat: 'YYYYMMDD',
+    }
+  },
+  {
+    label: '打印数量',
+    field: 'printQty',
+    sort: 'custom',
+    table: {
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 6,
+      min: 0
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '标包数量',
+    field: 'packQty',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    },
+    table: {
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '标签生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '标签供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+]))
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 0f9a3798f..2b7e655ef 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -82,8 +82,8 @@
    <BasicForm
     ref="labelPointFormRef"
     @success="getList"
-    :tableAllSchemas="SupplierdeliverRequestPackage.allSchemas"
-    :tableFormRules="SupplierdeliverRequestPackageRules"
+    :tableAllSchemas="detailListTableColumns"
+    :tableFormRules="detailListTableColumnsRules"
     :tableData="detatableData1"
     :isBusiness="true"
     :isShowButton="false"
@@ -106,10 +106,11 @@
 <script setup lang="ts">
 import dayjs from 'dayjs'
 import download from '@/utils/download'
+import { cloneDeep } from 'lodash-es'
 import * as BalanceApi from '@/api/wms/balance'
 import * as PackageApi from '@/api/wms/package'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Balance, TransactionTab, BalanceRules } from './balance.data'
+import { Balance, TransactionTab, BalanceRules,BalancePackage,BalancePackageRules } from './balance.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -118,10 +119,14 @@ import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import {
   SupplierdeliverRequestPackage,
   SupplierdeliverRequestPackageRules
 } from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+
 console.log(222,SupplierdeliverRequestPackage)
 const { loadStart, loadDone } = usePageLoading()
 // 库存余额
@@ -137,6 +142,8 @@ const tableColumns = ref(Balance.allSchemas.tableColumns)
 const tabsExtend = ref(false)
 const apiPage = ref()
 const tableObjectExtend = ref()
+const detailListTableColumns =cloneDeep(BalancePackage.allSchemas) 
+const detailListTableColumnsRules =cloneDeep(BalancePackageRules) 
 
 //字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -348,28 +355,86 @@ const handlePoint = async (row) => {
 }
 
 const searchTableRef = ref()
+const enableBuyOrenableMake = ref()//是可制造还是可采购
 const getLabelDetailPage = async (row, useToPackingNumber) => {
   ////英泰项目没有包装号 所以只能通过物料号，批次，到库位代码去查询对应的包装
-  let defaultParams = {
-    moduleName: 'move',
-    recordNumber: '',
-    itemCode: row.itemCode,
-    packQty: row.packQty,
-    batch: row.batch
-  }
-  const { tableObject: tableObjectPrint, tableMethods } = useTable({
-    defaultParams,
-    getListApi: PackageApi.getLabelDetailPage // 分页接口
-  })
-  // 获得表格的各种操作
-  const { getList: getListPrint } = tableMethods
-  await getListPrint()
-  tableObject.loading = false
-  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
-  tableColumns.forEach((item) => {
-    item.width = item.table?.width || 150
+  // let defaultParams = {
+  //   moduleName: 'move',
+  //   recordNumber: '',
+  //   itemCode: row.itemCode,
+  //   packQty: row.packQty,
+  //   batch: row.batch
+  // }
+  // const { tableObject: tableObjectPrint, tableMethods } = useTable({
+  //   defaultParams,
+  //   getListApi: PackageApi.getLabelDetailPage // 分页接口
+  // })
+  // // 获得表格的各种操作
+  // const { getList: getListPrint } = tableMethods
+  // await getListPrint()
+  // tableObject.loading = false
+  // const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  // tableColumns.forEach((item) => {
+  //   item.width = item.table?.width || 150
+  // })
+  // detatableData1.value = tableObjectPrint.tableList
+
+  await ItembasicApi.getItembasicPage({
+    pageSize: 10,
+    pageNo: 1,
+    code: row.itemCode,
+    sort: '',
+    by: 'ASC',
+  }).then(res => {
+    if (res.list.length > 0) {
+      // 判断物料 可采购
+      detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules)
+      enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' :''
+      if (res.list[0].enableBuy == "TRUE") {
+        detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage')
+        delete detailListTableColumnsRules.value.productionLineCodePackage
+          // 修改 tableform 属性
+        detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              SupplieritemApi.getSupplieritemPage({
+                pageSize: 10,
+                pageNo: 1,
+                itemCode: row.itemCode,
+                sort: '',
+                by: 'ASC',
+              }).then(response => {
+                  row.supplierItemCode = response.list[0].supplierCode
+              })
+            }
+          })
+      }
+      // 判断物料 可制造
+      if (res.list[0].enableMake == "TRUE") {
+        // 修改 tableform 属性
+        detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierItemCode')
+        delete detailListTableColumnsRules.value.supplierItemCode
+          detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'productionLineCodePackage') {
+              ProductionlineitemApi.getProductionlineitemPage({
+                pageNo: 1,
+                itemCode: row.itemCode,
+                sort: '',
+                by: 'ASC',
+              }).then(response => {
+                row.supplierItemCode = response.list[0].supplierCode
+              })
+            }
+          })
+      }
+    } else {
+      message.warning('没有查询到物料代码：【' + row.itemCode + '】')
+      return
+    }
+    
   })
-  detatableData1.value = tableObjectPrint.tableList
+      
+  detatableData1.value=[]//不走打印详情接口,用主数据
+  detatableData1.value.push(row)
   detatableData1.value.forEach(item => {
     item.printQty =row.qty
     if (!item.batch) {
@@ -504,10 +569,13 @@ const pointLabel = async () => {
   // })
   const obj = {
     itemCode:detatableData1.value[0].itemCode,
-    packingNumber:detatableData1.value[0].number,
     batch:detatableData1.value[0].batch,
     printQty:detatableData1.value[0].printQty,
+    packUnit:detatableData1.value[0].packUnit,
     packQty:detatableData1.value[0].packQty,
+    uom:detatableData1.value[0].uom,
+    productionLineCodePackage:detatableData1.value[0].productionLineCodePackage,
+    supplierItemCode:detatableData1.value[0].supplierItemCode,
   }
   // const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0)
   if(!parseFloat(obj.printQty) ){
@@ -515,8 +583,13 @@ const pointLabel = async () => {
     return;
   }
   await PackageApi.batchPrintingBalanceLableForCreate(obj).then(res => {
-    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&asn_number='+res)
+    let src =ref('')
+     if (enableBuyOrenableMake.value == 'enableBuy') {
+      src.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id='+res//采购标签模板
+    } else if(enableBuyOrenableMake.value == 'enableMake') {
+     src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板
+    }
+    window.open(src.value)
   }).catch(err => {
     console.log(err)
     message.error('创建标签失败')
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index aa59a0c38..8715bded9 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -77,6 +77,9 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate"
     @onBlur="onBlur"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
   />
 
   <!-- 导入 -->
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index 1d300abc0..80cad02c9 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -568,9 +568,9 @@ export const UnplannedissueRequestMainRules = reactive({
   costCenterCode: [
     { required: true, message: '请输入成本中心代码', trigger: 'blur' }
   ],
-  costCenterType: [
-    { required: true, message: '请输入成本中心类型', trigger: 'blur' }
-  ],
+  // costCenterType: [
+  //   { required: true, message: '请输入成本中心类型', trigger: 'blur' }
+  // ],
   reasonCodeRequisition: [
     { required: true, message: '请输入领用原因代码', trigger: 'blur' }
   ],
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
index 5303feec2..df007bf1b 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
@@ -236,7 +236,8 @@ export const InventorymoveRequestMainRules = reactive({
   ],
   toLocationCode: [
     { required: true, message: '请选择到库位代码', trigger: 'change' }
-  ]
+  ],
+ 
 })
 
 /**
@@ -514,5 +515,8 @@ export const InventorymoveRequestDetailRules = reactive({
   ],
   toInventoryStatus: [
     { required: true, message: '请选择到库存状态', trigger: 'change' }
-  ]
+  ],
+  fromBatch: [
+    { required: true, message: '请选择批次', trigger: 'change' }
+  ],
 })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 2555afd6a..05ba7a993 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -696,7 +696,7 @@ const buttonTableClick = async (val, row) => {
     labelPrint(row)
   } else if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.masterId)
+    handleDocumentPrint(row.masterId,row.masterId)
   }
 }
 const footButttondata = ref([
@@ -1080,13 +1080,14 @@ const genRecords = async (id: number) => {
   // 发起处理
   SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
     .then((res) => {
+      console.log('res',res)
       message.success(t('ts.处理成功!'))
       // 刷新列表
       getList()
       getLoading?.close()
 
       // 单据打印
-      handleDocumentPrint(id)
+      handleDocumentPrint(res,id)
     })
     .catch((err) => {
       getLoading?.close()
@@ -1242,8 +1243,8 @@ const print = async () => {
 const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
 // 物料状态是号试显示生准订单的发货单模版
 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
-const handleDocumentPrint = async (id) => {
-  await SupplierdeliverRequestMainApi.getItemStatus(id).then(async (res) => {
+const handleDocumentPrint = async (id,stausId) => {
+  await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => {
     if (res) {
       //号试（生准订单）模板
       window.open(documentSrc2.value + '&id=' + id)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index d44eae0c6..6bff0c144 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1824,18 +1824,18 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       valueFormat: 'YYYYMMDD',
     }
   },
-  // {
-  //   label: '打印数量',
-  //   field: 'printQty',
-  //   sort: 'custom',
-  //   table: {
-  //   },
-  //   tableForm: {
-  //     type: 'InputNumber',
-  //     precision: 6,
-  //     min:0
-  //   }
-  // },
+  {
+    label: '打印数量',
+    field: 'printQty',
+    sort: 'custom',
+    table: {
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 6,
+      min:0
+    }
+  },
   {
     label: '包装规格',
     field: 'packUnit',