diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageReqVO.java index b951167..99c5e68 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageReqVO.java @@ -19,6 +19,9 @@ public class PartPurchaseOrderPageReqVO extends PageParam { @Schema(description = "自增字段,唯一") private Long id; + @Schema(description = "采购单id") + private Long purchaseOrderId; + @Schema(description = "物料计划单号") private String projectMaterialPlanNo; @@ -68,4 +71,10 @@ public class PartPurchaseOrderPageReqVO extends PageParam { private String ownerName; @Schema(description = "供应商名称") private String supplierName; + @Schema(description = "采购单号") + private String contractNo; + @Schema(description = "采购单类型,1物料,2加工件") + private Integer goodsType; + @Schema(description = "单据状态,0 待送审,1已送审,2已审核,3已打回 ,默认是1") + private Integer documentStatus; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageRespVO.java index 8f332d7..a2bb011 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageRespVO.java @@ -147,4 +147,28 @@ public class PartPurchaseOrderPageRespVO extends BaseDO { * 工序名称 */ private String procedureName; + /** + * 采购单号 + */ + private String contractNo; + /** + * 采购单类型,1物料,2加工件 + */ + private Integer goodsType; + /** + * 客户简码 + */ + private String brief; + /** + * 项目名称 + */ + private String projectName; + /** + * 项目名称简码 + */ + private String projectNameSim; + /** + * 单据状态,0 待送审,1已送审,2已审核,3已打回 ,默认是1 + */ + private Integer status; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java index db370e8..af7e75a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java @@ -68,6 +68,12 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX selectPartPurchaseOrderPage(PartPurchaseOrderPageReqVO pageReqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(PurchaseOrderMakeDetailDO.class) + .select(PurchaseOrderMakeDO::getContractNo, + PurchaseOrderMakeDO::getGoodsType, + PurchaseOrderMakeDO::getBrief, + PurchaseOrderMakeDO::getProjectName, + PurchaseOrderMakeDO::getProjectNameSim, + PurchaseOrderMakeDO::getStatus) .select("c.nickname as duEmpName") .select("d.name as supplierName") .select("e.name as procedureName") @@ -79,6 +85,9 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX { export const submitForm = async (data) => { return await request.post({ url: `/heli/purchase-order-no/submit`, data }) } + +// 查询采购单主分页 +export const getPurchaseOrderMake = async (id: number) => { + return await request.get({ url: `/heli/purchase-order-make/get?id=` + id }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue index 4370a74..376d126 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue @@ -17,22 +17,12 @@ - - + + - - - - - - - - - - @@ -41,24 +31,26 @@ - - + + + + + - - - - - - + + + + + + + @@ -68,7 +60,8 @@ @@ -93,6 +86,8 @@ import { useUserStore } from '@/store/modules/user' import { useTagsViewStore } from '@/store/modules/tagsView' import MaterialSelect from '@/views/heli/hlvuestyle/materialSelect.vue' import booms from './boom.vue' +import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder"; +import {getPartPage} from "@/api/heli/partpurchaseorder"; const reload: any = inject('reload') const { t } = useI18n() // 国际化 @@ -105,7 +100,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 const formData = ref({ id: undefined, - projectMaterialPlanNo: undefined, + contractNo: undefined, projectId: undefined, projectPlanId: undefined, projectPlanNo: undefined, @@ -142,18 +137,18 @@ const userList = ref([]) // 用户列表 const queryParams = reactive({ pageNo: 1, pageSize: 10, - projectMaterialPlanId: query.id + purchaseOrderId: query.id }) // 页面数据加载初始化 onMounted(async () => { // 获取物料需求计划信息 - formData.value = await MaterialPlanApi.getMaterialPlan(query.id) + formData.value = await PartPurchaseOrderApi.getPurchaseOrderMake(query.id) getList(); }) const getList = async () => { loading.value = true try { - const data = await MaterialPlanBoomApi.getMaterialPlanBoomPages(queryParams) + const data = await PartPurchaseOrderApi.getPartPage(queryParams) formData.value.matBoomDOList = data.list total.value = data.total } finally { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue index 84b5028..3917910 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue @@ -25,8 +25,8 @@ - - + + @@ -48,12 +48,12 @@ - + @@ -61,13 +61,14 @@ @@ -86,6 +87,7 @@ import {DICT_TYPE, getIntDictOptions} from '@/utils/dict' import { dateFormatter1} from '@/utils/formatTime' import * as MaterialPlanApi from '@/api/heli/materialplan' +import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder"; defineOptions({ name: 'MaterialPlan' }) @@ -114,7 +116,7 @@ const queryParams = reactive({ description: undefined, createTime: [], matType:0, - status:1 + documentStatus:1 }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 @@ -123,7 +125,7 @@ const exportLoading = ref(false) // 导出的加载中 const getList = async () => { loading.value = true try { - const data = await MaterialPlanApi.getMaterialPlanPages(queryParams) + const data = await PartPurchaseOrderApi.getPartPage(queryParams) list.value = data.list total.value = data.total } finally { @@ -155,7 +157,7 @@ const openForm = (type: string, id?: number) => { router.push({ path: '/purchase/materialplanedit', query: { id: id } }) break; case 'detail': - router.push({ path: '/purchase/managementdetail', query: { id: id } }) + router.push({ path: '/purchase/PartPurchaseCheckDetail', query: { id: id } }) break; default: break;