Merge branch 'hella_online_20240906' into master_hella

3 months ago · 33fddce7b4
22 changed files with 393 additions and 110 deletions
--- a/src/api/wms/inventorymoveRequestMain/index.ts
+++ b/src/api/wms/inventorymoveRequestMain/index.ts
@ -129,11 +129,11 @@ export const exportScrapToHoldRequestMain = async (params) => {
 }

 // 下载用户导入模板
+// 下载用户导入模板（除库存移动外）
+
 export const importTemplate = () => {
  return request.download({ url: '/wms/inventorymove-request-main/get-import-template' })
 }
-
-// 下载用户导入模板（除库存移动外）
 export const importTemplateExceptMove = () => {
  return request.download({ url: '/wms/inventorymove-request-main/get-import-template-exceptMove' })
 }
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@ -108,6 +108,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
+import * as SalepriceApi from '@/api/wms/saleprice'
 import { formatDate } from '@/utils/formatTime'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import * as SupplierApi from '@/api/wms/supplier'
@ -140,10 +141,67 @@ const clearSearchInput = (formField) => {
        item.componentProps.options = []
      }
    })
+    if (basicFormRef.value.formRef.formModel.lightItemCode) {
+      basicFormRef.value.formRef.setValues({
+        lightQty: 0,
+        claimAmount: '',
+        otherClaimAmount: 0,
+        summaryAmount: 0,
+        disbursementAmount: 0,
+        remainingAmount: 0
+      })
+
+      const params2 = {
+        by: 'ASC',
+        filters: [
+          {
+            column: 'itemCode',
+            action: '==',
+            value: basicFormRef.value.formRef.formModel.lightItemCode
+          },
+          {
+            column: 'available',
+            action: '==',
+            value: 'TRUE'
+          }
+        ],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      params2.isSearch = true
+      SalepriceApi.getSalepricePage(params2).then((res) => {
+        if (res.list?.length > 0) {
+          priceObj.value = res.list[0]
+
+          basicFormRef.value.formRef.setValues({
+            standardCostPrice: priceObj.value.price
+          })
+        } else {
+          params2.isSearch = true
+          StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+            if (res.list?.length > 0) {
+              priceObj.value = res.list[0]
+
+              basicFormRef.value.formRef.setValues({
+                standardCostPrice: priceObj.value.price
+              })
+            } else {
+              basicFormRef.value.formRef.setValues({
+                standardCostPrice: 0
+              })
+            }
+          })
+        }
+      })
+    } else {
+      basicFormRef.value.formRef.setValues({
+        standardCostPrice: ''
+      })
+    }
  }
  if (formField == 'lightItemCode') {
    basicFormRef.value.formRef.setValues({
-      standardCostPrice: '',
      lightItemName: '',
      lightQty: 0,
      claimAmount: '',
@ -152,24 +210,56 @@ const clearSearchInput = (formField) => {
      disbursementAmount: 0,
      remainingAmount: 0
    })
-    const params2 = {
-      by: 'ASC',
-      filters: [
-        { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
-      ],
-      pageNo: 1,
-      pageSize: 500,
-      sort: ''
-    }
-    params2.isSearch = true
-    StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
-      if (res.list?.length > 0) {
-        priceObj.value = res.list[0]
-        basicFormRef.value.formRef.setValues({
-          standardCostPrice: priceObj.value.price
-        })
+
+    if (basicFormRef.value.formRef.formModel.itemCode) {
+      const params2 = {
+        by: 'ASC',
+        filters: [
+          {
+            column: 'itemCode',
+            action: '==',
+            value: basicFormRef.value.formRef.formModel.itemCode
+          },
+          {
+            column: 'available',
+            action: '==',
+            value: 'TRUE'
+          }
+        ],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
      }
-    })
+      params2.isSearch = true
+      SalepriceApi.getSalepricePage(params2).then((res) => {
+        if (res.list?.length > 0) {
+          priceObj.value = res.list[0]
+
+          basicFormRef.value.formRef.setValues({
+            standardCostPrice: priceObj.value.price
+          })
+        } else {
+          params2.isSearch = true
+          StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+            if (res.list?.length > 0) {
+              priceObj.value = res.list[0]
+
+              basicFormRef.value.formRef.setValues({
+                standardCostPrice: priceObj.value.price
+              })
+            } else {
+              basicFormRef.value.formRef.setValues({
+                standardCostPrice: 0
+              })
+            }
+          })
+        }
+      })
+    } else {
+      basicFormRef.value.formRef.setValues({
+        standardCostPrice: ''
+      })
+    }
  }
 }
 // 查询页面返回
@ -181,7 +271,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
      setV['purchaseReceiptNumber'] = ''
      const supplierParams = {
        by: 'ASC',
-        filters: [{ column: 'code', action: '==', value: val[0].supplierCode }],
+        filters: [
+          { column: 'code', action: '==', value: val[0].supplierCode },
+          {
+            column: 'available',
+            action: '==',
+            value: 'TRUE'
+          }
+        ],
        pageNo: 1,
        pageSize: 500,
        sort: ''
@ -223,18 +320,39 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
      setV['remainingAmount'] = 0
      const params2 = {
        by: 'ASC',
-        filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
+        filters: [
+          { column: 'itemCode', action: '==', value: val[0].code },
+          {
+            column: 'available',
+            action: '==',
+            value: 'TRUE'
+          }
+        ],
        pageNo: 1,
        pageSize: 500,
        sort: ''
      }
      params2.isSearch = true
-      StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+      SalepriceApi.getSalepricePage(params2).then((res) => {
        if (res.list?.length > 0) {
          priceObj.value = res.list[0]
          formRef.setValues({
            standardCostPrice: priceObj.value.price
          })
+        } else {
+          params2.isSearch = true
+          StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+            if (res.list?.length > 0) {
+              priceObj.value = res.list[0]
+              formRef.setValues({
+                standardCostPrice: priceObj.value.price
+              })
+            } else {
+              formRef.setValues({
+                standardCostPrice: 0
+              })
+            }
+          })
        }
      })
      setV[formField] = val[0][searchField]
@ -270,7 +388,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {

      const supplieritemParams = {
        by: 'ASC',
-        filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
+        filters: [
+          { column: 'itemCode', action: '==', value: val[0].itemCode },
+          {
+            column: 'available',
+            action: '==',
+            value: 'TRUE'
+          }
+        ],
        pageNo: 1,
        pageSize: 500,
        sort: ''
@ -289,7 +414,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
      })
      const itembasicParams = {
        by: 'ASC',
-        filters: [{ column: 'code', action: '==', value: val[0].itemCode }],
+        filters: [
+          { column: 'code', action: '==', value: val[0].itemCode },
+          {
+            column: 'available',
+            action: '==',
+            value: 'TRUE'
+          }
+        ],
        pageNo: 1,
        pageSize: 500,
        sort: ''
@ -303,8 +435,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
          })
        }
      })
-      if (basicFormRef.value.formRef.formModel.lightItemCode == null||
-      basicFormRef.value.formRef.formModel.lightItemCode == ''
+      if (
+        basicFormRef.value.formRef.formModel.lightItemCode == null ||
+        basicFormRef.value.formRef.formModel.lightItemCode == ''
      ) {
        setV['standardCostPrice'] = ''
        setV['lightQty'] = 0
@ -315,18 +448,41 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
        setV['remainingAmount'] = 0
        const params2 = {
          by: 'ASC',
-          filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
+          filters: [
+            { column: 'itemCode', action: '==', value: val[0].itemCode },
+            {
+              column: 'available',
+              action: '==',
+              value: 'TRUE'
+            }
+          ],
          pageNo: 1,
          pageSize: 500,
          sort: ''
        }
        params2.isSearch = true
-        StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+        console.log(123)
+        SalepriceApi.getSalepricePage(params2).then((res) => {
+          console.log(456)
          if (res.list?.length > 0) {
            priceObj.value = res.list[0]
            formRef.setValues({
              standardCostPrice: priceObj.value.price
            })
+          } else {
+            params2.isSearch = true
+            StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+              if (res.list?.length > 0) {
+                priceObj.value = res.list[0]
+                formRef.setValues({
+                  standardCostPrice: priceObj.value.price
+                })
+              } else {
+                formRef.setValues({
+                  standardCostPrice: 0
+                })
+              }
+            })
          }
        })
      }
@ -401,7 +557,12 @@ const onChange = (field, e) => {
    const paramsCustomer = {
      by: 'ASC',
      filters: [
-        { column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode }
+        { column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode },
+        {
+          column: 'available',
+          action: '==',
+          value: 'TRUE'
+        }
      ],
      pageNo: 1,
      pageSize: 500,
@ -582,10 +743,10 @@ const formsSuccess = async (formType, data) => {
  //   message.error('数量不能为0')
  //   return
  // }
-  if (!data.standardCostPrice) {
-    message.error('标准成本价格不能为0或空')
-    return
-  }
+  // if (!data.standardCostPrice) {
+  //   message.error('标准成本价格不能为0或空')
+  //   return
+  // }
  if (data.activeTime == 0) data.activeTime = null
  if (data.expireTime == 0) data.expireTime = null

--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@ -329,7 +329,7 @@ export const Q2 = useCrudSchemas(
      }
    },
    {
-      label: '整灯物料代码',
+      label: '整灯/分总成物料代码',
      field: 'lightItemCode',
      sort: 'custom',
      table: {
@ -341,7 +341,7 @@ export const Q2 = useCrudSchemas(
        componentProps: {
          enterSearch: true,
          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择整灯/分总成物料代码', // 输入框占位文本
          searchField: 'code', // 查询弹窗赋值字段
          searchTitle: '物料基础信息', // 查询弹窗标题
          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@ -372,7 +372,7 @@ export const Q2 = useCrudSchemas(
      }
    },
    {
-      label: '整灯物料名称',
+      label: '整灯/分总成物料名称',
      field: 'lightItemName',
      sort: 'custom',
      dictClass: 'string',
@ -454,7 +454,7 @@ export const Q2 = useCrudSchemas(
      }
    },
    {
-      label: '标准成本价格',
+      label: '销售价格',
      field: 'standardCostPrice',
      sort: 'custom',
      isSearch: false,
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@ -106,6 +106,7 @@ import * as InspectionQ3MainApi from '@/api/qms/inspectionQ3/inspectionQ3Main'
 import * as InspectionQ3DetailApi from '@/api/qms/inspectionQ3/inspectionQ3Detail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import * as ProductionlineApi from '@/api/wms/productionline'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { formatDate } from '@/utils/formatTime'
 import { async } from '@antv/x6/lib/registry/marker/async'
@ -173,7 +174,7 @@ const setTableFormsValues = async (val, index1) => {
    newRow['uom'] = val[index1]['uom']
    newRow['qty'] = 0
    newRow.defectLocation = val[index1]['productionLineCode']
-    await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[index1].itemCode).then(
+    await ProductionlineApi.getProductionlineNoPage({}).then(
      (res) => {
        console.log(res)
        if (res?.length > 0) {
@ -419,7 +420,6 @@ const submitForm = async (formType, submitData) => {
        return;
      }
      let flag = false;
-      console.log(1111)
      data.subList.forEach((item) => {
          if(item.qty == 0){
            message.warning("数量不能为0")
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@ -323,16 +323,18 @@ export const InspectionQ3Detail = useCrudSchemas(
        ],
        verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
        isShowTableFormSearch: true, //tableForm下方是否出现输入框
-        isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
+        isRepeat: true, //tableForm下方输入框是否可以重复添加该条数据
        // 失去焦点校验参数
-        verificationParams: [{
-          key: 'itemCode',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: 'true',
-          isFormModel: true,
-        }]
+        verificationParams: [
+          {
+            key: 'itemCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: 'true',
+            isFormModel: true
+          }
+        ]
      },
      form: {
        // labelMessage: '信息提示说明！！！',
@ -485,16 +487,16 @@ export const InspectionQ3Detail = useCrudSchemas(
          filterable: true,
          options: [],
          optionsAlias: {
-            labelField: 'productionLineName',
-            valueField: 'productionLineCode'
+            labelField: 'code',
+            valueField: 'code'
          }
        }
      },
      tableForm: {
        type: 'Select',
        filterable: true,
-        valueField: 'productionLineName',
-        labelField: 'productionLineCode'
+        labelField: 'code',
+        valueField: 'code'
      }
    },
    {
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@ -42,24 +42,6 @@ export const Balance = useCrudSchemas(
      },
      isSearch: true
    },
-    {
-      label: '物料名称',
-      field: 'itemName',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isSearch: true
-    },
-    {
-      label: '物料名称',
-      field: 'itemName',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isSearch: true
-    },
    {
      label: '物料类型',
      field: 'itemType',
@ -80,6 +62,15 @@ export const Balance = useCrudSchemas(
      },
      isSearch: true
    },
+    {
+      label: '供应商批次',
+      field: 'altBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: false
+    },
    {
      label: '包装号',
      field: 'packingNumber',
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@ -680,6 +680,14 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
+  {
+    label: '供应商批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  {
    label: '包装号',
    field: 'packingNumber',
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
@ -473,6 +473,14 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
+  {
+    label: '供应商批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  {
    label: '从包装号',
    field: 'fromPackingNumber',
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@ -122,8 +122,8 @@ if ( routeName.value == 'OktoholdRequestMain') {
    // toInventoryStatus:'HOLD',
    businessType :'OkToHold'
  }
-  // fromInventoryStatus.value = 'OK'
-  // toInventoryStatus.value = "HOLD"
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "HOLD"
  businessType.value = 'OkToHold'
  importFileName.value = '物料转隔离申请'
 }
@ -133,8 +133,8 @@ else if ( routeName.value == 'NoktoholdRequestMain') {
    // toInventoryStatus:'HOLD',
    businessType :'NokToHold'
  }
-  // fromInventoryStatus.value = 'NOK'
-  // toInventoryStatus.value = "HOLD"
+  fromInventoryStatus.value = 'NOK'
+  toInventoryStatus.value = "HOLD"
  businessType.value = 'NokToHold'
  importFileName.value = '不合格转隔离申请'
 }
@ -144,8 +144,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
    // toInventoryStatus:'OK',
    businessType :'HoldToOk'
  }
-  // fromInventoryStatus.value = 'HOLD'
-  // toInventoryStatus.value = "OK"
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
  businessType.value = 'HoldToOk'
  importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
@ -154,8 +154,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
    // toInventoryStatus:'SCRAP',
    businessType:'HoldToScrap'
  }
-  // fromInventoryStatus.value = 'HOLD'
-  // toInventoryStatus.value = "SCRAP"
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
  businessType.value = 'HoldToScrap'
  importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
@ -164,8 +164,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
    // toInventoryStatus:'SCRAP',
    businessType :'OkToScrap'
  }
-  // fromInventoryStatus.value = 'OK'
-  // toInventoryStatus.value = "SCRAP"
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
  businessType.value = 'OkToScrap'
  importFileName.value = '合格转报废申请'
 }
@ -175,8 +175,8 @@ else if ( routeName.value == 'ScraptoholdRequestMain') {
    // toInventoryStatus:'HOLD',
    businessType :'ScrapToHold'
  }
-  // fromInventoryStatus.value = 'SCRAP'
-  // toInventoryStatus.value = "HOLD"
+  fromInventoryStatus.value = 'SCRAP'
+  toInventoryStatus.value = "HOLD"
  businessType.value = 'ScrapToHold'
  importFileName.value = '报废转隔离申请'
 } else {
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@ -123,8 +123,8 @@ if ( routeName.value == 'OktoholdRequestMain') {
    // toInventoryStatus:'HOLD',
    businessType :'OkToHold'
  }
-  // fromInventoryStatus.value = 'OK'
-  // toInventoryStatus.value = "HOLD"
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "HOLD"
  businessType.value = 'OkToHold'
  importFileName.value = '物料转隔离申请'
 }
@ -134,8 +134,8 @@ else if ( routeName.value == 'NoktoholdRequestMain') {
    // toInventoryStatus:'HOLD',
    businessType :'NokToHold'
  }
-  // fromInventoryStatus.value = 'NOK'
-  // toInventoryStatus.value = "HOLD"
+  fromInventoryStatus.value = 'NOK'
+  toInventoryStatus.value = "HOLD"
  businessType.value = 'NokToHold'
  importFileName.value = '不合格转隔离申请'
 }
@ -145,8 +145,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
    // toInventoryStatus:'OK',
    businessType :'HoldToOk'
  }
-  // fromInventoryStatus.value = 'HOLD'
-  // toInventoryStatus.value = "OK"
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
  businessType.value = 'HoldToOk'
  importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
@ -155,8 +155,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
    // toInventoryStatus:'SCRAP',
    businessType:'HoldToScrap'
  }
-  // fromInventoryStatus.value = 'HOLD'
-  // toInventoryStatus.value = "SCRAP"
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
  businessType.value = 'HoldToScrap'
  importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
@ -165,8 +165,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
    // toInventoryStatus:'SCRAP',
    businessType :'OkToScrap'
  }
-  // fromInventoryStatus.value = 'OK'
-  // toInventoryStatus.value = "SCRAP"
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
  businessType.value = 'OkToScrap'
  importFileName.value = '合格转报废申请'
 }
@ -176,8 +176,8 @@ else if ( routeName.value == 'ScraptoholdRequestMain') {
    // toInventoryStatus:'HOLD',
    businessType :'ScrapToHold'
  }
-  // fromInventoryStatus.value = 'SCRAP'
-  // toInventoryStatus.value = "HOLD"
+  fromInventoryStatus.value = 'SCRAP'
+  toInventoryStatus.value = "HOLD"
  businessType.value = 'ScrapToHold'
  importFileName.value = '报废转隔离申请'
 } else {
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@ -116,15 +116,76 @@ const { tableObject, tableMethods } = useTable({
  getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口
 })

-tableObject.params = {
-  // fromInventoryStatus: 'OK',
-  // toInventoryStatus:'HOLD',
-  businessType :'OkToHold'
+if ( routeName.value == 'OktoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
+    businessType :'OkToHold'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'OkToHold'
+  importFileName.value = '物料转隔离申请'
+}
+else if ( routeName.value == 'NoktoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
+  }
+  fromInventoryStatus.value = 'NOK'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
+    businessType :'HoldToOk'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
+  businessType.value = 'HoldToOk'
+  importFileName.value = '隔离转合格申请'
+} else if ( routeName.value == 'HoldtoscrapRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
+  businessType.value = 'HoldToScrap'
+  importFileName.value = '隔离转报废申请'
+} else if ( routeName.value == 'OktoscrapRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
+  businessType.value = 'OkToScrap'
+  importFileName.value = '合格转报废申请'
+}
+else if ( routeName.value == 'ScraptoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
+  }
+  fromInventoryStatus.value = 'SCRAP'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
+  importFileName.value = '报废转隔离申请'
+} else {
+  tableObject.params = {
+    businessType :'Move'
+  }
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
 }
-// fromInventoryStatus.value = 'OK'
-// toInventoryStatus.value = "HOLD"
-businessType.value = 'OkToHold'
-importFileName.value = '物料转隔离申请'

 InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
  if(item.field == 'fromWarehouseCode') {
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@ -616,6 +616,24 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
    isTableForm: false,
    isForm: false,
  },
+  {
+    label: '供应商批次',
+    field: 'altBatch',
+    sort: 'custom',
+    isForm:false,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
  {
    label: '从包装号',
    field: 'fromPackingNumber',
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@ -80,6 +80,9 @@
    :buttondataTable="buttondataTable"
    @tableFormButton="tableFormButton"
    :detailValidate="detailValidate"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
  />

 <!-- BOM弹窗列表 -->
@ -688,6 +691,11 @@ const openForm =async (type: string, row?: number) => {
      if (item.field == 'scrappingReason'){
        item.value = ''
      }
+      if(item.field == 'productionLineCode'){
+        item.componentProps.disabled = false
+        item.componentProps.enterSearch = true
+        item.componentProps.isSearchList = true
+      }
    })
  }
  if(type == 'update'){
@ -696,6 +704,15 @@ const openForm =async (type: string, row?: number) => {
        item.componentProps.disabled = true
        item.componentProps.isSearchList = false
      }
+      if(item.field == 'productionLineCode'){
+        item.componentProps.enterSearch = true
+        item.componentProps.isSearchList = true
+      }
+      if(item.field == 'productionLineCode'){
+        item.componentProps.disabled = true
+        item.componentProps.enterSearch = false
+        item.componentProps.isSearchList = false
+      }
    })
  }
  formRef.value.open(type, row)
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@ -375,4 +375,7 @@ const changeTabs = (data) =>{
 onMounted(async () => {
  getList()
 })
+onActivated(() => {
+  getList()
+})
 </script>
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@ -197,4 +197,7 @@ const searchFormClick = (searchData) => {
 onMounted(async () => {
  getList()
 })
+onActivated(() => {
+  getList()
+})
 </script>
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@ -122,7 +122,10 @@ const { tableObject, tableMethods } = useTable({

 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
-
+watch(()=>tableObject.currentPage,async ()=>{
+  tableObjectHead.currentPage = tableObject.currentPage
+  updateDateTableColumns()
+})
 // 列表头部按钮
 const HeadButttondata = [
  defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@ -130,7 +130,10 @@ const { tableObject, tableMethods } = useTable({

 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
-
+watch(()=>tableObject.currentPage,async ()=>{
+  tableObjectHead.currentPage = tableObject.currentPage
+  updateDateTableColumns()
+})
 // 列表头部按钮
 const HeadButttondata = [
  defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@ -306,4 +306,7 @@ const searchFormClick = (searchData) => {
 onMounted(async () => {
  getList()
 })
+onActivated(() => {
+  getList()
+})
 </script>
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@ -1234,7 +1234,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   
  },
  {
-    label: '折扣金额',
+    label: '返利未税金额',//折扣金额
    field: 'discountAmount1',
    formatter: accountantFormart,
   
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@ -106,7 +106,9 @@
            adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
            beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //未税差额：未税金额-系统未税金额-折扣金额
            taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
-            totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff // 价税合计差额=未税差额+税额差异
+            totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异
+            rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),
+            rebateTotal:rebateTax+discountAmount1
          })
        } else if (formType == 'create') {
          // 新增
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@ -1523,7 +1523,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   
  },
  {
-    label: '折扣金额',
+    label: '返利未税金额',
    field: 'discountAmount1',
    formatter: accountantFormart,
   
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@ -426,7 +426,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
  //   }
  // },
  {
-    label: '折扣金额',
+    label: '返利未税金额',
    field: 'discountAmount1',
    formatter: accountantFormart,
    table: {
@ -1505,7 +1505,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   
  },
  {
-    label: '折扣金额',
+    label: '返利未税金额',
    field: 'discountAmount1',
    formatter: accountantFormart,