Browse Source

去掉库存余额校验

master_hella_20240701
zhang_li 5 months ago
parent
commit
ec0e85d799
  1. 2
      src/api/wms/balance/index.ts
  2. 55
      src/api/wms/business/business.ts
  3. 2
      src/components/TableForm/src/TableForm.vue
  4. 2
      src/views/eam/equipmentRepairRecordMain/index.vue
  5. 1
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
  6. 1
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
  7. 2
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
  8. 1
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
  9. 1
      src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

2
src/api/wms/balance/index.ts

@ -192,5 +192,5 @@ export const getBalanceByBusinessTypeByItemType = async (params) => {
} }
// 根据code获取数据列表 // 根据code获取数据列表
export const getBalanceItemListByCodes = async (data) => { 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 })
} }

55
src/api/wms/business/business.ts

@ -139,20 +139,20 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for
routeName == 'InventorymoveRequestMain' || routeName == 'InventorymoveRequestMain' ||
routeName == 'InventorychangeRequestMain' routeName == 'InventorychangeRequestMain'
) { ) {
//合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请参数稍有不同 // //合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请参数稍有不同
if ( // if (
routeName == 'OktoholdRequestMain' || // routeName == 'OktoholdRequestMain' ||
routeName == 'HoldtookRequestMain' || // routeName == 'HoldtookRequestMain' ||
routeName == 'HoldtoscrapRequestMain' || // routeName == 'HoldtoscrapRequestMain' ||
routeName == 'OktoscrapRequestMain' || // routeName == 'OktoscrapRequestMain' ||
routeName == 'ScraptoholdRequestMain' || // routeName == 'ScraptoholdRequestMain' ||
routeName == 'InventorymoveRequestMain' || // routeName == 'InventorymoveRequestMain' ||
routeName == 'InventorychangeRequestMain' // routeName == 'InventorychangeRequestMain'
) { // ) {
searchField = 'packingNumber' // searchField = 'packingNumber'
params.value.packingNumber = val?.trim() // params.value.packingNumber = val?.trim()
} // }
pageApi.value = getBalanceItemListByCodes // pageApi.value = getBalanceItemListByCodes
} else if ( } else if (
routeName == 'RepleinshRequestMain' || routeName == 'RepleinshRequestMain' ||
routeName == 'IssueRequestMain' || routeName == 'IssueRequestMain' ||
@ -297,12 +297,13 @@ export const FormBlur = async (formField, val,routeName,formRef,detailData,formS
packUnit: val.trim() packUnit: val.trim()
} }
pageApi.value = getItemPackageunitListByCodes 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 obj = {}
let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps
.searchCondition //获取data.ts参数信息 .searchCondition //获取data.ts参数信息
@ -415,14 +416,16 @@ export const getListByBottonInput = async (headerItem, val,row,routeName,formRef
customerCode: formRef.formModel.customerCode, customerCode: formRef.formModel.customerCode,
itemCodes: val?.trim() itemCodes: val?.trim()
} }
} else if (routeName == 'UnplannedissueRequestMain') {
// 计划外出库
pageApi.value = getBalanceItemListByCodes
params.value = {
packingNumber: val?.trim()
} }
field = 'packingNumber' // else if (routeName == 'UnplannedissueRequestMain') {
} else { // // 计划外出库
// pageApi.value = getBalanceItemListByCodes
// params.value = {
// packingNumber: val?.trim()
// }
// field = 'packingNumber'
// }
else {
params.value.codes = val?.trim() params.value.codes = val?.trim()
pageApi.value = getItemListByCodes pageApi.value = getItemListByCodes
} }

2
src/components/TableForm/src/TableForm.vue

@ -333,7 +333,7 @@
<Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer;" /> <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer;" />
<div>{{t('ts.批量删除')}}</div> <div>{{t('ts.批量删除')}}</div>
</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-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加"/>
<el-button type="primary" style="margin-left: 10px" @click="batchAdd">{{t('批量添加')}}</el-button> <el-button type="primary" style="margin-left: 10px" @click="batchAdd">{{t('批量添加')}}</el-button>
</div> </div>

2
src/views/eam/equipmentRepairRecordMain/index.vue

@ -240,7 +240,7 @@ const openRepairExperience = (type: string, row?: any) => {
const repairExperienceFormsSuccess = async (formType, data) => { const repairExperienceFormsSuccess = async (formType, data) => {
console.log(data) console.log(data)
const data1 = { const data1 = {
repairNumber: data.number, repairRecordNumber: data.recordNo,
name: data.name, name: data.name,
content: data.content, content: data.content,
masterId: data.id, masterId: data.id,

1
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@ -480,7 +480,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
tableForm:{ tableForm:{
enterSearch:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装号', searchListPlaceholder: '请选择包装号',
searchField: 'packingNumber', searchField: 'packingNumber',

1
src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@ -619,7 +619,6 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
tableForm:{ tableForm:{
enterSearch:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装号', searchListPlaceholder: '请选择包装号',
searchField: 'packingNumber', searchField: 'packingNumber',

2
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@ -383,7 +383,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150 width: 150
}, },
tableForm:{ tableForm:{
enterSearch:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号', searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber', searchField: 'packingNumber',
@ -401,7 +400,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
enterSearch:true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号', searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber', searchField: 'packingNumber',

1
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@ -545,7 +545,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
tableForm:{ tableForm:{
enterSearch:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号', searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber', searchField: 'packingNumber',

1
src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@ -605,7 +605,6 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
width: 150 width: 150
}, },
tableForm:{ tableForm:{
enterSearch:true,
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选择包装号', searchListPlaceholder: '请选择包装号',
searchField: 'packingNumber', searchField: 'packingNumber',

Loading…
Cancel
Save