From 5f630f1f1bb886404ae410c1c5908d10deb13534 Mon Sep 17 00:00:00 2001 From: wb_zhanghaoyuan Date: Wed, 25 Jun 2025 11:52:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E9=87=87=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseordermake/PurchaseOrderMakeController.java | 2 +- .../vo/PurchaseOrderMakeSaveReqVO.java | 2 -- .../partpurchaseorder/PartPurchaseOrderService.java | 2 +- .../PartPurchaseOrderServiceImpl.java | 9 ++++----- .../src/views/heli/partpurchasecheck/detail.vue | 10 ++++++---- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java index f0a57bc..864ab65 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java @@ -115,7 +115,7 @@ public class PurchaseOrderMakeController { @PutMapping("/updatePartCheckNo") @Operation(summary = "更新采购审批驳回状态") - public CommonResult updatePartCheckNo(@Valid @RequestBody PurchaseOrderMakeSaveReqVO updateReqVO) { + public CommonResult updatePartCheckNo(@Valid PurchaseOrderMakeSaveReqVO updateReqVO) { return success(partPurchaseOrderService.updatePartCheckStatusNo(updateReqVO)); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java index cea2251..8737291 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java @@ -17,7 +17,6 @@ public class PurchaseOrderMakeSaveReqVO { private Long id; @Schema(description = "采购单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "采购单号不能为空") private String purchaseNo; @Schema(description = "采购合同号") @@ -27,7 +26,6 @@ public class PurchaseOrderMakeSaveReqVO { private Boolean purchaseType; @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "采购物类型，1物料，2加工件不能为空") private Boolean goodsType; @Schema(description = "结算币种", example = "2") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java index 7826278..47ee9d9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java @@ -52,7 +52,7 @@ public interface PartPurchaseOrderService { /** * 更新采购单审批状态为驳回 * - * @param id + * @param updateReqVO * @return 更新采购单审批状态 */ boolean updatePartCheckStatusNo(PurchaseOrderMakeSaveReqVO updateReqVO); 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 e5ae36c..a4e1998 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 @@ -82,6 +82,8 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ // purchaseOrderNoDetailDO.setBoomSpec(detailDO.getBoomSpec()); PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = BeanUtils.toBean(detailDO, PurchaseOrderNoDetailDO.class); purchaseOrderNoDetailDO.setId(null); + purchaseOrderNoDetailDO.setCreateTime(null); + purchaseOrderNoDetailDO.setUpdateTime(null); purchaseOrderNoDetailDO.setPurchaseOrderId(purchaseOrderId); purchaseOrderNoDetailDO.setPurchaseRemAmount(detailDO.getPurchaseAmount()); purchaseOrderNoDetailMapper.insert(purchaseOrderNoDetailDO); @@ -126,15 +128,12 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ PurchaseOrderMakeDO purchaseOrderMakeDO = new PurchaseOrderMakeDO(); purchaseOrderMakeDO.setId(updateReqVO.getId()); purchaseOrderMakeDO.setStatus(3); - purchaseOrderMakeDO.setDeleted(true); purchaseOrderMakeMapper.updateById(purchaseOrderMakeDO); + purchaseOrderMakeMapper.deleteById(purchaseOrderMakeDO); List list= purchaseOrderMakeDetailMapper.selectList("purchase_order_id", updateReqVO.getId()); list.forEach(detailDO -> { - PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = new PurchaseOrderNoDetailDO(); - purchaseOrderNoDetailDO.setId(detailDO.getPurchaseOrderNoDetailId()); - purchaseOrderNoDetailDO.setDeleted(true); - purchaseOrderNoDetailMapper.updateById(purchaseOrderNoDetailDO); + purchaseOrderNoDetailMapper.deleteById(detailDO.getId()); }); List materialPlanBoomDOs= materialPlanBoomMapper.selectList("project_purchase_order_make_id", updateReqVO.getId()); 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 e15738b..d415167 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 @@ -60,8 +60,8 @@
- 批 准 - 驳 回 + 批 准 + 驳 回
@@ -124,12 +124,13 @@ const total = ref(0) // 列表的总页数 const subBoomFormLoading = ref(false) const subBoomFormRef = ref() const updateParams = reactive({ - id: formData.value.id, + id: query.id, reason: undefined }) -const approve = async (contractNo: string) => { +const approve = async () => { await PartPurchaseOrderApi.updatePurchaseOrderMake(formData.value.id) + console.log("批准成功") } const handleReject = async () => { @@ -156,6 +157,7 @@ const reject = async(reason) => { updateParams.reason = reason // 这里可以执行提交驳回逻辑 await PartPurchaseOrderApi.updatePurchaseOrderMakeNo(updateParams) + console.log("驳回成功") }