Browse Source

WMS bug:HL-5847 隔离转合格、物料隔离,导入提示导入失败,应弹报错的excel

hella_online_20240906
gaojs 3 months ago
parent
commit
1539bb7d4a
  1. 4
      src/api/wms/inventorymoveRequestMain/index.ts
  2. 24
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  3. 24
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
  4. 77
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue

4
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' })
}

24
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 {

24
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 {

77
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') {

Loading…
Cancel
Save