licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

零件采购单审批

Browse Source
This commit is contained in:
wb_zhanghaoyuan 2025-06-25 11:52:26 +08:00
parent 1d17fc5d3c
commit 5f630f1f1b
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java
View File

@ -115,7 +115,7 @@ public class PurchaseOrderMakeController {
@PutMapping("/updatePartCheckNo")
@Operation(summary = "更新采购审批驳回状态")
public CommonResult<Boolean> updatePartCheckNo(@Valid @RequestBody PurchaseOrderMakeSaveReqVO updateReqVO) {
public CommonResult<Boolean> updatePartCheckNo(@Valid PurchaseOrderMakeSaveReqVO updateReqVO) {
return success(partPurchaseOrderService.updatePartCheckStatusNo(updateReqVO));
}

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java
View File

@ -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")

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java
View File

@ -52,7 +52,7 @@ public interface PartPurchaseOrderService {
/**
* 更新采购单审批状态为驳回
*
* @param id
* @param updateReqVO
* @return 更新采购单审批状态
*/
boolean updatePartCheckStatusNo(PurchaseOrderMakeSaveReqVO updateReqVO);

9
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java
View File

@ -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<PurchaseOrderMakeDetailDO> 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<MaterialPlanBoomDO> materialPlanBoomDOs= materialPlanBoomMapper.selectList("project_purchase_order_make_id", updateReqVO.getId());

10
mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue
View File

@ -60,8 +60,8 @@
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button @click="approve(formData.contractNo)" size="large">批 准</el-button>
<el-button @click="handleReject" size="large">驳 回</el-button>
<el-button v-if="formData.status === 1" @click="approve" size="large">批 准</el-button>
<el-button v-if="formData.status === 1" @click="handleReject" size="large">驳 回</el-button>
</div>
</el-card>
@ -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("驳回成功")
}