diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java index ae2b3c7..e79f76c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java @@ -200,17 +200,11 @@ public class MaterialPlanController { return materialPlanService.delMaterial(id); } -// @PostMapping("/getPartPurchasePages") -// @Operation(summary = "获得零件采购分页") -// public CommonResult> getPartPurchasePages(@Valid @RequestBody MaterialPlanPageReqVO pageReqVO) { -// PageResult pageResult = materialPlanService.getPartPurchasePages(pageReqVO); -// return success(pageResult); -// } - @GetMapping("/getPartPurchasePages") @Operation(summary = "获得零件采购分页") - public CommonResult> getPartPurchasePages() { - String a ="asdij"; - return null; + public CommonResult> getPartPurchasePages(@Valid MaterialPlanPageReqVO pageReqVO) { + PageResult pageResult = materialPlanService.getPartPurchasePages(pageReqVO); + return success(pageResult); } + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java index 5251bdf..bf32841 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.framework.mybatis.core.query.QueryWrapperX; +import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakeSaveReqVO; @@ -27,6 +28,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -111,6 +113,8 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ PurchaseOrderMakeDO purchaseOrderMakeDO = new PurchaseOrderMakeDO(); purchaseOrderMakeDO.setId(id); purchaseOrderMakeDO.setStatus(2); + purchaseOrderMakeDO.setAuditor(SecurityFrameworkUtils.getLoginUserId()); + purchaseOrderMakeDO.setAuditTime(LocalDateTime.now()); purchaseOrderMakeMapper.updateById(purchaseOrderMakeDO); List materialPlanBoomDOs= materialPlanBoomMapper.selectList("project_purchase_order_make_id", id); diff --git a/mes-ui/mes-ui-admin-vue3/package.json b/mes-ui/mes-ui-admin-vue3/package.json index 6fcf106..9a10915 100644 --- a/mes-ui/mes-ui-admin-vue3/package.json +++ b/mes-ui/mes-ui-admin-vue3/package.json @@ -6,7 +6,7 @@ "private": false, "scripts": { "i": "pnpm install", - "dev": "vite --mode dev", + "dev": "vite --mode base", "front": "vite --mode front", "ts:check": "vue-tsc --noEmit", "build:pro": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode pro", diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts index 346afff..f79df3a 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts @@ -95,12 +95,7 @@ export const delMaterial = async (id: number) => { return await request.delete({ url: `/heli/material-plan/delMaterial?id=` + id }) } -// // 查询零件采购分页 -// export const getPartPurchasePages = async (params) => { -// return await request.post({ url: `/heli/material-plan/getPartPurchasePages`, params }) -// } - -// 更新采购单主驳回 -export const getPartPurchasePages = async () => { - return await request.get({ url: `/heli/material-plan/getPartPurchasePage` }) +// 查询零件采购分页 +export const getPartPurchasePages = async (params) => { + return await request.get({ url: `/heli/material-plan/getPartPurchasePages`, params }) } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue index 1c18273..56e1c55 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue @@ -144,10 +144,9 @@ const exportLoading = ref(false) // 导出的加载中 const getList = async () => { loading.value = true try { - // const data = await MaterialPlanApi.getPartPurchasePages(queryParams) - // list.value = data.list - // total.value = data.total - await MaterialPlanApi.getPartPurchasePages() + const data = await MaterialPlanApi.getPartPurchasePages(queryParams) + list.value = data.list + total.value = data.total } finally { loading.value = false } 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 5cc8d65..63984c7 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 @@ -135,13 +135,27 @@ const updateParams = reactive({ reason: undefined }) + + const approve = async () => { + const checkParams = await PartPurchaseOrderApi.getPurchaseOrderMake(query.id) + if (checkParams.status != 1){ + message.warning("该单据状态非待审核,请刷新界面!"); + return; + } + await PartPurchaseOrderApi.updatePurchaseOrderMake(formData.value.id) message.success("提交成功"); getList(); } const handleReject = async () => { + const checkParams = await PartPurchaseOrderApi.getPurchaseOrderMake(query.id) + if (checkParams.status != 1){ + message.warning("该单据状态非待审核,请刷新界面!"); + return; + } + try { const { value, action } = await ElMessageBox.prompt('请输入驳回原因', '提示', { confirmButtonText: '确定',