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 e0397b9..9bc9872 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 @@ -1,6 +1,7 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageReqVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; import com.chanko.yunxi.mes.module.heli.service.partpurchaseorder.PartPurchaseOrderService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -136,7 +137,7 @@ public class PurchaseOrderMakeController { @PostMapping("/createPurchaseOrderMakeAndDetail") @Operation(summary = "零件采购单送审生成") @PreAuthorize("@ss.hasPermission('heli:material-plan:query')") - public CommonResult createPurchaseOrderMakeAndDetail(@Valid @RequestBody List saveReqVOs) { + public CommonResult createPurchaseOrderMakeAndDetail(@Valid @RequestBody List saveReqVOs) { return success(partPurchaseOrderService.createPurchaseOrderMakeAndDetailBatch(saveReqVOs)); } @GetMapping("/review") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java index fd8792a..9b5b2a6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java @@ -195,5 +195,22 @@ public class MaterialPlanBoomDO extends BaseDO { */ @TableField(exist = false) private String projectSubNameSim; + @TableField(exist = false) + private BigDecimal purchaseAmounts; + @TableField(exist = false) + private Long supplierIds; + @TableField(exist = false) + private BigDecimal estimatedPrices; + @TableField(exist = false) + private LocalDateTime arriveTimes; + @TableField(exist = false) + private String descriptions; + @TableField(exist = false) + private BigDecimal theWeight; + /** + * 泡沫否 Y 是 N 否 + */ + @TableField(exist = false) + private String isFoams; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java index fa7a3af..76336aa 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java @@ -20,6 +20,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageMaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; @@ -209,8 +210,11 @@ public interface MaterialPlanBoomMapper extends BaseMapperX .select("p.project_name as projectName","p.name as projectSubName","p.name_sim as projectSubNameSim") .select("d.spec as boomSpec","d.blueprint_no as blueprintNo","d.unit as unit","f.name as supplierName") .select("a.nickname as duEmpName","c.name as procedureName","e.name as compositionName") - .select("t.mat_weight as theWeight") - .select(MaterialPlanDO::getProjectId) + .select("m.the_weight as theWeight") + .select("COALESCE(m.purchase_amount, t.boom_amount) AS purchaseAmounts,m.supplier_id as supplierIds,m.estimated_price as estimatedPrices") + .select("m.arrive_time as arriveTimes,m.description as descriptions") + .select("m.is_foam as isFoams") + .leftJoin(PurchaseOrderMakeDetailDO.class,"m",PurchaseOrderMakeDetailDO::getId,MaterialPlanBoomDO::getProjectPurchaseOrderMakeDetailId) .select(MaterialPlanDO::getBrief, MaterialPlanDO::getCustomerId, MaterialPlanDO::getProjectId, MaterialPlanDO::getProjectNameSim) .leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId) .leftJoin(ProcessBomDetailDO.class,"d",ProcessBomDetailDO::getId,MaterialPlanBoomDO::getBoomDetailId) @@ -233,10 +237,11 @@ public interface MaterialPlanBoomMapper extends BaseMapperX if (Objects.nonNull(pageReqVO.getMplanStatus())) { // 根据 mplanStatus 的值动态设置排序字段 - if (pageReqVO.getMplanStatus() == 0) { - query.orderByAsc(MaterialPlanBoomDO::getCreateTime); - } else { + if (pageReqVO.getMplanStatus() == 1) { query.orderByDesc(MaterialPlanBoomDO::getPurchaseNo); + } else { + query.orderByAsc(MaterialPlanBoomDO::getCreateTime); + } } 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 2a91b66..fde0dcf 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 @@ -5,6 +5,7 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult; 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; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO; import java.util.List; @@ -61,7 +62,7 @@ public interface PartPurchaseOrderService { PageResult getDetail(PartPurchaseOrderPageReqVO partPurchaseOrderPageReqVO); - Boolean createPurchaseOrderMakeAndDetailBatch(List updateReqVOs); + Boolean createPurchaseOrderMakeAndDetailBatch(List updateReqVOs); CommonResult obtainReviewDetails(Long id); } 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 4440bdb..44a3e62 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 @@ -221,11 +221,7 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ .set("mplan_status", 3) .set("project_purchase_order_make_id", null) .set("purchase_no", null) - .set("project_purchase_order_make_detail_id", null) - .set("purchase_amount", BigDecimal.ZERO) - .set("estimated_price", BigDecimal.ZERO) - .set("arrive_time",null) - .set("supplier_id", null); + .set("project_purchase_order_make_detail_id", null); materialPlanBoomMapper.update(updateWrapper); }); return true; @@ -259,12 +255,12 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ } @Override - public Boolean createPurchaseOrderMakeAndDetailBatch(List updateReqVOs) { + public Boolean createPurchaseOrderMakeAndDetailBatch(List updateReqVOs) { if (CollectionUtils.isEmpty(updateReqVOs)) { return false; } - PurchaseOrderMakeSaveReqVO updateReqVO = updateReqVOs.get(0); + MaterialPlanBoomDO boomDO = updateReqVOs.get(0); PurchaseOrderMakeDO purchaseOrderMakeDO = new PurchaseOrderMakeDO(); // 返回 @@ -280,24 +276,22 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ purchaseOrderMakeDO.setStatus(1); purchaseOrderMakeDO.setSubmitUserId(getLoginUser().getId()); purchaseOrderMakeDO.setSubmitTime(LocalDateTime.now()); - purchaseOrderMakeDO.setProjectId(updateReqVO.getProjectId()); - List planDOs = planMapper.selectList("project_id", updateReqVO.getProjectId()); - if (!CollectionUtils.isEmpty(planDOs) && planDOs.get(0) != null) { - purchaseOrderMakeDO.setProjectPlanId(planDOs.get(0).getId()); - } - purchaseOrderMakeDO.setCustomerId(updateReqVO.getCustomerId()); - purchaseOrderMakeDO.setBrief(updateReqVO.getBrief()); - purchaseOrderMakeDO.setProjectName(updateReqVO.getProjectName()); - purchaseOrderMakeDO.setProjectNameSim(updateReqVO.getProjectNameSim()); + purchaseOrderMakeDO.setProjectId(boomDO.getProjectId()); + PlanDO planDO = planMapper.selectOne("project_id", boomDO.getProjectId()); + if (ObjectUtil.isNotEmpty(planDO)) { + purchaseOrderMakeDO.setProjectPlanId(planDO.getId()); + } + purchaseOrderMakeDO.setCustomerId(boomDO.getCustomerId()); + purchaseOrderMakeDO.setBrief(boomDO.getBrief()); + purchaseOrderMakeDO.setProjectName(boomDO.getProjectName()); + purchaseOrderMakeDO.setProjectNameSim(boomDO.getProjectNameSim()); purchaseOrderMakeMapper.insert(purchaseOrderMakeDO); long purchaseOrderMakeId = purchaseOrderMakeDO.getId(); String purchaseOrderMakeDOPurchaseNo = purchaseOrderMakeDO.getPurchaseNo(); - - updateReqVOs.forEach(updateReq -> { - createPurchaseOrderMakeAndDetail(updateReq,purchaseOrderMakeId, purchaseOrderMakeDOPurchaseNo); + createPurchaseOrderMakeAndDetail(updateReq,purchaseOrderMakeId, purchaseOrderMakeDOPurchaseNo,planDO.getId()); }); return true; @@ -336,7 +330,7 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ return CommonResult.success(orderMakeDO); } - public Boolean createPurchaseOrderMakeAndDetail(PurchaseOrderMakeSaveReqVO updateReqVO, long purchaseOrderMakeId, String purchaseOrderMakeDOPurchaseNo) { + public Boolean createPurchaseOrderMakeAndDetail(MaterialPlanBoomDO updateReqVO, long purchaseOrderMakeId, String purchaseOrderMakeDOPurchaseNo,Long planId) { PurchaseOrderMakeDetailDO purchaseOrderMakeDetailDO = new PurchaseOrderMakeDetailDO(); purchaseOrderMakeDetailDO.setPurchaseOrderId(purchaseOrderMakeId); purchaseOrderMakeDetailDO.setBoomDetailId(updateReqVO.getBoomDetailId()); @@ -344,26 +338,26 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ purchaseOrderMakeDetailDO.setBoomSpec(updateReqVO.getBoomSpec()); purchaseOrderMakeDetailDO.setBoomUnit(updateReqVO.getUnit()); purchaseOrderMakeDetailDO.setComposition(updateReqVO.getCompositionName()); - purchaseOrderMakeDetailDO.setPurchaseAmount(updateReqVO.getPurchaseAmount()); - purchaseOrderMakeDetailDO.setEstimatedPrice(updateReqVO.getEstimatedPrice()); - purchaseOrderMakeDetailDO.setArriveTime(updateReqVO.getArriveTime()); + purchaseOrderMakeDetailDO.setPurchaseAmount(updateReqVO.getPurchaseAmounts()); + purchaseOrderMakeDetailDO.setEstimatedPrice(updateReqVO.getEstimatedPrices()); + purchaseOrderMakeDetailDO.setArriveTime(updateReqVO.getArriveTimes()); purchaseOrderMakeDetailDO.setBoomAmount(updateReqVO.getBoomAmount()); purchaseOrderMakeDetailDO.setRequireTime(updateReqVO.getBoomArriveDate()); - purchaseOrderMakeDetailDO.setSupplierId(updateReqVO.getSupplierId()); + purchaseOrderMakeDetailDO.setSupplierId(updateReqVO.getSupplierIds()); purchaseOrderMakeDetailDO.setProjectMaterialPlanId(updateReqVO.getProjectMaterialPlanId()); purchaseOrderMakeDetailDO.setProjectMaterialPlanBoomId(updateReqVO.getId()); purchaseOrderMakeDetailDO.setProjectPlanSubId(updateReqVO.getProjectPlanSubId()); purchaseOrderMakeDetailDO.setName(updateReqVO.getProjectSubName()); purchaseOrderMakeDetailDO.setNameSim(updateReqVO.getProjectSubNameSim()); purchaseOrderMakeDetailDO.setOrderStatus(1); - PlanSubDO planSubDO1= planSubMapper.selectById(updateReqVO.getProjectPlanSubId()); - purchaseOrderMakeDetailDO.setProjectSubCode(Objects.nonNull(planSubDO1)?planSubDO1.getProjectSubCode(): null); + PlanSubDO planSubDO = planSubMapper.selectOne("project_sub_id", updateReqVO.getProjectPlanSubId()); + purchaseOrderMakeDetailDO.setProjectSubCode(Objects.nonNull(planSubDO)?planSubDO.getProjectSubCode(): null); purchaseOrderMakeDetailDO.setProcedureId(updateReqVO.getProcedureId()); - purchaseOrderMakeDetailDO.setDescription(updateReqVO.getDescription()); + purchaseOrderMakeDetailDO.setDescription(updateReqVO.getDescriptions()); purchaseOrderMakeDetailDO.setTheWeight(updateReqVO.getTheWeight()); purchaseOrderMakeDetailDO.setDuEmpId(updateReqVO.getDuEmpId()); purchaseOrderMakeDetailDO.setIsFoam(updateReqVO.getIsFoam()); - + purchaseOrderMakeDetailDO.setPurchaseNo(purchaseOrderMakeDOPurchaseNo); purchaseOrderMakeDetailMapper.insert(purchaseOrderMakeDetailDO); long purchaseOrderMakeDetailId = purchaseOrderMakeDetailDO.getId(); @@ -373,14 +367,6 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ materialPlanBoomDO.setProjectPurchaseOrderMakeId(purchaseOrderMakeId); materialPlanBoomDO.setPurchaseNo(purchaseOrderMakeDOPurchaseNo); materialPlanBoomDO.setProjectPurchaseOrderMakeDetailId(purchaseOrderMakeDetailId); - materialPlanBoomDO.setPurchaseAmount(updateReqVO.getPurchaseAmount()); - materialPlanBoomDO.setSupplierId(updateReqVO.getSupplierId()); - materialPlanBoomDO.setEstimatedPrice(updateReqVO.getEstimatedPrice()); - materialPlanBoomDO.setArriveTime(updateReqVO.getArriveTime()); - materialPlanBoomDO.setDescription(updateReqVO.getDescription()); - materialPlanBoomDO.setMatWeight(updateReqVO.getTheWeight()); - materialPlanBoomDO.setIsFoam(updateReqVO.getIsFoam()); - materialPlanBoomMapper.updateById(materialPlanBoomDO); return true; } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue index 3671c90..8c5036b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue @@ -280,7 +280,7 @@ import { pieOptions, barOptions } from './echarts-data' import { useCommonStore } from '@/store/modules/common' //all import * as bdgzsomthingApi from '@/api/heli/bdgzsomthing' -//采购订单审核 +// import * as PurchaseOrderApi from '@/api/heli/purchaseorder' //订单审核 import * as ProjectOrderApi from '@/api/heli/projectorder' 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 dc336e6..4b9fc0a 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 @@ -72,9 +72,9 @@ - -