From fb1a942ac137d999bb9b0f347fe3daa1bba8e43a Mon Sep 17 00:00:00 2001 From: z Date: Fri, 20 Jun 2025 18:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bdgzsomthing/bdgzsomthingController.java | 10 +- .../materialplan/MaterialPlanController.java | 16 +- .../MaterialPlanBoomController.java | 8 +- .../vo/MaterialPlanBoomPageReqVO.java | 9 + .../vo/MaterialPlanBoomRespVO.java | 23 + .../PurchaseOrderNoController.java | 21 + .../vo/PurchaseOrderNoPageReqVO.java | 15 +- .../vo/PurchaseOrderNoRespVO.java | 111 +-- .../vo/PurchaseOrderNoSaveReqVO.java | 13 +- .../PurchaseOrderNoDetailController.java | 4 +- .../materialplanboom/MaterialPlanBoomDO.java | 12 + .../purchaseorderno/PurchaseOrderNoDO.java | 81 +- .../PurchaseOrderNoDetailDO.java | 19 +- .../materialplan/MaterialPlanMapper.java | 16 + .../MaterialPlanBoomMapper.java | 21 + .../PurchaseOrderNoMapper.java | 69 +- .../PurchaseOrderNoDetailMapper.java | 63 +- .../materialplan/MaterialPlanService.java | 4 + .../materialplan/MaterialPlanServiceImpl.java | 13 + .../MaterialPlanBoomService.java | 2 + .../MaterialPlanBoomServiceImpl.java | 5 + .../PurchaseOrderNoService.java | 2 + .../PurchaseOrderNoServiceImpl.java | 168 ++++- .../src/api/heli/materialplan/index.ts | 8 + .../src/api/heli/materialplanboom/index.ts | 3 + .../src/api/heli/purchaseorderno/index.ts | 8 + .../src/components/Table/src/Table.vue | 2 +- .../src/views/heli/orderyf/index.vue | 16 +- .../src/views/heli/orderyf/record.vue | 14 +- .../src/views/heli/orderys/index.vue | 16 +- .../src/views/heli/orderys/record.vue | 14 +- .../src/views/heli/purchaseorder/add.vue | 29 +- .../src/views/heli/purchaseorder/audit.vue | 17 +- .../views/heli/purchaseorder/auditdetail.vue | 578 +++++++------- .../src/views/heli/purchaseorder/detail.vue | 607 +++++++-------- .../src/views/heli/purchaseorder/edit.vue | 713 +++++++++--------- .../src/views/heli/purchaseorder/index.vue | 9 +- .../heli/purchaseorder/materialDialog.vue | 19 +- .../heli/purchaseorder/materialPlanDialog.vue | 42 +- .../src/views/heli/storage/subproject.vue | 14 +- 40 files changed, 1625 insertions(+), 1189 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java index 2a08e1e..9007375 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java @@ -151,7 +151,7 @@ public class bdgzsomthingController { BeanUtils.toBean(list, bdgzsomthingRespVO.class)); } - @Scheduled(fixedRate = 10800000) +// @Scheduled(fixedRate = 10800000) public void scheduledTask() { bdgzsomthingService.selectds(); } @@ -159,15 +159,15 @@ public class bdgzsomthingController { //@Scheduled(cron = "0 2 0 * * ?") //每天十天执行一次 @PostConstruct public void init() { - selectHasPrice(); - selectSafeStorageAndDeliverOneYear(); +// selectHasPrice(); +// selectSafeStorageAndDeliverOneYear(); } - @Scheduled(cron = "0 0 2 * * ?") +// @Scheduled(cron = "0 0 2 * * ?") public void selectHasPrice(){ bdgzsomthingService.selectHasPrice(); } - @Scheduled(cron = "0 0 0 * * ?") +// @Scheduled(cron = "0 0 0 * * ?") public void selectSafeStorageAndDeliverOneYear(){bdgzsomthingService.selectSafeStorageAndDeliverOneYear();} @PostMapping("/getMessage") @Operation(summary = "小程序消息") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java index 95fa7b3..ada302f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java @@ -80,7 +80,13 @@ public class MaterialPlanController { PageResult pageResult = materialPlanService.getMaterialPlanPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MaterialPlanRespVO.class)); } - + @GetMapping("/getBeiKuPage") + @Operation(summary = "获得备库物料需求计划分页") + @PreAuthorize("@ss.hasPermission('heli:material-plan:query')") + public CommonResult> getBeiKuPage(@Valid MaterialPlanPageReqVO pageReqVO) { + PageResult pageResult = materialPlanService.getBeiKuPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaterialPlanRespVO.class)); + } @GetMapping("/export-excel") @Operation(summary = "导出物料需求计划 Excel") @PreAuthorize("@ss.hasPermission('heli:material-plan:export')") @@ -140,4 +146,12 @@ public class MaterialPlanController { ExcelUtils.write(response, "零件物料需求计划.xlsx", "数据", PartExcelVO.class, BeanUtils.toBean(list, PartExcelVO.class)); } + @GetMapping("/getProjectMaterialPlanNo") + @Operation(summary = "根据编码获得物料需求计划") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:material-plan:query')") + public CommonResult getProjectMaterialPlanNo(@RequestParam("code") String code) { + MaterialPlanDO materialPlan = materialPlanService.getProjectMaterialPlanNo(code); + return success(BeanUtils.toBean(materialPlan, MaterialPlanRespVO.class)); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/MaterialPlanBoomController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/MaterialPlanBoomController.java index 4dd2b75..a8a582a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/MaterialPlanBoomController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/MaterialPlanBoomController.java @@ -81,7 +81,13 @@ public class MaterialPlanBoomController { PageResult pageResult = materialPlanBoomService.getMaterialPlanBoomPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MaterialPlanBoomRespVO.class)); } - + @GetMapping("/getProjectMaterialPlanId") + @Operation(summary = "根据物料需求计划id获取物料") + @PreAuthorize("@ss.hasPermission('heli:material-plan-boom:query')") + public CommonResult> getProjectMaterialPlanId(@Valid MaterialPlanBoomPageReqVO pageReqVO) { + PageResult pageResult = materialPlanBoomService.getProjectMaterialPlanId(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaterialPlanBoomRespVO.class)); + } @GetMapping("/page-sum") @Operation(summary = "获得物料需求计划加工件明细分页") @PreAuthorize("@ss.hasPermission('heli:material-plan-boom:query')") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomPageReqVO.java index 11a40ef..e547da5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomPageReqVO.java @@ -50,5 +50,14 @@ public class MaterialPlanBoomPageReqVO extends PageParam { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "物料名称") + private String matName; + + @Schema(description = "物料编码") + private String matCode; + + @Schema(description = "物料类型") + private Long matType; + } \ 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/materialplanboom/vo/MaterialPlanBoomRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomRespVO.java index 11097dc..e2101b7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomRespVO.java @@ -69,7 +69,30 @@ public class MaterialPlanBoomRespVO extends PageParam { @Schema(description = "工序") @ExcelProperty("工序") private String procedureName; + @Schema(description = "物料名称") + @ExcelProperty("物料名称") + private String matName; + @Schema(description = "物料编码") + @ExcelProperty("物料编码") + private String matCode; + @Schema(description = "物料规格型号") + @ExcelProperty("物料规格型号") + private String matSpec; + + @Schema(description = "物料单位") + @ExcelProperty("物料单位") + private String matUnit; + + @Schema(description = "物料类型") + @ExcelProperty("物料类型") + private String matType; + @Schema(description = "库存数量") + @ExcelProperty("库存数量") + private BigDecimal matRest; + @Schema(description = "物料id") + @ExcelProperty("物料id") + private Long matId; } \ 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/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 c0cbcc4..e8f01e4 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,8 +1,12 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno; +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; 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.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.chanko.yunxi.mes.module.heli.service.purchaseorderno.PurchaseOrderNoService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -99,4 +103,21 @@ public class PurchaseOrderNoController { PageResult pageResult = purchaseOrderNoService.getPurchaseOrderPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PurchaseOrderNoRespVO.class)); } + @GetMapping("/page-by-status") + @Operation(summary = "获得采购订单审核分页") + @PreAuthorize("@ss.hasPermission('heli:purchase-order:query')") + public CommonResult> getPurchaseOrderPageByStatus(@Valid PurchaseOrderNoPageReqVO pageReqVO) { + PageResult pageResult = purchaseOrderNoService.getPurchaseOrderPageByStatus(pageReqVO); + return success(BeanUtils.toBean(pageResult, PurchaseOrderNoRespVO.class)); + } + @PutMapping("/updateRSById") + @Operation(summary = "更新采购订单收获状态") + @PreAuthorize("@ss.hasPermission('heli:purchase-order:updateRSById')") + public CommonResult updatePORSById(@RequestParam("id") Long id) { + PurchaseOrderNoDO purchaseOrderNo = purchaseOrderNoService.getPurchaseOrderNo(id); + purchaseOrderNo.setReceivingStatus(3); + PurchaseOrderNoSaveReqVO purchaseOrderVO = BeanUtils.toBean(purchaseOrderNo, PurchaseOrderNoSaveReqVO.class); + purchaseOrderNoService.updatePurchaseOrderNo(purchaseOrderVO); + return success(true); + } } 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 010a42f..ac0b8df 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 @@ -18,14 +18,18 @@ import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_Y @ToString(callSuper = true) public class PurchaseOrderNoPageReqVO extends PageParam { + @Schema(description = "id") + private Long id; @Schema(description = "采购单号") private String purchaseNo; + @Schema(description = "选中采购编号") + private List ids; @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") - private Boolean purchaseType; + private Integer purchaseType; @Schema(description = "采购物类型，1物料，2加工件", example = "2") - private Boolean goodsType; + private Integer goodsType; @Schema(description = "暂估价金额", example = "2163") private BigDecimal estimatedPrice; @@ -34,7 +38,7 @@ public class PurchaseOrderNoPageReqVO extends PageParam { private BigDecimal actualPrice; @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") - private Boolean status; + private Integer status; @Schema(description = "送审人", example = "18499") private Long submitUserId; @@ -54,8 +58,7 @@ public class PurchaseOrderNoPageReqVO extends PageParam { private String description; @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; + private String createTime; @Schema(description = "供应商id", example = "3648") private Long supplierId; @@ -82,5 +85,7 @@ public class PurchaseOrderNoPageReqVO extends PageParam { @Schema(description = "供应商名称") private String supplierName; + @Schema(description = "物料需求计划单号") + private String materialPlanNo; } \ 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 acb8b3a..c166917 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 @@ -1,5 +1,8 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo; +import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat; +import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert; +import com.chanko.yunxi.mes.framework.excel.core.convert.TimestampToDateConvert; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -16,86 +19,90 @@ import com.alibaba.excel.annotation.*; @ExcelIgnoreUnannotated public class PurchaseOrderNoRespVO { - @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "5114") - @ExcelProperty("自增字段，唯一") + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED) private Long id; @Schema(description = "采购单号", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("采购单号") private String purchaseNo; - @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") - @ExcelProperty("采购单类型，1按物料需求计划采购，2备库采购") + @Schema(description = "创建时间") + @ExcelProperty(value="单据日期", converter = TimestampToDateConvert.class) + private LocalDateTime createTime; + + @Schema(description = "供应商id") + private Long supplierId; + + @Schema(description = "供应商名称") + @ExcelProperty("供应商") + private String supplierName; + + @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购") + @ExcelProperty(value = "采购单类型", converter = DictConvert.class) + @DictFormat("heli_project_purchase_order_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 private Integer purchaseType; - @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @ExcelProperty("采购物类型，1物料，2加工件") + @Schema(description = "物料需求计划单号") + @ExcelProperty("物料需求计划单号") + private String materialPlanNo; + + @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty(value = "采购物料类型", converter = DictConvert.class) + @DictFormat("heli_project_purchase_goods_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 private Integer goodsType; - @Schema(description = "暂估价金额", example = "2163") - @ExcelProperty("暂估价金额") + @Schema(description = "采购合同号") + @ExcelProperty("采购合同号") + private String contractNo; + + @Schema(description = "物料需求计划id") + private Long projectMaterialPlanId; + + + @Schema(description = "结算币种") + @ExcelProperty(value ="结算币种",converter = DictConvert.class) + @DictFormat("heli_currency") + private Integer currencyType; + + + @Schema(description = "暂估价金额") + @ExcelProperty("暂估价金额(元)") private BigDecimal estimatedPrice; - @Schema(description = "实际价金额", example = "1238") - @ExcelProperty("实际价金额") + @Schema(description = "实际价金额") + @ExcelProperty("实际价金额(元)") private BigDecimal actualPrice; - @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") - @ExcelProperty("单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1") + @Schema(description = "税率") + @ExcelProperty("税率(%)") + private Integer taxRatio; + + @Schema(description = "状态,1已保存，2已送审，3已审核，4已打回 ，默认是1") + @ExcelProperty(value = "单据状态", converter = DictConvert.class) + @DictFormat("heli_purchase_order_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 private Integer status; - @Schema(description = "送审人", example = "18499") - @ExcelProperty("送审人") + @Schema(description = "状态,1未收货，2收获中，3收货完成 ，默认是1") + @ExcelProperty(value = "采购单收货状态", converter = DictConvert.class) + @DictFormat("heli_purchase_receiving_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private Integer receivingStatus; + + @Schema(description = "送审人") private Long submitUserId; @Schema(description = "送审时间") - @ExcelProperty("送审时间") private LocalDateTime submitTime; @Schema(description = "审核人") - @ExcelProperty("审核人") private Long auditor; @Schema(description = "审核时间") - @ExcelProperty("审核时间") private LocalDateTime auditTime; - @Schema(description = "备注", example = "随便") + @Schema(description = "备注") @ExcelProperty("备注") private String description; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @Schema(description = "供应商id", example = "3648") - @ExcelProperty("供应商id") - private Long supplierId; - - @Schema(description = "是否打印") - @ExcelProperty("是否打印") - private String isPrint; - - @Schema(description = "打印时间") - @ExcelProperty("打印时间") - private LocalDateTime printDtime; - - @Schema(description = "订单日期") - @ExcelProperty("订单日期") - private LocalDate ordDate; - - @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "1") - @ExcelProperty("收货状态 未收货/收货中/收货完成 1/2/3") - private Integer receivingStatus; - - @Schema(description = "结算币种", example = "2") - @ExcelProperty("结算币种") - private Integer currencyType; - - @Schema(description = "税率") - @ExcelProperty("税率") - private Integer taxRatio; - @Schema(description = "供应商名称") - @ExcelProperty("供应商名称") - private String supplierName; + @Schema(description = "创建者") + private String creator; } \ 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/PurchaseOrderNoSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoSaveReqVO.java index ea56b0a..71908c2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoSaveReqVO.java @@ -19,15 +19,18 @@ public class PurchaseOrderNoSaveReqVO { private Long id; @Schema(description = "采购单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "采购单号不能为空") +// @NotEmpty(message = "采购单号不能为空") private String purchaseNo; - + @Schema(description = "采购合同号", example = "2163") + private String contractNo; + @Schema(description = "物料需求计划id", example = "2163") + private Long projectMaterialPlanId; @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") - private Boolean purchaseType; + private Integer purchaseType; @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotNull(message = "采购物类型，1物料，2加工件不能为空") - private Boolean goodsType; + private Integer goodsType; @Schema(description = "暂估价金额", example = "2163") private BigDecimal estimatedPrice; @@ -36,7 +39,7 @@ public class PurchaseOrderNoSaveReqVO { private BigDecimal actualPrice; @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") - private Boolean status; + private Integer status; @Schema(description = "送审人", example = "18499") private Long submitUserId; 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 15b7a20..f5d5447 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 @@ -74,9 +74,9 @@ public class PurchaseOrderNoDetailController { @GetMapping("/page") @Operation(summary = "获得采购订单明细分页") @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:query')") - public CommonResult> getPurchaseOrderNoDetailPage(@Valid PurchaseOrderNoDetailPageReqVO pageReqVO) { + public CommonResult> getPurchaseOrderNoDetailPage(@Valid PurchaseOrderNoDetailPageReqVO pageReqVO) { PageResult pageResult = purchaseOrderNoDetailService.getPurchaseOrderNoDetailPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, PurchaseOrderNoDetailRespVO.class)); + return success(pageResult); } @GetMapping("/export-excel") 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 c869000..3b60ba5 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 @@ -121,5 +121,17 @@ public class MaterialPlanBoomDO extends BaseDO { private String projectMaterialPlanNo; @TableField(exist = false) private String nickname; + @TableField(exist = false) + private Long matId; + @TableField(exist = false) + private String matCode; + @TableField(exist = false) + private String matSpec; + @TableField(exist = false) + private String matUnit; + @TableField(exist = false) + private String matType; + @TableField(exist = false) + private BigDecimal matRest; } \ 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/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 6da439d..b81eb14 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 @@ -37,14 +37,38 @@ public class PurchaseOrderNoDO extends BaseDO { * 采购单号 */ private String purchaseNo; + /** + * 供应商id + */ + private Long supplierId; + /** + * 采购合同号 + */ + private String contractNo; /** * 采购单类型，1按物料需求计划采购，2备库采购 + * + * 枚举 {@link TODO heli_project_purchase_order_type 对应的类} */ private Integer purchaseType; + /** + * 物料需求计划id + */ + private Long projectMaterialPlanId; /** * 采购物类型，1物料，2加工件 + * + * 枚举 {@link TODO heli_project_purchase_goods_type 对应的类} */ private Integer goodsType; + /** + * 结算币种 + */ + private Integer currencyType; + /** + * 税率 + */ + private Integer taxRatio; /** * 暂估价金额 */ @@ -54,7 +78,15 @@ public class PurchaseOrderNoDO extends BaseDO { */ private BigDecimal actualPrice; /** - * 单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1 + * 采购单收货状态,1未收货，2收获中，3收货完成 ，默认是1 + * + * 枚举 {@link TODO heli_purchase_receiving_status 对应的类} + */ + private Integer receivingStatus; + /** + * 状态,1已保存，2已送审，3已审核，4已打回 ，默认是1 + * + * 枚举 {@link TODO heli_purchase_order_status 对应的类} */ private Integer status; /** @@ -77,10 +109,31 @@ public class PurchaseOrderNoDO extends BaseDO { * 备注 */ private String description; - /** - * 供应商id - */ - private Long supplierId; + + @TableField(exist = false) + private String supplierName; + @TableField(exist = false) + private String materialPlanNo; + @TableField(exist = false) + private String materialCode; + @TableField(exist = false) + private String materialName; + @TableField(exist = false) + private String materialType; + @TableField(exist = false) + private String materialSpec; + @TableField(exist = false) + private String unit; + @TableField(exist = false) + private String zanGuMoney; + @TableField(exist = false) + private String shiJiMoney; + @TableField(exist = false) + private BigDecimal caiGouMoney; + @TableField(exist = false) + private String amount; + @TableField(exist = false) + private String type; /** * 是否打印 */ @@ -93,22 +146,4 @@ public class PurchaseOrderNoDO extends BaseDO { * 订单日期 */ private LocalDate ordDate; - /** - * 收货状态 未收货/收货中/收货完成 1/2/3 - */ - private Integer receivingStatus; - /** - * 结算币种 - */ - private Integer currencyType; - /** - * 税率 - */ - private Integer taxRatio; - /** - * 供应商名称 - */ - @TableField(exist = false) - private String supplierName; - } \ 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/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 f833e72..72a5938 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 @@ -159,5 +159,22 @@ public class PurchaseOrderNoDetailDO extends BaseDO { * 责任人id */ private Long duEmpId; - + @TableField(exist = false) + private Long matId; + @TableField(exist = false) + private String matName; + @TableField(exist = false) + private String matCode; + @TableField(exist = false) + private String matSpec; + @TableField(exist = false) + private String matUnit; + @TableField(exist = false) + private String matType; + @TableField(exist = false) + private BigDecimal matRest; + @TableField(exist = false) + private BigDecimal requireAmount; + @TableField(exist = false) + private LocalDateTime requireArriveTime; } \ 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/materialplan/MaterialPlanMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplan/MaterialPlanMapper.java index 455b3e4..47de98d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplan/MaterialPlanMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplan/MaterialPlanMapper.java @@ -57,6 +57,22 @@ public interface MaterialPlanMapper extends BaseMapperX { + return selectPage(pageReqVO, query); + } + + default PageResult getBeiKuPage(MaterialPlanPageReqVO pageReqVO){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + + query.selectAll(MaterialPlanDO.class) + .select("p.project_name as projectName","pl.plan_no as planNo") + .leftJoin(PlanDO.class, "pl", PlanDO::getId, MaterialPlanDO::getProjectPlanId) + .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getId, MaterialPlanDO::getProjectId) + .disableSubLogicDel() + .orderByDesc(MaterialPlanDO::getMatPlanDate); + query.like(!StringUtils.isEmpty(pageReqVO.getProjectMaterialPlanNo()), MaterialPlanDO::getProjectMaterialPlanNo, pageReqVO.getProjectMaterialPlanNo()) + .like(!StringUtils.isEmpty(pageReqVO.getProjectName()), "p.project_name", pageReqVO.getProjectName()) + .eq(MaterialPlanDO::getMatType,2); + return selectPage(pageReqVO, query); } // default PageResult selectPage(MaterialPlanPageReqVO reqVO) { 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 e415d50..ce6c28b 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 @@ -2,16 +2,19 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom; import java.util.*; +import cn.hutool.core.util.ObjectUtil; 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.dal.dataobject.composition.CompositionDO; +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.plansub.PlanSubDO; 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.storagelogNow.StorageMaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.enums.BoomDetailTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum; @@ -89,6 +92,24 @@ public interface MaterialPlanBoomMapper extends BaseMapperX return selectPage(pageReqVO,query); } + default PageResult getProjectMaterialPlanId(MaterialPlanBoomPageReqVO pageReqVO){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + + query.selectAll(MaterialPlanBoomDO.class) + .select("mat.id as matId","mat.name as matName","mat.code as matCode","mat.spec as matSpec","mat.unit as matUnit","mat.material_type as matType") + .select("sum(ifnull(sm.storage_ok_qty,0)) as matRest") + .leftJoin(MaterialDO.class, "mat", MaterialDO::getId, MaterialPlanDetailDO::getMaterialId) + .leftJoin(StorageMaterialDO.class,"sm",StorageMaterialDO::getId, MaterialPlanDetailDO::getMaterialId) + .disableSubLogicDel() + .groupBy(MaterialPlanBoomDO::getId) + .orderByDesc(MaterialPlanBoomDO::getCreateTime); + query.eq(ObjectUtil.isNotEmpty(pageReqVO.getProjectMaterialPlanId()),MaterialPlanDetailDO::getProjectMaterialPlanId, pageReqVO.getProjectMaterialPlanId()); + query.eq(ObjectUtil.isNotEmpty(pageReqVO.getMatCode()),MaterialDO::getCode, pageReqVO.getMatCode()); + query.eq(ObjectUtil.isNotEmpty(pageReqVO.getMatName()),MaterialDO::getName, pageReqVO.getMatName()); + query.eq(ObjectUtil.isNotEmpty(pageReqVO.getMatType()),MaterialDO::getMaterialType, pageReqVO.getMatType()); + return selectPage(pageReqVO, query); + } + // default PageResult selectPage(MaterialPlanBoomPageReqVO reqVO) { // return selectPage(reqVO, new LambdaQueryWrapperX() // .eqIfPresent(MaterialPlanBoomDO::getId, reqVO.getId()) 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 56a6f43..c10c859 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 @@ -5,12 +5,18 @@ import java.util.*; 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.purchaseorder.vo.PurchaseOrderPageReqVO; +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.supplier.SupplierDO; +import com.chanko.yunxi.mes.module.heli.enums.PurchaseStatusEnum; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import io.netty.util.internal.ObjectUtil; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.*; +import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; /** @@ -20,29 +26,26 @@ import org.springframework.util.StringUtils; */ @Mapper public interface PurchaseOrderNoMapper extends BaseMapperX { - default PageResult selectPage(PurchaseOrderNoPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(PurchaseOrderNoDO::getPurchaseNo, reqVO.getPurchaseNo()) - .eqIfPresent(PurchaseOrderNoDO::getPurchaseType, reqVO.getPurchaseType()) - .eqIfPresent(PurchaseOrderNoDO::getGoodsType, reqVO.getGoodsType()) - .eqIfPresent(PurchaseOrderNoDO::getEstimatedPrice, reqVO.getEstimatedPrice()) - .eqIfPresent(PurchaseOrderNoDO::getActualPrice, reqVO.getActualPrice()) - .eqIfPresent(PurchaseOrderNoDO::getStatus, reqVO.getStatus()) - .eqIfPresent(PurchaseOrderNoDO::getSubmitUserId, reqVO.getSubmitUserId()) - .betweenIfPresent(PurchaseOrderNoDO::getSubmitTime, reqVO.getSubmitTime()) - .eqIfPresent(PurchaseOrderNoDO::getAuditor, reqVO.getAuditor()) - .betweenIfPresent(PurchaseOrderNoDO::getAuditTime, reqVO.getAuditTime()) - .eqIfPresent(PurchaseOrderNoDO::getDescription, reqVO.getDescription()) - .betweenIfPresent(PurchaseOrderNoDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(PurchaseOrderNoDO::getSupplierId, reqVO.getSupplierId()) - .eqIfPresent(PurchaseOrderNoDO::getIsPrint, reqVO.getIsPrint()) - .betweenIfPresent(PurchaseOrderNoDO::getPrintDtime, reqVO.getPrintDtime()) - .betweenIfPresent(PurchaseOrderNoDO::getOrdDate, reqVO.getOrdDate()) - .eqIfPresent(PurchaseOrderNoDO::getReceivingStatus, reqVO.getReceivingStatus()) - .eqIfPresent(PurchaseOrderNoDO::getCurrencyType, reqVO.getCurrencyType()) - .eqIfPresent(PurchaseOrderNoDO::getTaxRatio, reqVO.getTaxRatio()) - .orderByDesc(PurchaseOrderNoDO::getId)); + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + + 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(MaterialPlanDO.class, "m", MaterialPlanDO::getId, PurchaseOrderNoDO::getProjectMaterialPlanId) + .disableSubLogicDel() + .orderByDesc(PurchaseOrderNoDO::getCreateTime); + query.like(!StringUtils.isEmpty(reqVO.getPurchaseNo()), PurchaseOrderDO::getPurchaseNo, reqVO.getPurchaseNo()) + .like(!StringUtils.isEmpty(reqVO.getSupplierName()), "s.name", reqVO.getSupplierName()) + .like(!StringUtils.isEmpty(reqVO.getMaterialPlanNo()), "m.project_material_plan_no", reqVO.getMaterialPlanNo()) + .apply(!StringUtils.isEmpty(reqVO.getCreateTime()), "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) + .eq(reqVO.getStatus() != null, PurchaseOrderNoDO::getStatus, reqVO.getStatus()) + .eq(reqVO.getReceivingStatus() != null, PurchaseOrderNoDO::getReceivingStatus, reqVO.getReceivingStatus()) + .eq(reqVO.getPurchaseType() != null, PurchaseOrderNoDO::getPurchaseType, reqVO.getPurchaseType()) + .eq(reqVO.getGoodsType() != null, PurchaseOrderNoDO::getGoodsType, reqVO.getGoodsType()) + .in(reqVO.getIds() != null && !reqVO.getIds().isEmpty(),PurchaseOrderNoDO::getId,reqVO.getIds()); + + return selectPage(reqVO, query); } default PageResult getPurchaseOrderPage(PurchaseOrderNoPageReqVO pageReqVO){ @@ -58,4 +61,26 @@ public interface PurchaseOrderNoMapper extends BaseMapperX { } + + default PageResult getPurchaseOrderPageByStatus(PurchaseOrderNoPageReqVO pageReqVO){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + + query.selectAll(PurchaseOrderNoDO.class) + .select("s.name as supplierName","m.project_material_plan_no as materialPlanNo") + .leftJoin(SupplierDO.class, "s", SupplierDO::getId, PurchaseOrderDO::getSupplierId) + .leftJoin(MaterialPlanDO.class, "m", MaterialPlanDO::getId, PurchaseOrderDO::getProjectMaterialPlanId) + .disableSubLogicDel() + .orderByDesc(PurchaseOrderDO::getCreateTime); + query.like(!StringUtils.isEmpty(pageReqVO.getPurchaseNo()), PurchaseOrderNoDO::getPurchaseNo, pageReqVO.getPurchaseNo()) + .like(!StringUtils.isEmpty(pageReqVO.getSupplierName()), "s.name", pageReqVO.getSupplierName()) + .like(!StringUtils.isEmpty(pageReqVO.getMaterialPlanNo()), "m.project_material_plan_no", pageReqVO.getMaterialPlanNo()) + .apply(pageReqVO.getCreateTime() != null, "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", pageReqVO.getCreateTime()) + .eq(pageReqVO.getStatus() != null, PurchaseOrderNoDO::getStatus, pageReqVO.getStatus()) + .eq(pageReqVO.getAuditor() != null, PurchaseOrderNoDO::getAuditor, pageReqVO.getAuditor()) + .ne(true, PurchaseOrderDO::getStatus, PurchaseStatusEnum.START.getCode()) + .eq(pageReqVO.getPurchaseType() != null, PurchaseOrderNoDO::getPurchaseType, pageReqVO.getPurchaseType()) + .eq(pageReqVO.getGoodsType() != null, PurchaseOrderNoDO::getGoodsType, pageReqVO.getGoodsType()); + + return selectPage(pageReqVO, 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/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 21a7c85..8f6bafe 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 @@ -5,7 +5,15 @@ import java.util.*; 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.material.MaterialDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO; +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.purchaseordernodetail.PurchaseOrderNoDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageMaterialDO; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail.vo.*; @@ -17,41 +25,24 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail.v @Mapper public interface PurchaseOrderNoDetailMapper extends BaseMapperX { - default PageResult selectPage(PurchaseOrderNoDetailPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(PurchaseOrderNoDetailDO::getPurchaseOrderId, reqVO.getPurchaseOrderId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getBoomDetailId, reqVO.getBoomDetailId()) - .likeIfPresent(PurchaseOrderNoDetailDO::getBoomName, reqVO.getBoomName()) - .eqIfPresent(PurchaseOrderNoDetailDO::getBoomSpec, reqVO.getBoomSpec()) - .eqIfPresent(PurchaseOrderNoDetailDO::getBoomUnit, reqVO.getBoomUnit()) - .eqIfPresent(PurchaseOrderNoDetailDO::getComposition, reqVO.getComposition()) - .eqIfPresent(PurchaseOrderNoDetailDO::getPurchaseAmount, reqVO.getPurchaseAmount()) - .eqIfPresent(PurchaseOrderNoDetailDO::getEstimatedPrice, reqVO.getEstimatedPrice()) - .eqIfPresent(PurchaseOrderNoDetailDO::getActualPrice, reqVO.getActualPrice()) - .betweenIfPresent(PurchaseOrderNoDetailDO::getArriveTime, reqVO.getArriveTime()) - .eqIfPresent(PurchaseOrderNoDetailDO::getDescription, reqVO.getDescription()) - .betweenIfPresent(PurchaseOrderNoDetailDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(PurchaseOrderNoDetailDO::getBoomAmount, reqVO.getBoomAmount()) - .betweenIfPresent(PurchaseOrderNoDetailDO::getRequireTime, reqVO.getRequireTime()) - .eqIfPresent(PurchaseOrderNoDetailDO::getProjectMaterialPlanId, reqVO.getProjectMaterialPlanId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getProjectMaterialPlanBoomId, reqVO.getProjectMaterialPlanBoomId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getProjectPlanSubId, reqVO.getProjectPlanSubId()) - .likeIfPresent(PurchaseOrderNoDetailDO::getName, reqVO.getName()) - .eqIfPresent(PurchaseOrderNoDetailDO::getNameSim, reqVO.getNameSim()) - .eqIfPresent(PurchaseOrderNoDetailDO::getProjectId, reqVO.getProjectId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getProjectPlanId, reqVO.getProjectPlanId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getCustomerId, reqVO.getCustomerId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getBrief, reqVO.getBrief()) - .likeIfPresent(PurchaseOrderNoDetailDO::getProjectName, reqVO.getProjectName()) - .eqIfPresent(PurchaseOrderNoDetailDO::getProjectNameSim, reqVO.getProjectNameSim()) - .eqIfPresent(PurchaseOrderNoDetailDO::getMaterialId, reqVO.getMaterialId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getReceivingStatus, reqVO.getReceivingStatus()) - .eqIfPresent(PurchaseOrderNoDetailDO::getStorageId, reqVO.getStorageId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getStorageMatId, reqVO.getStorageMatId()) - .eqIfPresent(PurchaseOrderNoDetailDO::getPurchaseRemAmount, reqVO.getPurchaseRemAmount()) - .eqIfPresent(PurchaseOrderNoDetailDO::getTheWeight, reqVO.getTheWeight()) - .eqIfPresent(PurchaseOrderNoDetailDO::getDuEmpId, reqVO.getDuEmpId()) - .orderByDesc(PurchaseOrderNoDetailDO::getId)); - } + default PageResult selectPage(PurchaseOrderNoDetailPageReqVO pageReqVO) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(PurchaseOrderNoDetailDO.class) + .select("mat.id as matId","mat.name as matName","mat.code as matCode","mat.spec as matSpec","mat.unit as matUnit","mat.material_type as matType") + .select(" sum(ifnull(sm.storage_ok_qty,0)) as matRest") + .select(" mp.require_amount") // sum(ifnull(mp.require_amount,0)) as requireAmount + .select("min(mp.require_arrive_time) as requireArriveTime") + .leftJoin(PurchaseOrderDO.class, "pb", PurchaseOrderDO::getId, PurchaseOrderBoomDO::getPurchaseOrderId) + .leftJoin("project_material_plan_detail mp on mp.project_material_plan_id = pb.project_material_plan_id AND mp.material_id = t.material_id") + .leftJoin(MaterialDO.class, "mat", MaterialDO::getId, PurchaseOrderNoDetailDO::getMaterialId) + .leftJoin(StorageMaterialDO.class,"sm",StorageMaterialDO::getId,PurchaseOrderNoDetailDO::getMaterialId) + .disableSubLogicDel() + .groupBy(MaterialPlanDetailDO::getMaterialId) + .orderByAsc(PurchaseOrderMaterialDO::getId); + query.eq(pageReqVO.getPurchaseOrderId()!=null,PurchaseOrderMaterialDO::getPurchaseOrderId, pageReqVO.getPurchaseOrderId()) + .orderByAsc(PurchaseOrderMaterialDO::getCreateTime); + + return selectPage(pageReqVO, 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/materialplan/MaterialPlanService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanService.java index 05d409b..cec2644 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanService.java @@ -66,4 +66,8 @@ public interface MaterialPlanService { Boolean submit(List list); CommonResult withdraw(String code); + + PageResult getBeiKuPage(MaterialPlanPageReqVO pageReqVO); + + MaterialPlanDO getProjectMaterialPlanNo(String code); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java index b348fdf..f542523 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java @@ -326,4 +326,17 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { return CommonResult.success(true); } + @Override + public PageResult getBeiKuPage(MaterialPlanPageReqVO pageReqVO) { + return materialPlanMapper.getBeiKuPage(pageReqVO); + } + + @Override + public MaterialPlanDO getProjectMaterialPlanNo(String code) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MaterialPlanDO::getProjectMaterialPlanNo, code); + queryWrapper.eq(MaterialPlanDO::getDeleted,0); + return materialPlanMapper.selectOne(queryWrapper); + } + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomService.java index 3391b35..4160418 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomService.java @@ -58,4 +58,6 @@ public interface MaterialPlanBoomService { PageResult getProcessBoomDetailList(ProcessBoomPageReqVO pageReqVO); PageResult getMaterialPlanBoomPages(ProcessBoomPageReqVO pageReqVO); + + PageResult getProjectMaterialPlanId(MaterialPlanBoomPageReqVO pageReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java index c7e99d9..0105105 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java @@ -159,4 +159,9 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService { return materialPlanBoomMapper.getMaterialPlanBoomPages(pageReqVO); } + @Override + public PageResult getProjectMaterialPlanId(MaterialPlanBoomPageReqVO pageReqVO) { + return materialPlanBoomMapper.getProjectMaterialPlanId(pageReqVO); + } + } 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 6dfb5d2..889cd7f 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 @@ -53,4 +53,6 @@ public interface PurchaseOrderNoService { PageResult getPurchaseOrderNoPage(PurchaseOrderNoPageReqVO pageReqVO); PageResult getPurchaseOrderPage(PurchaseOrderNoPageReqVO pageReqVO); + + PageResult getPurchaseOrderPageByStatus(PurchaseOrderNoPageReqVO pageReqVO); } 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 9a1f908..662aff1 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,10 +1,33 @@ package com.chanko.yunxi.mes.module.heli.service.purchaseorderno; +import cn.hutool.core.util.ObjectUtil; +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.purchaseorder.PurchaseOrderDO; +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.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.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.serialnumber.SerialNumberService; +import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; import java.util.*; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; @@ -15,6 +38,8 @@ import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorderno.PurchaseOrderNoMapper; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; +import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.PURCHASE_ORDER; import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; /** @@ -28,13 +53,38 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { @Resource private PurchaseOrderNoMapper purchaseOrderNoMapper; + @Resource + private SerialNumberService serialNumberService; + @Resource + private ShenheMapper shenheMapper; + @Resource + private SupplierMapper supplierMapper; + @Resource + private OrderYfService orderYfService; + @Resource + private AdminUserApi userApi; + @Resource + private AttentiontodoMapper attentiontodoMapper; + @Autowired + private AttentiontodoService attentiontodoService; + @Resource + private com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper bdgzsomthingMapper; @Override public Long createPurchaseOrderNo(PurchaseOrderNoSaveReqVO createReqVO) { // 插入 PurchaseOrderNoDO purchaseOrderNo = BeanUtils.toBean(createReqVO, PurchaseOrderNoDO.class); - purchaseOrderNoMapper.insert(purchaseOrderNo); + // 返回 + // 月度流水号 + SerialNumberDO serialNumberDO = new SerialNumberDO(); + serialNumberDO = serialNumberService.getSerialNumber(PURCHASE_ORDER.name(), new SimpleDateFormat("yyyyMMdd").format(new Date())); + serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1); + + purchaseOrderNo.setPurchaseNo(PURCHASE_ORDER.getCode(serialNumberDO.getSerialNumber().toString())); + purchaseOrderNoMapper.insert(purchaseOrderNo); + // 回写序列记录 + serialNumberService.updateSerialNumber(serialNumberDO); return purchaseOrderNo.getId(); } @@ -45,8 +95,116 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { // 更新 PurchaseOrderNoDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderNoDO.class); purchaseOrderNoMapper.updateById(updateObj); + // 更新 + SupplierDO supplier = supplierMapper.selectById(updateReqVO.getSupplierId()); + String supplierName = supplier.getName(); + LocalDateTime currTime = LocalDateTime.now(); + LoginUser loginUser = getLoginUser(); + if (updateReqVO.getStatus() == 2 && (updateObj.getAuditor() == null || !updateReqVO.getAuditor().equals(loginUser.getId()) )) { + ShenheDO shenHeDO = shenheMapper.selectOne(ShenheDO::getShenheName,"1",ShenheDO::getShenheNum,1); + if (shenHeDO != null) { + updateObj.setAuditor(shenHeDO.getShenheUser()); + updateObj.setSubmitTime(currTime); + } else { + // 处理未找到审核人情况 + throw new RuntimeException("审核人未找到"); + } + }else if(updateReqVO.getStatus()==2 && updateReqVO.getAuditor().equals(loginUser.getId())){ + ShenheDO shenHeDOOne = shenheMapper.selectOne(ShenheDO::getShenheName,"1",ShenheDO::getShenheUser,updateReqVO.getAuditor()); + if (shenHeDOOne != null) { + ShenheDO shenHeDOTwo = shenheMapper.selectOne(ShenheDO::getShenheName,"1",ShenheDO::getShenheNum,shenHeDOOne.getShenheNum()+1); + if(shenHeDOTwo != null ){ + updateObj.setAuditor(shenHeDOTwo.getShenheUser()); + updateObj.setSubmitTime(currTime); + }else if(shenHeDOTwo == null){ + updateObj.setStatus(3); + updateObj.setAuditTime(currTime); + OrderYfSaveReqVO orderYfVO = new OrderYfSaveReqVO(); + orderYfVO.setCgOrderNum(updateReqVO.getPurchaseNo()); + orderYfVO.setCgGysname(supplierName); + orderYfVO.setCgYf(updateReqVO.getActualPrice()); + orderYfService.createCg(orderYfVO); + } + } else { + throw new RuntimeException("采购订单审核失败，请联系管理员！"); + } + } + if(updateReqVO.getStatus()== 3){ +// pOrderReceivedCompleted(updateReqVO.getPurchaseNo(),updateReqVO.getId()); + } + purchaseOrderNoMapper.updateById(updateObj); } + private void pOrderReceivedCompleted(String purchaseNo,Long id) { + PurchaseOrderNoPageReqVO purchaseOrderPageReqVO = new PurchaseOrderNoPageReqVO(); + purchaseOrderPageReqVO.setPageNo(1); + purchaseOrderPageReqVO.setPageSize(10); + purchaseOrderPageReqVO.setId(id); + PageResult purchaseOrderDOPageResult = purchaseOrderNoMapper.selectPage(purchaseOrderPageReqVO); + PurchaseOrderNoDO purchaseOrderDO = purchaseOrderDOPageResult.getList().get(0); + String materialPlanNo = purchaseOrderDO.getMaterialPlanNo(); + bdgzsomthingDO abc= new bdgzsomthingDO(); + abc.setThingname("《物料需求计划》的采购"); + abc.setAttr3(materialPlanNo);//改成单独查询的 + bdgzsomthingMapper.updateokone(abc); + //采购订单收货完成 + List attentiontodook = attentiontodoMapper.selectByIdlist(10);//查找该类型的待办和关注人 改 + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(10); + if (attentiontodook1.size()<1){ + { + + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("《采购订单》到货时通知检验"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + + } + + + + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { + { + // for (StorageLogNowDO storageLogNowDO : pageResult) { + bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); + BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 + BdgzsomthingDO.setThings("采购订单"+purchaseNo+"已完成收货");//事件名称 + + BdgzsomthingDO.setAttr2(purchaseNo);//跳转携带参数 + BdgzsomthingDO.setAttr3(purchaseNo);//独特标识 +// BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 +// BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 + if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 + BdgzsomthingDO.setDborgz("待办"); + } + else if(attentiontodoRespVO.getAttr5().equals("2")){ + BdgzsomthingDO.setDborgz("关注"); + } + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + if(attentiontodoRespVO.getLevel().equals("1")){ + BdgzsomthingDO.setLevel("紧急"); + } + else if(attentiontodoRespVO.getLevel().equals("2")){ + BdgzsomthingDO.setLevel("一般"); + } + else if(attentiontodoRespVO.getLevel().equals("3")){ + BdgzsomthingDO.setLevel("非紧急"); + } +// BdgzsomthingDO.setClick(attentiontodoRespVO.getRemindman());//提醒人 + BdgzsomthingDO.setYesorno("0");//是否点击 + BdgzsomthingDO.setAttr4("0");//是否已处理 + +// BdgzsomthingDO.setShowname(operateReqVO.getCreateTime());//获取数据当前表的创建事件 改 + bdgzsomthingMapper.insert(BdgzsomthingDO); + + // } + } + } + } @Override public void deletePurchaseOrderNo(Long id) { // 校验存在 @@ -76,4 +234,12 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { return purchaseOrderNoMapper.getPurchaseOrderPage(pageReqVO); } + @Override + public PageResult getPurchaseOrderPageByStatus(PurchaseOrderNoPageReqVO pageReqVO) { + if (ObjectUtil.isNotEmpty(pageReqVO.getStatus())&&pageReqVO.getStatus()==2){ + pageReqVO.setAuditor(getLoginUser().getId()); + } + return purchaseOrderNoMapper.getPurchaseOrderPageByStatus(pageReqVO); + } + } diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts index abfd829..7a8c9f2 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts @@ -67,3 +67,11 @@ export const submitForm = async (data) => { export const withdraw = async (code) => { return await request.get({ url: `/heli/material-plan/withdraw?code=` + code }) } +// 查询备库物料需求计划分页 +export const getBeiKuPage = async (params) => { + return await request.get({ url: `/heli/material-plan/getBeiKuPage`, params }) +} +// 查询物料需求计划详情 +export const getProjectMaterialPlanNo = async (code:string) => { + return await request.get({ url: `/heli/material-plan/getProjectMaterialPlanNo?code=` + code }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplanboom/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplanboom/index.ts index 43cb499..676d1d5 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplanboom/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplanboom/index.ts @@ -51,3 +51,6 @@ export const exportMaterialPlanBoom = async (params) => { export const getMaterialPlanBoomPages = async (params) => { return await request.get({ url: `/heli/material-plan-boom/pages`, params }) } +export const getProjectMaterialPlanId = async (params) => { + return await request.get({ url: `/heli/material-plan-boom/getProjectMaterialPlanId`, params }) +} 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 62cd540..943985d 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 @@ -55,3 +55,11 @@ export const exportPurchaseOrderNo = async (params) => { export const getPurchaseOrderPage = async (params) => { return await request.get({ url: `/heli/purchase-order-no/getPurchaseOrderPage`, params }) } +// 查询采购订单分页 +export const getPurchaseOrderNoPageByStatus = async (params) => { + return await request.get({ url: `/heli/purchase-order-no/page-by-status`, params }) +} +// 修改采购订单收获状态 +export const updateReceivingStatus = async (id: number) => { + return await request.put({ url: `/heli/purchase-order/updateRSById?id=` + id }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/components/Table/src/Table.vue b/mes-ui/mes-ui-admin-vue3/src/components/Table/src/Table.vue index 279a9fa..e9e50af 100644 --- a/mes-ui/mes-ui-admin-vue3/src/components/Table/src/Table.vue +++ b/mes-ui/mes-ui-admin-vue3/src/components/Table/src/Table.vue @@ -56,7 +56,7 @@ export default defineComponent({ // 注册 onMounted(() => { const tableRef = unref(elTableRef) - emit('register', tableRef?.$parent, elTableRef) + emit('register', tableRef?.$parent, elTableRef.value) }) const pageSizeRef = ref(props.pageSize) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/index.vue index 5a29bbc..e5fb49e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/index.vue @@ -100,7 +100,7 @@ width="180px" v-if="false" /> - + @@ -108,17 +108,17 @@ - - - - - + + + + + - - + + - - - + + + + + + + - - - - + { loading.value = true try { - const data = await materialPlanDetailApi.getMaterialPlanDetailPage(queryParams) + const data = await materialPlanBoomApi.getProjectMaterialPlanId(queryParams) list.value = data.list - console.log(list.value); total.value = data.total } finally { loading.value = false diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/materialPlanDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/materialPlanDialog.vue index d439c29..2f7660f 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/materialPlanDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/materialPlanDialog.vue @@ -1,5 +1,5 @@