diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java index 8236011..741b12f 100644 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java +++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java @@ -147,4 +147,5 @@ public interface ErrorCodeConstants { /************责任人管理***********/ ErrorCode OWNER_NOT_EXISTS = new ErrorCode(1_013_001, "人员配置主数据维护错误，请确认！"); ErrorCode TRACK_NOT_EXISTS = new ErrorCode(1_013_002, "生产进度跟踪不存在"); + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java index 6fceffc..11c574a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno; +import cn.hutool.core.util.ObjectUtil; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderSaveReqVO; @@ -7,11 +8,15 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.Pa import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoSaveReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.supplier.vo.SupplierSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.service.partpurchaseorder.PartPurchaseOrderService; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; +import com.chanko.yunxi.mes.module.heli.dal.mysql.supplier.SupplierMapper; import com.chanko.yunxi.mes.module.heli.service.purchaseorderno.PurchaseOrderNoService; +import com.chanko.yunxi.mes.module.heli.service.supplier.SupplierService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -46,6 +51,8 @@ public class PurchaseOrderNoController { @Resource private PurchaseOrderNoService purchaseOrderNoService; + @Resource + private SupplierService supplierService; @Resource private PartPurchaseOrderService partPurchaseOrderService; @@ -80,6 +87,10 @@ public class PurchaseOrderNoController { @PreAuthorize("@ss.hasPermission('project:purchase-order-no:query')") public CommonResult getPurchaseOrderNo(@RequestParam("id") Long id) { PurchaseOrderNoDO purchaseOrderNo = purchaseOrderNoService.getPurchaseOrderNo(id); + SupplierDO supplier = supplierService.getSupplier(purchaseOrderNo.getSupplierId()); + if (ObjectUtil.isNotEmpty(supplier)){ + purchaseOrderNo.setSupplierName(supplier.getName()); + } return success(BeanUtils.toBean(purchaseOrderNo, PurchaseOrderNoRespVO.class)); } @@ -134,4 +145,17 @@ public class PurchaseOrderNoController { return success(partPurchaseOrderService.submit(list)); } + @GetMapping("/isPrint") + @Operation(summary = "打印") + @PreAuthorize("@ss.hasPermission('heli:process-bom:create')") + public CommonResult isPrint(@RequestParam("id") Long id) { + return purchaseOrderNoService.isPrint(id); + } + @DeleteMapping("/deleteForm") + @Operation(summary = "删除采购订单主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('project:purchase-order-no:delete')") + public CommonResult deleteForm(@RequestParam("id") Long id) { + return purchaseOrderNoService.deleteForm(id); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java index ac0b8df..a8f0eb1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java @@ -88,4 +88,10 @@ public class PurchaseOrderNoPageReqVO extends PageParam { @Schema(description = "物料需求计划单号") private String materialPlanNo; + @Schema(description = "项目名称") + private String projectName; + @Schema(description = "子项目名称") + private String projectSubName; + @Schema(description = "责任人") + private String username; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoRespVO.java index c166917..8b468e4 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoRespVO.java @@ -105,4 +105,6 @@ public class PurchaseOrderNoRespVO { @Schema(description = "创建者") private String creator; + @Schema(description = "是否打印") + private String isPrint; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java index f5d5447..663b457 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -8,7 +9,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -91,5 +91,25 @@ public class PurchaseOrderNoDetailController { ExcelUtils.write(response, "采购订单明细.xls", "数据", PurchaseOrderNoDetailRespVO.class, BeanUtils.toBean(list, PurchaseOrderNoDetailRespVO.class)); } + @GetMapping("/getPurchaseOrderNoDetailById") + @Operation(summary = "根据采购订单获取采购订单明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:query')") + public CommonResult> getPurchaseOrderNoDetailById(@RequestParam("id") Long id) { + List purchaseOrderNoDetail = purchaseOrderNoDetailService.getPurchaseOrderNoDetailById(id); + return success(purchaseOrderNoDetail); + } + @PostMapping("/verification") + @Operation(summary = "收货校验") + @PreAuthorize("@ss.hasPermission('heli:process-bom:create')") + public CommonResult verification(@Valid @RequestBody List list) { + return purchaseOrderNoDetailService.verification(list); + } + @PostMapping("/receiveGoods") + @Operation(summary = "收货") + @PreAuthorize("@ss.hasPermission('heli:process-bom:create')") + public CommonResult receiveGoods(@Valid @RequestBody List list) { + return purchaseOrderNoDetailService.receiveGoods(list); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailRespVO.java index 8623f5d..cfe726e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailRespVO.java @@ -124,7 +124,7 @@ public class PurchaseOrderNoDetailRespVO { @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "2") @ExcelProperty("收货状态 未收货/收货中/收货完成 1/2/3") - private Boolean receivingStatus; + private Integer receivingStatus; @Schema(description = "入库单id", example = "28663") @ExcelProperty("入库单id") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseorderno/PurchaseOrderNoDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseorderno/PurchaseOrderNoDO.java index e567c1d..142c59e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseorderno/PurchaseOrderNoDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseorderno/PurchaseOrderNoDO.java @@ -1,10 +1,12 @@ package com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import lombok.*; import java.time.*; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; import com.baomidou.mybatisplus.annotation.*; import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; @@ -130,6 +132,16 @@ public class PurchaseOrderNoDO extends BaseDO { private String amount; @TableField(exist = false) private String type; + @TableField(exist = false) + private String username; + @TableField(exist = false) + private String userMobile; + @TableField(exist = false) + private String contactName; + @TableField(exist = false) + private String contactMobile; + @TableField(exist = false) + private List PurchaseOrderNoDetailList; /** * 是否打印 */ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java index 72a5938..73c0c6e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java @@ -123,6 +123,10 @@ public class PurchaseOrderNoDetailDO extends BaseDO { * 客户简称 */ private String brief; + /** + * 子项目编码 + */ + private String projectSubCode; /** * 项目名称 */ @@ -138,7 +142,7 @@ public class PurchaseOrderNoDetailDO extends BaseDO { /** * 收货状态 未收货/收货中/收货完成 1/2/3 */ - private Boolean receivingStatus; + private Integer receivingStatus; /** * 入库单id */ @@ -177,4 +181,11 @@ public class PurchaseOrderNoDetailDO extends BaseDO { private BigDecimal requireAmount; @TableField(exist = false) private LocalDateTime requireArriveTime; + /** + * 入库数量 + */ + @TableField(exist = false) + private BigDecimal purchaseRemAmounts; + @TableField(exist = false) + private String compositionName; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorderno/PurchaseOrderNoMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorderno/PurchaseOrderNoMapper.java index c10c859..aadc068 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorderno/PurchaseOrderNoMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorderno/PurchaseOrderNoMapper.java @@ -10,8 +10,10 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.equip.EquipDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; import com.chanko.yunxi.mes.module.heli.enums.PurchaseStatusEnum; +import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import io.netty.util.internal.ObjectUtil; import org.apache.ibatis.annotations.Mapper; @@ -32,8 +34,11 @@ public interface PurchaseOrderNoMapper extends BaseMapperX { query.selectAll(PurchaseOrderNoDO.class) .select("s.name as supplierName","m.project_material_plan_no as materialPlanNo") .leftJoin(SupplierDO.class, "s", SupplierDO::getId, PurchaseOrderNoDO::getSupplierId) + .leftJoin(PurchaseOrderNoDetailDO.class,"d", PurchaseOrderNoDetailDO::getPurchaseOrderId, PurchaseOrderNoDO::getId) .leftJoin(MaterialPlanDO.class, "m", MaterialPlanDO::getId, PurchaseOrderNoDO::getProjectMaterialPlanId) + .leftJoin(AdminUserDO.class,"u", AdminUserDO::getId, PurchaseOrderNoDetailDO::getDuEmpId) .disableSubLogicDel() + .groupBy(PurchaseOrderNoDO::getId) .orderByDesc(PurchaseOrderNoDO::getCreateTime); query.like(!StringUtils.isEmpty(reqVO.getPurchaseNo()), PurchaseOrderDO::getPurchaseNo, reqVO.getPurchaseNo()) .like(!StringUtils.isEmpty(reqVO.getSupplierName()), "s.name", reqVO.getSupplierName()) @@ -43,6 +48,10 @@ public interface PurchaseOrderNoMapper extends BaseMapperX { .eq(reqVO.getReceivingStatus() != null, PurchaseOrderNoDO::getReceivingStatus, reqVO.getReceivingStatus()) .eq(reqVO.getPurchaseType() != null, PurchaseOrderNoDO::getPurchaseType, reqVO.getPurchaseType()) .eq(reqVO.getGoodsType() != null, PurchaseOrderNoDO::getGoodsType, reqVO.getGoodsType()) + .like(!StringUtils.isEmpty(reqVO.getProjectName()), PurchaseOrderNoDetailDO::getProjectName, reqVO.getProjectName()) + .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), PurchaseOrderNoDetailDO::getName, reqVO.getProjectSubName()) + .like(!StringUtils.isEmpty(reqVO.getUsername()), AdminUserDO::getNickname, reqVO.getUsername()) + .in(reqVO.getIds() != null && !reqVO.getIds().isEmpty(),PurchaseOrderNoDO::getId,reqVO.getIds()); return selectPage(reqVO, query); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java index 8f6bafe..07b484a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java @@ -6,11 +6,14 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermaterial.vo.PurchaseOrderMaterialPageReqVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderboom.PurchaseOrderBoomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermaterial.PurchaseOrderMaterialDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageMaterialDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -33,16 +36,32 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX getPurchaseOrderNoDetailById(Long id){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + + query.selectAll(PurchaseOrderNoDetailDO.class) + .select("com.name as compositionName","t.purchase_rem_amount as purchaseRemAmounts","mat.code as matCode") + .leftJoin(PurchaseOrderNoDO.class, "pb", PurchaseOrderNoDO::getId, PurchaseOrderBoomDO::getPurchaseOrderId) + .leftJoin(CompositionDO.class, "com", CompositionDO::getId, PurchaseOrderNoDetailDO::getComposition) + .leftJoin(ProjectOrderSubDO.class,"sub",ProjectOrderSubDO::getId, PurchaseOrderNoDetailDO::getProjectPlanSubId) + .leftJoin(MaterialDO.class,"mat",MaterialDO::getId,PurchaseOrderNoDetailDO::getMaterialId) + .disableSubLogicDel() + .groupBy(MaterialPlanDetailDO::getId); + query.eq(PurchaseOrderMaterialDO::getPurchaseOrderId, id) + .orderByDesc(PurchaseOrderMaterialDO::getCreateTime); + return selectList(query); + } } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoService.java index 889cd7f..927898d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoService.java @@ -2,6 +2,8 @@ package com.chanko.yunxi.mes.module.heli.service.purchaseorderno; import java.util.*; import javax.validation.*; + +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; @@ -55,4 +57,8 @@ public interface PurchaseOrderNoService { PageResult getPurchaseOrderPage(PurchaseOrderNoPageReqVO pageReqVO); PageResult getPurchaseOrderPageByStatus(PurchaseOrderNoPageReqVO pageReqVO); + + CommonResult isPrint(Long id); + + CommonResult deleteForm(Long id); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java index 662aff1..01bf77e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java @@ -1,25 +1,38 @@ package com.chanko.yunxi.mes.module.heli.service.purchaseorderno; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.framework.security.core.LoginUser; import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.OrderYfSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.shenhe.ShenheDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorder.PurchaseOrderMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermakedetail.PurchaseOrderMakeDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordernodetail.PurchaseOrderNoDetailMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.shenhe.ShenheMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.supplier.SupplierMapper; import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; import com.chanko.yunxi.mes.module.heli.service.orderyf.OrderYfService; +import com.chanko.yunxi.mes.module.heli.service.purchaseordermakedetail.PurchaseOrderMakeDetailService; import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService; import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; +import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import com.chanko.yunxi.mes.module.system.service.user.AdminUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -67,8 +80,14 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { private AttentiontodoMapper attentiontodoMapper; @Autowired private AttentiontodoService attentiontodoService; + @Autowired + private PurchaseOrderMakeDetailMapper purchaseOrderMakeDetailMapper; + @Autowired + private PurchaseOrderNoDetailMapper purchaseOrderNoDetailMapper; @Resource private com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper bdgzsomthingMapper; + @Resource + private AdminUserService adminUserService; @Override public Long createPurchaseOrderNo(PurchaseOrderNoSaveReqVO createReqVO) { @@ -242,4 +261,40 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { return purchaseOrderNoMapper.getPurchaseOrderPageByStatus(pageReqVO); } + @Override + public CommonResult isPrint(Long id) { + PurchaseOrderNoDO purchaseOrderNoDO = purchaseOrderNoMapper.selectById(id); + if (ObjectUtil.isNotEmpty(purchaseOrderNoDO)){ + AdminUserDO user = adminUserService.getUser(getLoginUser().getId()); + purchaseOrderNoDO.setUsername(user.getNickname()); + purchaseOrderNoDO.setUserMobile(user.getMobile()); + SupplierDO supplierDO = supplierMapper.selectById(purchaseOrderNoDO.getSupplierId()); + purchaseOrderNoDO.setSupplierName(supplierDO.getName()); + purchaseOrderNoDO.setContactName(supplierDO.getContact1Name()); + purchaseOrderNoDO.setContactMobile(supplierDO.getContact1Method()); + List detailList = purchaseOrderNoDetailMapper.getPurchaseOrderNoDetailById(id); + purchaseOrderNoDO.setPurchaseOrderNoDetailList(detailList); + } + return CommonResult.success(purchaseOrderNoDO); + } + + @Override + public CommonResult deleteForm(Long id) { + PurchaseOrderNoDO purchaseOrderNoDO = purchaseOrderNoMapper.selectById(id); + if (purchaseOrderNoDO.getReceivingStatus()!=1) { + return CommonResult.error(400,"该订单已收货，请确认！"); + } + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId, id); + purchaseOrderNoDetailMapper.delete(queryWrapper1); + purchaseOrderNoMapper.deleteById(id); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(PurchaseOrderMakeDetailDO::getPurchaseOrderNoId, id); + lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getPurchaseOrderNoId, null); + lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getPurchaseOrderNoDetailId,null); + lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getOrderStatus,1); + purchaseOrderMakeDetailMapper.update(lambdaUpdateWrapper); + return CommonResult.success(true); + } + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java index 82bc3b9..1c43da7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java @@ -2,6 +2,8 @@ package com.chanko.yunxi.mes.module.heli.service.purchaseordernodetail; import java.util.*; import javax.validation.*; + +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; @@ -52,4 +54,9 @@ public interface PurchaseOrderNoDetailService { */ PageResult getPurchaseOrderNoDetailPage(PurchaseOrderNoDetailPageReqVO pageReqVO); + List getPurchaseOrderNoDetailById(Long id); + + CommonResult verification(List list); + + CommonResult receiveGoods(List list); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java index 0382e73..f67dbdf 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java @@ -1,10 +1,27 @@ package com.chanko.yunxi.mes.module.heli.service.purchaseordernodetail; +import cn.hutool.core.util.ObjectUtil; +import com.chanko.yunxi.mes.framework.common.exception.ErrorCode; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO; +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.mysql.material.MaterialMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplan.MaterialPlanMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplandetail.MaterialPlanDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomMapper; +import com.chanko.yunxi.mes.module.heli.service.procedure.ProcedureService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; @@ -15,6 +32,7 @@ import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordernodetail.PurchaseOrderNoDetailMapper; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; /** @@ -28,6 +46,16 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe @Resource private PurchaseOrderNoDetailMapper purchaseOrderNoDetailMapper; + @Resource + private ProcessBomDetailMapper processBomDetailMapper; + @Resource + private MaterialPlanBoomMapper materialPlanBoomMapper; + @Resource + private ProcedureService procedureService; + @Resource + private MaterialMapper materialMapper; + @Resource + private ProcessBomMapper pocessBomMapper; @Override public Long createPurchaseOrderNoDetail(PurchaseOrderNoDetailSaveReqVO createReqVO) { @@ -71,4 +99,71 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe return purchaseOrderNoDetailMapper.selectPage(pageReqVO); } + @Override + public List getPurchaseOrderNoDetailById(Long id) { + return purchaseOrderNoDetailMapper.getPurchaseOrderNoDetailById(id); + } + + @Override + public CommonResult verification(List list) { + for (PurchaseOrderNoDetailDO purchaseOrderNoDetailDO : list) { + PurchaseOrderNoDetailDO byId = purchaseOrderNoDetailMapper.selectById(purchaseOrderNoDetailDO.getId()); + if (ObjectUtil.isNotEmpty(byId)){ + if (BigDecimal.ZERO.compareTo(byId.getPurchaseRemAmount())>=0) throw exception(new ErrorCode(1_006_9999,"该订单零件名称"+byId.getBoomName()+"剩余数量等于0，请确认！")); + if (byId.getReceivingStatus()!=1) throw exception(new ErrorCode(1_006_9999,"该订单零件名称"+byId.getBoomName()+"已收货，请确认！")); + if (byId.getPurchaseRemAmount().compareTo(purchaseOrderNoDetailDO.getPurchaseRemAmounts())<0) { + throw exception(new ErrorCode(1_006_9999,"该订单零件名称"+byId.getBoomName()+"入库数量"+purchaseOrderNoDetailDO.getPurchaseRemAmounts()+"大于剩余数量"+byId.getPurchaseRemAmount()+"请确认！")); + } + } + } + return success(true); + } + + @Override + public CommonResult receiveGoods(List list) { + List materialDOList=new ArrayList(); + for (PurchaseOrderNoDetailDO detailDO : list) { + PurchaseOrderNoDetailDO byId = purchaseOrderNoDetailMapper.selectById(detailDO.getId()); + if (ObjectUtil.isNotEmpty(byId)){ + if (byId.getPurchaseRemAmount().compareTo(detailDO.getPurchaseRemAmounts())==0){ + byId.setReceivingStatus(3); + }else { + byId.setReceivingStatus(2); + } + byId.setPurchaseRemAmount(byId.getPurchaseRemAmount().subtract(detailDO.getPurchaseRemAmounts())); + purchaseOrderNoDetailMapper.updateById(byId); + ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(detailDO.getBoomDetailId()); + if (ObjectUtil.isNotEmpty(bomDetailDO)){ + String bomCode=""; + String blueprintNo=""; + String ProcedureName=""; + MaterialDO materialDO = new MaterialDO(); + materialDO.setUnit(bomDetailDO.getUnit()); + materialDO.setSpec(bomDetailDO.getSpec()); + materialDO.setName(bomDetailDO.getMaterialName()); + ProcessBomDO processBomDO = pocessBomMapper.selectById(bomDetailDO.getBomId()); + if (ObjectUtil.isNotEmpty(processBomDO)){ + bomCode=processBomDO.getCode(); + } + if (ObjectUtil.isNotEmpty(bomDetailDO.getBlueprintNo())){ + blueprintNo=bomDetailDO.getBlueprintNo(); + } + MaterialPlanBoomDO boomDO = materialPlanBoomMapper.selectById(detailDO.getProjectMaterialPlanBoomId()); + if (ObjectUtil.isNotEmpty(boomDO)){ + ProcedureDO procedure = procedureService.getProcedure(boomDO.getProcedureId()); + if (ObjectUtil.isNotEmpty(procedure)){ + ProcedureName=procedure.getName(); + } + } + materialDO.setCode(bomCode+blueprintNo+ProcedureName); + materialDO.setCompositionId(bomDetailDO.getCompositionId()); + materialDO.setMaterialType("1"); + materialDOList.add(materialDO); + } + } + } + materialMapper.insertBatch(materialDOList); + return success(true); + } + } diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseorderno/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseorderno/index.ts index 943985d..5174d0a 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseorderno/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseorderno/index.ts @@ -63,3 +63,12 @@ export const getPurchaseOrderNoPageByStatus = async (params) => { export const updateReceivingStatus = async (id: number) => { return await request.put({ url: `/heli/purchase-order/updateRSById?id=` + id }) } +// 删除 +export const deleteForm = async (id: number) => { + return await request.delete({ url: `/heli/purchase-order-no/deleteForm?id=` + id }) +} + +// 打印接口 +export const isPrint = async (id: number) => { + return await request.get({ url: `/heli/purchase-order-no/isPrint?id=` + id }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseordernodetail/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseordernodetail/index.ts index 7504e06..0046410 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseordernodetail/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseordernodetail/index.ts @@ -1,66 +1,75 @@ -import request from '@/config/axios' - -export interface PurchaseOrderNoDetailVO { - id: number - purchaseOrderId: number - boomDetailId: number - boomName: string - boomSpec: string - boomUnit: string - composition: string - purchaseAmount: number - estimatedPrice: number - actualPrice: number - arriveTime: Date - description: string - boomAmount: number - requireTime: Date - projectMaterialPlanId: number - projectMaterialPlanBoomId: number - projectPlanSubId: number - name: string - nameSim: string - projectId: number - projectPlanId: number - customerId: number - brief: string - projectName: string - projectNameSim: string - materialId: number - receivingStatus: boolean - storageId: number - storageMatId: number - purchaseRemAmount: number - theWeight: number - duEmpId: number -} - -// 查询采购订单明细分页 -export const getPurchaseOrderNoDetailPage = async (params) => { - return await request.get({ url: `/heli/purchase-order-no-detail/page`, params }) -} - -// 查询采购订单明细详情 -export const getPurchaseOrderNoDetail = async (id: number) => { - return await request.get({ url: `/heli/purchase-order-no-detail/get?id=` + id }) -} - -// 新增采购订单明细 -export const createPurchaseOrderNoDetail = async (data: PurchaseOrderNoDetailVO) => { - return await request.post({ url: `/heli/purchase-order-no-detail/create`, data }) -} - -// 修改采购订单明细 -export const updatePurchaseOrderNoDetail = async (data: PurchaseOrderNoDetailVO) => { - return await request.put({ url: `/heli/purchase-order-no-detail/update`, data }) -} - -// 删除采购订单明细 -export const deletePurchaseOrderNoDetail = async (id: number) => { - return await request.delete({ url: `/heli/purchase-order-no-detail/delete?id=` + id }) -} - -// 导出采购订单明细 Excel -export const exportPurchaseOrderNoDetail = async (params) => { - return await request.download({ url: `/heli/purchase-order-no-detail/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface PurchaseOrderNoDetailVO { + id: number + purchaseOrderId: number + boomDetailId: number + boomName: string + boomSpec: string + boomUnit: string + composition: string + purchaseAmount: number + estimatedPrice: number + actualPrice: number + arriveTime: Date + description: string + boomAmount: number + requireTime: Date + projectMaterialPlanId: number + projectMaterialPlanBoomId: number + projectPlanSubId: number + name: string + nameSim: string + projectId: number + projectPlanId: number + customerId: number + brief: string + projectName: string + projectNameSim: string + materialId: number + receivingStatus: boolean + storageId: number + storageMatId: number + purchaseRemAmount: number + theWeight: number + duEmpId: number +} + +// 查询采购订单明细分页 +export const getPurchaseOrderNoDetailPage = async (params) => { + return await request.get({ url: `/heli/purchase-order-no-detail/page`, params }) +} + +// 查询采购订单明细详情 +export const getPurchaseOrderNoDetail = async (id: number) => { + return await request.get({ url: `/heli/purchase-order-no-detail/get?id=` + id }) +} + +// 新增采购订单明细 +export const createPurchaseOrderNoDetail = async (data: PurchaseOrderNoDetailVO) => { + return await request.post({ url: `/heli/purchase-order-no-detail/create`, data }) +} + +// 修改采购订单明细 +export const updatePurchaseOrderNoDetail = async (data: PurchaseOrderNoDetailVO) => { + return await request.put({ url: `/heli/purchase-order-no-detail/update`, data }) +} + +// 删除采购订单明细 +export const deletePurchaseOrderNoDetail = async (id: number) => { + return await request.delete({ url: `/heli/purchase-order-no-detail/delete?id=` + id }) +} + +// 导出采购订单明细 Excel +export const exportPurchaseOrderNoDetail = async (params) => { + return await request.download({ url: `/heli/purchase-order-no-detail/export-excel`, params }) +} +export const getPurchaseOrderNoDetailById = async (id: number) => { + return await request.get({ url: `/heli/purchase-order-no-detail/getPurchaseOrderNoDetailById?id=` + id }) +} +export const verification = async (data) => { + return await request.post({ url: `/heli/purchase-order-no-detail/verification`, data }) +} +export const receiveGoods= async (data) => { + return await request.post({ url: `/heli/purchase-order-no-detail/receiveGoods`, data }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts index c1f3ab8..730cb73 100644 --- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts +++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts @@ -283,7 +283,6 @@ export enum DICT_TYPE { HELI_MATERIAL_PLAN_BOOM_STATUS = 'heli_material_plan_boom_status',//物料需求计划标准件状态 HELI_MAT_TYPE = 'heli_mat_type',//物料需求计划类型 HELI_PROJECT_MATERIAL_PLAN_BOOM_STATUS='heli_project_material_plan_boom_status',//物料需求计划Boon状态 - PART_PURCHASE_STATUS='part_purchase_status' - - + PART_PURCHASE_STATUS='part_purchase_status', + HELI_IS_PRINT='heli_is_print' } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/part.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/part.vue index a3a30bb..90ee521 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/part.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/part.vue @@ -267,7 +267,7 @@ const submitForm = async () => { } catch (error) { console.error("提交失败:", error); - message.error(`操作失败: ${error.message || "未知错误"}`); + // message.error(`操作失败: ${error.message || "未知错误"}`); } finally { formLoading.value = false; } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue index 2254858..1b12f03 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue @@ -233,7 +233,7 @@ const submitForm = async () => { } catch (error) { console.error("提交失败:", error); - message.error(`操作失败: ${error.message || "未知错误"}`); + // message.error(`操作失败: ${error.message || "未知错误"}`); } finally { formLoading.value = false; } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/materialDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/materialDialog.vue index 58804a4..a8b6637 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/materialDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/materialDialog.vue @@ -147,6 +147,7 @@ const submitForm = () => { return } dialogVisible.value = false + multipleSelection.value.forEach(item =>item.projectMaterialPlanBoomId=item.id) multipleSelection.value.forEach(item => item.id = undefined) // 发送操作成功的事件 emit('success', multipleSelection.value) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue new file mode 100644 index 0000000..0040423 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue @@ -0,0 +1,220 @@ + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/index.vue new file mode 100644 index 0000000..b444966 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/index.vue @@ -0,0 +1,290 @@ + + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/management.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/management.vue new file mode 100644 index 0000000..d8973d0 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/management.vue @@ -0,0 +1,268 @@ + + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/managementdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/managementdetail.vue new file mode 100644 index 0000000..b4a107b --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/managementdetail.vue @@ -0,0 +1,183 @@ + +