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 9522d1d..2ca25ba 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 @@ -39,6 +39,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; import java.util.List; +import java.util.Objects; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; @@ -252,7 +253,7 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ purchaseOrderMakeDO.setSubmitTime(LocalDateTime.now()); purchaseOrderMakeDO.setProjectId(updateReqVO.getProjectId()); PlanDO planDO = planMapper.selectOne("plan_no", updateReqVO.getProjectId()); - purchaseOrderMakeDO.setProjectPlanId(planDO.getId()); + purchaseOrderMakeDO.setProjectPlanId(Objects.nonNull(planDO)?planDO.getId(): null); purchaseOrderMakeDO.setCustomerId(updateReqVO.getCustomerId()); purchaseOrderMakeDO.setBrief(updateReqVO.getBrief()); purchaseOrderMakeDO.setProjectName(updateReqVO.getProjectName()); @@ -281,7 +282,7 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ purchaseOrderMakeDetailDO.setNameSim(updateReqVO.getProjectSubNameSim()); purchaseOrderMakeDetailDO.setOrderStatus(1); PlanSubDO planSubDO1= planSubMapper.selectById(updateReqVO.getProjectPlanSubId()); - purchaseOrderMakeDetailDO.setProjectSubCode(planSubDO1.getProjectSubCode()); + purchaseOrderMakeDetailDO.setProjectSubCode(Objects.nonNull(planSubDO1)?planSubDO1.getProjectSubCode(): null); purchaseOrderMakeDetailDO.setProcedureId(updateReqVO.getProcedureId()); purchaseOrderMakeDetailDO.setDescription(updateReqVO.getDescription()); purchaseOrderMakeDetailDO.setTheWeight(updateReqVO.getTheWeight()); diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts index 5be9a9d..9bc9825 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts @@ -57,6 +57,6 @@ export const getDetail = async (params) => { } // 零件采购单送审生成 -export const createPurchaseOrderMakeAndDetail = async (params) => { - return await request.post({ url: `/heli/purchase-order-make/createPurchaseOrderMakeAndDetail`, params }) +export const createPurchaseOrderMakeAndDetail = async (data) => { + return await request.post({ url: `/heli/purchase-order-make/createPurchaseOrderMakeAndDetail`, data }) } 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 d3e34a0..1f4aa60 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 @@ -62,26 +62,19 @@ - + - - + + - - -