去掉库存余额校验

3 months ago · ec0e85d799
9 changed files with 34 additions and 37 deletions
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@ -192,5 +192,5 @@ export const getBalanceByBusinessTypeByItemType = async (params) => {
 }
 // 根据code获取数据列表
 export const getBalanceItemListByCodes = async (data) => {
-    return await request.get({ url: `/wms/balance/listByCodes?itemCode=` +( data.itemCode?data.itemCode:'') +  '&batch='+(data.batch?data.batch:'')  +  '&locationCode='+(data.locationCode?data.locationCode:'' )  +  '&packingNumber='+(data.packingNumber?data.packingNumber:'') +  '&warehouseCode='+(data.warehouseCode?data.warehouseCode:'')   })
+    return await request.get({ url: `/wms/balance/listByCodes`,data })
  }
--- a/src/api/wms/business/business.ts
+++ b/src/api/wms/business/business.ts
@ -139,20 +139,20 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for
          routeName == 'InventorymoveRequestMain' ||
          routeName == 'InventorychangeRequestMain'
        ) {
-          //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同
-          if (
-            routeName == 'OktoholdRequestMain' ||
-            routeName == 'HoldtookRequestMain' ||
-            routeName == 'HoldtoscrapRequestMain' ||
-            routeName == 'OktoscrapRequestMain' ||
-            routeName == 'ScraptoholdRequestMain' ||
-            routeName == 'InventorymoveRequestMain' ||
-            routeName == 'InventorychangeRequestMain'
-          ) {
-            searchField = 'packingNumber'
-            params.value.packingNumber = val?.trim()
-          }
-          pageApi.value = getBalanceItemListByCodes
+          // //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同
+          // if (
+          //   routeName == 'OktoholdRequestMain' ||
+          //   routeName == 'HoldtookRequestMain' ||
+          //   routeName == 'HoldtoscrapRequestMain' ||
+          //   routeName == 'OktoscrapRequestMain' ||
+          //   routeName == 'ScraptoholdRequestMain' ||
+          //   routeName == 'InventorymoveRequestMain' ||
+          //   routeName == 'InventorychangeRequestMain'
+          // ) {
+          //   searchField = 'packingNumber'
+          //   params.value.packingNumber = val?.trim()
+          // }
+          // pageApi.value = getBalanceItemListByCodes
        } else if (
          routeName == 'RepleinshRequestMain' ||
          routeName == 'IssueRequestMain' ||
@ -297,12 +297,13 @@ export const FormBlur = async (formField, val,routeName,formRef,detailData,formS
          packUnit: val.trim()
        }
        pageApi.value = getItemPackageunitListByCodes
-      } else if (formField == 'fromPackingNumber') {
-        params.value = {
-          packingNumber: val?.trim()
-        }
-        pageApi.value = getBalanceItemListByCodes
      } 
+      // else if (formField == 'fromPackingNumber') {
+      //   params.value = {
+      //     packingNumber: val?.trim()
+      //   }
+      //   pageApi.value = getBalanceItemListByCodes
+      // }
      let obj = {}
      let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps
        .searchCondition //获取data.ts参数信息
@ -415,14 +416,16 @@ export const getListByBottonInput = async (headerItem, val,row,routeName,formRef
      customerCode: formRef.formModel.customerCode,
      itemCodes: val?.trim()
    }
-  } else if (routeName == 'UnplannedissueRequestMain') {
-    // 计划外出库
-    pageApi.value = getBalanceItemListByCodes
-    params.value = {
-      packingNumber: val?.trim()
-    }
-    field = 'packingNumber'
-  } else {
+  } 
+  // else if (routeName == 'UnplannedissueRequestMain') {
+  //   // 计划外出库
+  //   pageApi.value = getBalanceItemListByCodes
+  //   params.value = {
+  //     packingNumber: val?.trim()
+  //   }
+  //   field = 'packingNumber'
+  // } 
+  else {
    params.value.codes = val?.trim()
    pageApi.value = getItemListByCodes
  }
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@ -333,7 +333,7 @@
        <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer;" />
        <div>{{t('ts.批量删除')}}</div>
      </div>
-      <div class="p-12px" v-if="routeName == 'PurchaseMain'||routeName == 'ProductionMain'||routeName == 'ZZBJDeliverPlanMain'||routeName == 'DeliverPlanMain'||routeName == 'DeliverRequestMain'||routeName == 'ZZBJDeliverRequestMain'||routeName == 'UnplannedissueRequestMain'||routeName == 'UnplannedreceiptRequestMain'">
+      <div class="p-12px" v-if="routeName == 'PurchaseMain'||routeName == 'ProductionMain'||routeName == 'ZZBJDeliverPlanMain'||routeName == 'DeliverPlanMain'||routeName == 'DeliverRequestMain'||routeName == 'ZZBJDeliverRequestMain'||routeName == 'UnplannedreceiptRequestMain'">
        <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加"/>
        <el-button type="primary" style="margin-left: 10px" @click="batchAdd">{{t('批量添加')}}</el-button>
      </div>
--- a/src/views/eam/equipmentRepairRecordMain/index.vue
+++ b/src/views/eam/equipmentRepairRecordMain/index.vue
@ -240,7 +240,7 @@ const openRepairExperience = (type: string, row?: any) => {
 const repairExperienceFormsSuccess = async (formType, data) => {
  console.log(data)
  const data1 = {
-    repairNumber: data.number,
+    repairRecordNumber: data.recordNo,
    name: data.name,
    content: data.content,
    masterId: data.id,
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@ -480,7 +480,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
    tableForm:{
-      enterSearch:true,
      isInpuFocusShow: true, // 开启查询弹窗
      searchListPlaceholder: '请选择包装号',
      searchField: 'packingNumber',
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@ -619,7 +619,6 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
      width: 150
    },
    tableForm:{
-      enterSearch:true,
      isInpuFocusShow: true, // 开启查询弹窗
      searchListPlaceholder: '请选择包装号',
      searchField: 'packingNumber',
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@ -383,7 +383,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
      width: 150
    },
    tableForm:{
-      enterSearch:true,
      isInpuFocusShow: true, // 开启查询弹窗
      searchListPlaceholder: '请选择从包装号',
      searchField: 'packingNumber',
@ -401,7 +400,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
-        enterSearch:true,
        isSearchList: true, // 开启查询弹窗
        searchListPlaceholder: '请选择从包装号',
        searchField: 'packingNumber',
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@ -545,7 +545,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
      width: 150
    },
    tableForm:{
-      enterSearch:true,
      isInpuFocusShow: true, // 开启查询弹窗
      searchListPlaceholder: '请选择从包装号',
      searchField: 'packingNumber',
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@ -605,7 +605,6 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
      width: 150
    },
    tableForm:{
-      enterSearch:true,
      isInpuFocusShow: true,
      searchListPlaceholder: '请选择包装号',
      searchField: 'packingNumber',