diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 66cb6ddab..233002ba5 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -94,5 +94,11 @@ export const importTemplate = () => { // 获得库位代码筛选出的库存余额分页 export const selectLocationTypeToBalance = async (params) => { - return request.get({ url: '/wms/balance/pageLocationCodeToBalance', params}) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/pageLocationCodeToBalanceSenior', data }) + } else { + return request.get({ url: '/wms/balance/pageLocationCodeToBalance', params}) + } } diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 66cbfde72..299c1070b 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -67,6 +67,7 @@ const typeRef = ref() const rowRef = ref() const allSchemasRef = ref() const multipleBol = ref(false) +const searchConditionRef = ref() const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any ) => { searchDialogVisible.value = true formFieldRef.value = formField @@ -84,6 +85,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s getListApi: getPage.value // 分页接口 }) tableObjectRef.value = tableObject + searchConditionRef.value = searchCondition if (searchCondition) tableObjectRef.value.params = searchCondition; // 获得表格的各种操作 @@ -98,16 +100,24 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s const searchFormClick = (searchData) => { // console.log(99, rowRef.value) // console.log(100, searchData) - // console.log(101, tableObjectRef.value.params) - + // console.log(101, searchConditionRef.value) // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters - if (tableObjectRef.value.params) { - Object.keys(tableObjectRef.value.params).forEach(key => { - searchData.filters.push({ - action: "==", - column: key, - value: tableObjectRef.value.params[key] - }) + if (searchConditionRef.value) { + Object.keys(searchConditionRef.value).forEach(key => { + if (searchData.filters) { + searchData.filters.push({ + action: "==", + column: key, + value: searchConditionRef.value[key] + }) + // } + } else { + searchData.filters = [{ + action: "==", + column: key, + value: searchConditionRef.value[key] + }] + } }); } tableObjectRef.value.params = { diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 426f9b7b2..80ca6ddb2 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -55,6 +55,7 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" + :isShowButton = isShowButton /> @@ -113,8 +114,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV[formField] = val[0][searchField] if(formField == 'deliverPlanNumber') { setV['deliverPlanNumber'] = val[0]['number'] + if(setV['deliverPlanNumber'] != null){ + isShowButton.value = false + } setV['customerCode'] = val[0]['customerCode'] - isShowButton.value = false // 获取子表数据 getBomDisassemble DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id']) .then(res => { @@ -293,12 +296,16 @@ const openForm =async (type: string, row?: number) => { if(type == "update"){ DeliverRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'deliverPlanNumber') { - item.componentProps.isSearchList = false + item.componentProps.isSearchList = false, + item.componentProps.disabled = true } }) }else { - item.componentProps.isSearchList = true, - item.componentProps.disabled = true + DeliverRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'deliverPlanNumber') { + item.componentProps.isSearchList = true + } + }) } tableData.value = [] // 重置明细数据 formRef.value.open(type, row) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index 7dc06c185..bbd5757bc 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -17,7 +17,10 @@ import * as TeamApi from '@/api/wms/team' import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data' import * as ProductionlineitemApi from '@/api/wms/productionlineitem' -import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' +// import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/bom/bom.data' + +// import * as BomApi from '@/api/wms/bom' +import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data' import * as WorkStationApi from '@/api/wms/workstation' import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data' @@ -392,8 +395,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物品代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '生产线物品关系信息【原料】【半成品】', // 查询弹窗标题 - searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchTitle: '物品清单信息', // 查询弹窗标题 + searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类 searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法 searchCondition: [{ key:'productionLineCode', @@ -406,8 +409,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ isInpuFocusShow: true, searchListPlaceholder: '请选择物品代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '生产线物品关系信息【原料】【半成品】', // 查询弹窗标题 - searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchTitle: '物品清单信息', // 查询弹窗标题 + searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类 searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法 searchCondition: [{ key:'productionLineCode', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index 2328ea65c..373ac82b0 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -700,7 +700,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([ }, }, { - label: '库存状态', + label: '从库存状态', field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', @@ -710,6 +710,17 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '订单号', field: 'poNumber', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index cf8fadf58..95f638315 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -275,6 +275,20 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['fromBatch'] = val[0]['batch'] setV['fromInventoryStatus'] = val[0]['inventoryStatus'] setV['fromLocationCode'] = val[0]['locationCode'] + setV['uom'] = val[0]['uom'] + if(routeName.value == 'OktoholdRequestMain'){ + row['toInventoryStatus'] = "HOLD" + }else if ( routeName.value == 'HoldtookRequestMain') { + row['toInventoryStatus'] = "OK" + }else if ( routeName.value == 'HoldtoscrapRequestMain') { + row['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'OktoscrapRequestMain') { + row['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'ScraptoholdRequestMain') { + row['toInventoryStatus'] = "HOLD" + }else{ + row['toInventoryStatus'] = null + } } else { setV[formField] = val[0][searchField] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 644885910..5776c9000 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -465,6 +465,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -506,6 +511,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -574,6 +584,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -618,6 +633,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { type: 'Select' + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -629,6 +649,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -683,6 +708,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( tableForm: { disabled: true, type: 'Select' + }, + form: { + componentProps: { + disabled: true + } } }, { diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 33bb6aed7..871093710 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -321,6 +321,11 @@ const handleDeleteTable = (item, index) => { // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + if(data.subList.find(item => (item.qty <= 0))) { + message.warning('数量必须大于0') + formRef.value.formLoading = false + return + } try { if (formType === 'create') { await ProductputawayRequestMainApi.createProductputawayRequestMain(data) diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index d325fbadd..8ef790286 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -611,13 +611,13 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm:{ type: 'InputNumber', - min: 1, + min: 0, precision: 6 } },