diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/InvoiceController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/InvoiceController.java index 6a4cdd3..6d56562 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/InvoiceController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/InvoiceController.java @@ -107,4 +107,12 @@ public class InvoiceController { List invoice = invoiceService.getOrderYsInvoice(code); return success(invoice); } + @GetMapping("/getOrderYfInvoice") + @Operation(summary = "根据采购订单获得财务发票") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:invoice:query')") + public CommonResult> getOrderYfInvoice(@RequestParam("code") String code) { + List invoice = invoiceService.getOrderYfInvoice(code); + return success(invoice); + } } 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 742a8d0..4dd2b75 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 @@ -78,7 +78,6 @@ public class MaterialPlanBoomController { @Operation(summary = "获得物料需求计划加工件明细分页") @PreAuthorize("@ss.hasPermission('heli:material-plan-boom:query')") public CommonResult> getMaterialPlanBoomPage(@Valid MaterialPlanBoomPageReqVO pageReqVO) { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); PageResult pageResult = materialPlanBoomService.getMaterialPlanBoomPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MaterialPlanBoomRespVO.class)); } 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 3938e7a..11097dc 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 @@ -66,6 +66,10 @@ public class MaterialPlanBoomRespVO extends PageParam { @Schema(description = "材质id") @ExcelProperty("材质id") private Long compositionId; + @Schema(description = "工序") + @ExcelProperty("工序") + private String procedureName; + } \ 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/orderyf/vo/OrderYfRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfRespVO.java index 3ca7451..5db2ec1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfRespVO.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -15,11 +16,9 @@ import com.alibaba.excel.annotation.*; public class OrderYfRespVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20332") - @ExcelProperty("主键") private Integer id; @Schema(description = "创建时间") - @ExcelProperty("创建时间") private LocalDateTime createTime; @Schema(description = "采购订单编号") @@ -27,7 +26,6 @@ public class OrderYfRespVO { private String cgOrderNum; @Schema(description = "生成日期") - @ExcelProperty("生成日期") private LocalDateTime cgTime; @Schema(description = "供应商名称", example = "王五") @@ -35,19 +33,23 @@ public class OrderYfRespVO { private String cgGysname; @Schema(description = "应付金额") - @ExcelProperty("应付金额") + @ExcelProperty("应付金额(元)") private BigDecimal cgYf; @Schema(description = "已付金额") - @ExcelProperty("已付金额") + @ExcelProperty("已付金额(元)") private BigDecimal cgYifu; + @Schema(description = "已开票金额") + @ExcelProperty("已开票金额(元)") + private BigDecimal amount; - @Schema(description = "是否付款完成") - @ExcelProperty("是否付款完成") + @Schema(description = "付款状态") + @ExcelProperty("付款状态") private Integer cgTypee; @Schema(description = "备注") @ExcelProperty("备注") private String rem; + } \ 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/orderyf/vo/OrderYfSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfSaveReqVO.java index 89d5533..e193667 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfSaveReqVO.java @@ -1,40 +1,44 @@ -package com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 应付记录新增/修改 Request VO") -@Data -public class OrderYfSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20332") - private Integer id; - - @Schema(description = "采购订单编号") - private String cgOrderNum; - - @Schema(description = "生成日期") - private LocalDateTime cgTime; - - @Schema(description = "供应商名称", example = "王五") - private String cgGysname; - - @Schema(description = "应付金额") - private BigDecimal cgYf; - - @Schema(description = "已付金额") - private BigDecimal cgYifu; - - @Schema(description = "是否付款完成") - private Integer cgTypee; - - @Schema(description = "备注") - private String rem; - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo; + +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyfdetail.OrderYfDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderysdetail.OrderYsDetailDO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 应付记录新增/修改 Request VO") +@Data +public class OrderYfSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20332") + private Integer id; + + @Schema(description = "采购订单编号") + private String cgOrderNum; + + @Schema(description = "生成日期") + private LocalDateTime cgTime; + + @Schema(description = "供应商名称", example = "王五") + private String cgGysname; + + @Schema(description = "应付金额") + private BigDecimal cgYf; + + @Schema(description = "已付金额") + private BigDecimal cgYifu; + + @Schema(description = "是否付款完成") + private Integer cgTypee; + + @Schema(description = "备注") + private String rem; + @Schema(description = "收款明细") + private List orderYfDetails; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/OrderYfDetailController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/OrderYfDetailController.java new file mode 100644 index 0000000..ff4d62d --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/OrderYfDetailController.java @@ -0,0 +1,104 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.orderyfdetail; + +import com.chanko.yunxi.mes.module.heli.controller.admin.orderysdetail.vo.OrderYsDetailRespVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderysdetail.OrderYsDetailDO; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +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.*; +import java.io.IOException; + +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; + +import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; + +import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; +import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.chanko.yunxi.mes.module.heli.controller.admin.orderyfdetail.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyfdetail.OrderYfDetailDO; +import com.chanko.yunxi.mes.module.heli.service.orderyfdetail.OrderYfDetailService; + +@Tag(name = "管理后台 - 应付明细") +@RestController +@RequestMapping("/heli/order-yf-detail") +@Validated +public class OrderYfDetailController { + + @Resource + private OrderYfDetailService orderYfDetailService; + + @PostMapping("/create") + @Operation(summary = "创建应付明细") + @PreAuthorize("@ss.hasPermission('heli:order-yf-detail:create')") + public CommonResult createOrderYfDetail(@Valid @RequestBody OrderYfDetailSaveReqVO createReqVO) { + return success(orderYfDetailService.createOrderYfDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新应付明细") + @PreAuthorize("@ss.hasPermission('heli:order-yf-detail:update')") + public CommonResult updateOrderYfDetail(@Valid @RequestBody OrderYfDetailSaveReqVO updateReqVO) { + orderYfDetailService.updateOrderYfDetail(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除应付明细") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('heli:order-yf-detail:delete')") + public CommonResult deleteOrderYfDetail(@RequestParam("id") Integer id) { + orderYfDetailService.deleteOrderYfDetail(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得应付明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:order-yf-detail:query')") + public CommonResult getOrderYfDetail(@RequestParam("id") Integer id) { + OrderYfDetailDO orderYfDetail = orderYfDetailService.getOrderYfDetail(id); + return success(BeanUtils.toBean(orderYfDetail, OrderYfDetailRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得应收明细分页") + @PreAuthorize("@ss.hasPermission('heli:order-yf-detail:query')") + public CommonResult> getOrderYfDetailPage(@Valid OrderYfDetailPageReqVO pageReqVO) { + PageResult pageResult = orderYfDetailService.getOrderYfDetailPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, OrderYfDetailRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出应收明细 Excel") + @PreAuthorize("@ss.hasPermission('heli:order-yf-detail:export')") + @OperateLog(type = EXPORT) + public void exportOrderYfDetailExcel(@Valid OrderYfDetailPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = orderYfDetailService.getOrderYfDetailPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "应收明细.xls", "数据", OrderYfDetailRespVO.class, + BeanUtils.toBean(list, OrderYfDetailRespVO.class)); + } + @GetMapping("/getOrderYfDetails") + @Operation(summary = "获得应收记录表明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:order-ys-detail:query')") + public CommonResult> getOrderYfDetails(@RequestParam("id") Integer id) { + List orderYfDetail = orderYfDetailService.getOrderYfDetails(id); + return success(BeanUtils.toBean(orderYfDetail, OrderYfDetailRespVO.class)); + } +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/vo/OrderYfDetailPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/vo/OrderYfDetailPageReqVO.java new file mode 100644 index 0000000..7f91ee5 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/vo/OrderYfDetailPageReqVO.java @@ -0,0 +1,38 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.orderyfdetail.vo; + +import lombok.*; + +import java.time.LocalDate; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 应收明细分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class OrderYfDetailPageReqVO extends PageParam { + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "回款金额") + private BigDecimal cgYifu; + + @Schema(description = "备注") + private String rem; + + @Schema(description = "回款日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDate[] paymentDate; + + @Schema(description = "应付id", example = "10874") + private Integer cgId; + +} \ 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/orderyfdetail/vo/OrderYfDetailRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/vo/OrderYfDetailRespVO.java new file mode 100644 index 0000000..fdcad97 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/vo/OrderYfDetailRespVO.java @@ -0,0 +1,43 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.orderyfdetail.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDate; +import java.util.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 应收明细 Response VO") +@Data +@ExcelIgnoreUnannotated +public class OrderYfDetailRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24328") + @ExcelProperty("主键") + private Integer id; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "付款金额") + @ExcelProperty("付款金额") + private BigDecimal cgYifu; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String rem; + + @Schema(description = "付款日期") + @ExcelProperty("回款日期") + private LocalDate paymentDate; + + @Schema(description = "应付id", example = "10874") + @ExcelProperty("应付id") + private Integer cgId; + +} \ 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/orderyfdetail/vo/OrderYfDetailSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/vo/OrderYfDetailSaveReqVO.java new file mode 100644 index 0000000..f2ed7cd --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyfdetail/vo/OrderYfDetailSaveReqVO.java @@ -0,0 +1,31 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.orderyfdetail.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDate; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 应付明细新增/修改 Request VO") +@Data +public class OrderYfDetailSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24328") + private Integer id; + + @Schema(description = "付款金额") + private BigDecimal cgYifu; + + @Schema(description = "备注") + private String rem; + + @Schema(description = "付款日期") + private LocalDate paymentDate; + + @Schema(description = "应付id", example = "10874") + private Integer cgId; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/vo/ProcessBomExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/vo/ProcessBomExcelVO.java index 0934ea3..3d887e5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/vo/ProcessBomExcelVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/vo/ProcessBomExcelVO.java @@ -44,7 +44,7 @@ public class ProcessBomExcelVO { private String blueprintNo; @ExcelProperty("数量") - private Integer amount; + private Integer amounts; @ExcelProperty(value = "单位", converter = DictConvert.class) @DictFormat("heli_material_unit") 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 new file mode 100644 index 0000000..c0cbcc4 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java @@ -0,0 +1,102 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno; + +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.service.purchaseorderno.PurchaseOrderNoService; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +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.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; + +import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; + +import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; +import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; + +@Tag(name = "管理后台 - 采购订单主") +@RestController +@RequestMapping("/heli/purchase-order-no") +@Validated +public class PurchaseOrderNoController { + + @Resource + private PurchaseOrderNoService purchaseOrderNoService; + + @PostMapping("/create") + @Operation(summary = "创建采购订单主") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no:create')") + public CommonResult createPurchaseOrderNo(@Valid @RequestBody PurchaseOrderNoSaveReqVO createReqVO) { + return success(purchaseOrderNoService.createPurchaseOrderNo(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新采购订单主") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no:update')") + public CommonResult updatePurchaseOrderNo(@Valid @RequestBody PurchaseOrderNoSaveReqVO updateReqVO) { + purchaseOrderNoService.updatePurchaseOrderNo(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除采购订单主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('project:purchase-order-no:delete')") + public CommonResult deletePurchaseOrderNo(@RequestParam("id") Long id) { + purchaseOrderNoService.deletePurchaseOrderNo(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得采购订单主") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no:query')") + public CommonResult getPurchaseOrderNo(@RequestParam("id") Long id) { + PurchaseOrderNoDO purchaseOrderNo = purchaseOrderNoService.getPurchaseOrderNo(id); + return success(BeanUtils.toBean(purchaseOrderNo, PurchaseOrderNoRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得采购订单主分页") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no:query')") + public CommonResult> getPurchaseOrderNoPage(@Valid PurchaseOrderNoPageReqVO pageReqVO) { + PageResult pageResult = purchaseOrderNoService.getPurchaseOrderNoPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, PurchaseOrderNoRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出采购订单主 Excel") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no:export')") + @OperateLog(type = EXPORT) + public void exportPurchaseOrderNoExcel(@Valid PurchaseOrderNoPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = purchaseOrderNoService.getPurchaseOrderNoPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "采购订单主.xls", "数据", PurchaseOrderNoRespVO.class, + BeanUtils.toBean(list, PurchaseOrderNoRespVO.class)); + } + @GetMapping("/getPurchaseOrderPage") + @Operation(summary = "获得采购订单主分页") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no:query')") + public CommonResult> getPurchaseOrderPage(@Valid PurchaseOrderNoPageReqVO pageReqVO) { + PageResult pageResult = purchaseOrderNoService.getPurchaseOrderPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, PurchaseOrderNoRespVO.class)); + } +} 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 new file mode 100644 index 0000000..010a42f --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java @@ -0,0 +1,86 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo; + +import lombok.*; + +import java.time.LocalDate; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 采购订单主分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PurchaseOrderNoPageReqVO extends PageParam { + + @Schema(description = "采购单号") + private String purchaseNo; + + @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") + private Boolean purchaseType; + + @Schema(description = "采购物类型，1物料，2加工件", example = "2") + private Boolean goodsType; + + @Schema(description = "暂估价金额", example = "2163") + private BigDecimal estimatedPrice; + + @Schema(description = "实际价金额", example = "1238") + private BigDecimal actualPrice; + + @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") + private Boolean status; + + @Schema(description = "送审人", example = "18499") + private Long submitUserId; + + @Schema(description = "送审时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] submitTime; + + @Schema(description = "审核人") + private Long auditor; + + @Schema(description = "审核时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] auditTime; + + @Schema(description = "备注", example = "随便") + private String description; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "供应商id", example = "3648") + private Long supplierId; + + @Schema(description = "是否打印") + private String isPrint; + + @Schema(description = "打印时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] printDtime; + + @Schema(description = "订单日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDate[] ordDate; + + @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "1") + private Boolean receivingStatus; + + @Schema(description = "结算币种", example = "2") + private Integer currencyType; + + @Schema(description = "税率") + private Integer taxRatio; + + @Schema(description = "供应商名称") + 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/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 new file mode 100644 index 0000000..acb8b3a --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoRespVO.java @@ -0,0 +1,101 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDate; +import java.util.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 采购订单主 Response VO") +@Data +@ExcelIgnoreUnannotated +public class PurchaseOrderNoRespVO { + + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "5114") + @ExcelProperty("自增字段，唯一") + private Long id; + + @Schema(description = "采购单号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("采购单号") + private String purchaseNo; + + @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") + @ExcelProperty("采购单类型，1按物料需求计划采购，2备库采购") + private Integer purchaseType; + + @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("采购物类型，1物料，2加工件") + private Integer goodsType; + + @Schema(description = "暂估价金额", example = "2163") + @ExcelProperty("暂估价金额") + private BigDecimal estimatedPrice; + + @Schema(description = "实际价金额", example = "1238") + @ExcelProperty("实际价金额") + private BigDecimal actualPrice; + + @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") + @ExcelProperty("单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1") + private Integer status; + + @Schema(description = "送审人", example = "18499") + @ExcelProperty("送审人") + private Long submitUserId; + + @Schema(description = "送审时间") + @ExcelProperty("送审时间") + private LocalDateTime submitTime; + + @Schema(description = "审核人") + @ExcelProperty("审核人") + private Long auditor; + + @Schema(description = "审核时间") + @ExcelProperty("审核时间") + private LocalDateTime auditTime; + + @Schema(description = "备注", example = "随便") + @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; +} \ 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 new file mode 100644 index 0000000..ea56b0a --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoSaveReqVO.java @@ -0,0 +1,77 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDate; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 采购订单主新增/修改 Request VO") +@Data +public class PurchaseOrderNoSaveReqVO { + + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "5114") + private Long id; + + @Schema(description = "采购单号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "采购单号不能为空") + private String purchaseNo; + + @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") + private Boolean purchaseType; + + @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "采购物类型，1物料，2加工件不能为空") + private Boolean goodsType; + + @Schema(description = "暂估价金额", example = "2163") + private BigDecimal estimatedPrice; + + @Schema(description = "实际价金额", example = "1238") + private BigDecimal actualPrice; + + @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") + private Boolean status; + + @Schema(description = "送审人", example = "18499") + private Long submitUserId; + + @Schema(description = "送审时间") + private LocalDateTime submitTime; + + @Schema(description = "审核人") + private Long auditor; + + @Schema(description = "审核时间") + private LocalDateTime auditTime; + + @Schema(description = "备注", example = "随便") + private String description; + + @Schema(description = "供应商id", example = "3648") + private Long supplierId; + + @Schema(description = "是否打印") + private String isPrint; + + @Schema(description = "打印时间") + private LocalDateTime printDtime; + + @Schema(description = "订单日期") + private LocalDate ordDate; + + @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "1") + private Boolean receivingStatus; + + @Schema(description = "结算币种", example = "2") + private Integer currencyType; + + @Schema(description = "税率") + private Integer taxRatio; + +} 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 new file mode 100644 index 0000000..15b7a20 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java @@ -0,0 +1,95 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +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.*; +import java.io.IOException; + +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; + +import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; + +import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; +import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; + +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.module.heli.service.purchaseordernodetail.PurchaseOrderNoDetailService; + +@Tag(name = "管理后台 - 采购订单明细") +@RestController +@RequestMapping("/heli/purchase-order-no-detail") +@Validated +public class PurchaseOrderNoDetailController { + + @Resource + private PurchaseOrderNoDetailService purchaseOrderNoDetailService; + + @PostMapping("/create") + @Operation(summary = "创建采购订单明细") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:create')") + public CommonResult createPurchaseOrderNoDetail(@Valid @RequestBody PurchaseOrderNoDetailSaveReqVO createReqVO) { + return success(purchaseOrderNoDetailService.createPurchaseOrderNoDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新采购订单明细") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:update')") + public CommonResult updatePurchaseOrderNoDetail(@Valid @RequestBody PurchaseOrderNoDetailSaveReqVO updateReqVO) { + purchaseOrderNoDetailService.updatePurchaseOrderNoDetail(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除采购订单明细") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:delete')") + public CommonResult deletePurchaseOrderNoDetail(@RequestParam("id") Long id) { + purchaseOrderNoDetailService.deletePurchaseOrderNoDetail(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得采购订单明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:query')") + public CommonResult getPurchaseOrderNoDetail(@RequestParam("id") Long id) { + PurchaseOrderNoDetailDO purchaseOrderNoDetail = purchaseOrderNoDetailService.getPurchaseOrderNoDetail(id); + return success(BeanUtils.toBean(purchaseOrderNoDetail, PurchaseOrderNoDetailRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得采购订单明细分页") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:query')") + public CommonResult> getPurchaseOrderNoDetailPage(@Valid PurchaseOrderNoDetailPageReqVO pageReqVO) { + PageResult pageResult = purchaseOrderNoDetailService.getPurchaseOrderNoDetailPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, PurchaseOrderNoDetailRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出采购订单明细 Excel") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:export')") + @OperateLog(type = EXPORT) + public void exportPurchaseOrderNoDetailExcel(@Valid PurchaseOrderNoDetailPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = purchaseOrderNoDetailService.getPurchaseOrderNoDetailPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "采购订单明细.xls", "数据", PurchaseOrderNoDetailRespVO.class, + BeanUtils.toBean(list, PurchaseOrderNoDetailRespVO.class)); + } + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java new file mode 100644 index 0000000..897f9cf --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java @@ -0,0 +1,118 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 采购订单明细分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PurchaseOrderNoDetailPageReqVO extends PageParam { + + @Schema(description = "采购单id", example = "30207") + private Long purchaseOrderId; + + @Schema(description = "加工件boom detail id", example = "11069") + private Long boomDetailId; + + @Schema(description = "零件名称", example = "李四") + private String boomName; + + @Schema(description = "规格型号") + private String boomSpec; + + @Schema(description = "系统单位") + private String boomUnit; + + @Schema(description = "材质") + private String composition; + + @Schema(description = "采购数量") + private BigDecimal purchaseAmount; + + @Schema(description = "暂估价金额", example = "23890") + private BigDecimal estimatedPrice; + + @Schema(description = "实际价金额", example = "22431") + private BigDecimal actualPrice; + + @Schema(description = "预计到货日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] arriveTime; + + @Schema(description = "备注", example = "你猜") + private String description; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "需求数量") + private BigDecimal boomAmount; + + @Schema(description = "需求到货日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requireTime; + + @Schema(description = "物料需求计划id", example = "7559") + private Long projectMaterialPlanId; + + @Schema(description = "物料需求计划子项目id", example = "897") + private Long projectMaterialPlanBoomId; + + @Schema(description = "订单子项目id", example = "24805") + private Long projectPlanSubId; + + @Schema(description = "子项目名称，唯一", example = "芋艿") + private String name; + + @Schema(description = "子项目简码") + private String nameSim; + + @Schema(description = "订单id", example = "7893") + private Long projectId; + + @Schema(description = "生产计划id", example = "15506") + private Long projectPlanId; + + @Schema(description = "客户id", example = "15375") + private Long customerId; + + @Schema(description = "客户简称") + private String brief; + + @Schema(description = "项目名称", example = "王五") + private String projectName; + + @Schema(description = "项目名称简码") + private String projectNameSim; + + @Schema(description = "物料id", example = "5042") + private Long materialId; + + @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "2") + private Boolean receivingStatus; + + @Schema(description = "入库单id", example = "28663") + private Long storageId; + + @Schema(description = "入库单物料id", example = "9584") + private Long storageMatId; + + @Schema(description = "剩余数量") + private BigDecimal purchaseRemAmount; + + @Schema(description = "零件理论重量") + private BigDecimal theWeight; + + @Schema(description = "责任人id", example = "30495") + private Long duEmpId; + +} \ 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/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 new file mode 100644 index 0000000..8623f5d --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailRespVO.java @@ -0,0 +1,149 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 采购订单明细 Response VO") +@Data +@ExcelIgnoreUnannotated +public class PurchaseOrderNoDetailRespVO { + + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "967") + @ExcelProperty("自增字段，唯一") + private Long id; + + @Schema(description = "采购单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30207") + @ExcelProperty("采购单id") + private Long purchaseOrderId; + + @Schema(description = "加工件boom detail id", example = "11069") + @ExcelProperty("加工件boom detail id") + private Long boomDetailId; + + @Schema(description = "零件名称", example = "李四") + @ExcelProperty("零件名称") + private String boomName; + + @Schema(description = "规格型号") + @ExcelProperty("规格型号") + private String boomSpec; + + @Schema(description = "系统单位") + @ExcelProperty("系统单位") + private String boomUnit; + + @Schema(description = "材质") + @ExcelProperty("材质") + private String composition; + + @Schema(description = "采购数量") + @ExcelProperty("采购数量") + private BigDecimal purchaseAmount; + + @Schema(description = "暂估价金额", example = "23890") + @ExcelProperty("暂估价金额") + private BigDecimal estimatedPrice; + + @Schema(description = "实际价金额", example = "22431") + @ExcelProperty("实际价金额") + private BigDecimal actualPrice; + + @Schema(description = "预计到货日期") + @ExcelProperty("预计到货日期") + private LocalDateTime arriveTime; + + @Schema(description = "备注", example = "你猜") + @ExcelProperty("备注") + private String description; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "需求数量") + @ExcelProperty("需求数量") + private BigDecimal boomAmount; + + @Schema(description = "需求到货日期") + @ExcelProperty("需求到货日期") + private LocalDateTime requireTime; + + @Schema(description = "物料需求计划id", example = "7559") + @ExcelProperty("物料需求计划id") + private Long projectMaterialPlanId; + + @Schema(description = "物料需求计划子项目id", example = "897") + @ExcelProperty("物料需求计划子项目id") + private Long projectMaterialPlanBoomId; + + @Schema(description = "订单子项目id", example = "24805") + @ExcelProperty("订单子项目id") + private Long projectPlanSubId; + + @Schema(description = "子项目名称，唯一", example = "芋艿") + @ExcelProperty("子项目名称，唯一") + private String name; + + @Schema(description = "子项目简码") + @ExcelProperty("子项目简码") + private String nameSim; + + @Schema(description = "订单id", example = "7893") + @ExcelProperty("订单id") + private Long projectId; + + @Schema(description = "生产计划id", example = "15506") + @ExcelProperty("生产计划id") + private Long projectPlanId; + + @Schema(description = "客户id", example = "15375") + @ExcelProperty("客户id") + private Long customerId; + + @Schema(description = "客户简称") + @ExcelProperty("客户简称") + private String brief; + + @Schema(description = "项目名称", example = "王五") + @ExcelProperty("项目名称") + private String projectName; + + @Schema(description = "项目名称简码") + @ExcelProperty("项目名称简码") + private String projectNameSim; + + @Schema(description = "物料id", example = "5042") + @ExcelProperty("物料id") + private Long materialId; + + @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "2") + @ExcelProperty("收货状态 未收货/收货中/收货完成 1/2/3") + private Boolean receivingStatus; + + @Schema(description = "入库单id", example = "28663") + @ExcelProperty("入库单id") + private Long storageId; + + @Schema(description = "入库单物料id", example = "9584") + @ExcelProperty("入库单物料id") + private Long storageMatId; + + @Schema(description = "剩余数量") + @ExcelProperty("剩余数量") + private BigDecimal purchaseRemAmount; + + @Schema(description = "零件理论重量") + @ExcelProperty("零件理论重量") + private BigDecimal theWeight; + + @Schema(description = "责任人id", example = "30495") + @ExcelProperty("责任人id") + private Long duEmpId; + +} \ 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/vo/PurchaseOrderNoDetailSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailSaveReqVO.java new file mode 100644 index 0000000..bfb83e5 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailSaveReqVO.java @@ -0,0 +1,113 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 采购订单明细新增/修改 Request VO") +@Data +public class PurchaseOrderNoDetailSaveReqVO { + + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "967") + private Long id; + + @Schema(description = "采购单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30207") + @NotNull(message = "采购单id不能为空") + private Long purchaseOrderId; + + @Schema(description = "加工件boom detail id", example = "11069") + private Long boomDetailId; + + @Schema(description = "零件名称", example = "李四") + private String boomName; + + @Schema(description = "规格型号") + private String boomSpec; + + @Schema(description = "系统单位") + private String boomUnit; + + @Schema(description = "材质") + private String composition; + + @Schema(description = "采购数量") + private BigDecimal purchaseAmount; + + @Schema(description = "暂估价金额", example = "23890") + private BigDecimal estimatedPrice; + + @Schema(description = "实际价金额", example = "22431") + private BigDecimal actualPrice; + + @Schema(description = "预计到货日期") + private LocalDateTime arriveTime; + + @Schema(description = "备注", example = "你猜") + private String description; + + @Schema(description = "需求数量") + private BigDecimal boomAmount; + + @Schema(description = "需求到货日期") + private LocalDateTime requireTime; + + @Schema(description = "物料需求计划id", example = "7559") + private Long projectMaterialPlanId; + + @Schema(description = "物料需求计划子项目id", example = "897") + private Long projectMaterialPlanBoomId; + + @Schema(description = "订单子项目id", example = "24805") + private Long projectPlanSubId; + + @Schema(description = "子项目名称，唯一", example = "芋艿") + private String name; + + @Schema(description = "子项目简码") + private String nameSim; + + @Schema(description = "订单id", example = "7893") + private Long projectId; + + @Schema(description = "生产计划id", example = "15506") + private Long projectPlanId; + + @Schema(description = "客户id", example = "15375") + private Long customerId; + + @Schema(description = "客户简称") + private String brief; + + @Schema(description = "项目名称", example = "王五") + private String projectName; + + @Schema(description = "项目名称简码") + private String projectNameSim; + + @Schema(description = "物料id", example = "5042") + private Long materialId; + + @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "2") + private Boolean receivingStatus; + + @Schema(description = "入库单id", example = "28663") + private Long storageId; + + @Schema(description = "入库单物料id", example = "9584") + private Long storageMatId; + + @Schema(description = "剩余数量") + private BigDecimal purchaseRemAmount; + + @Schema(description = "零件理论重量") + private BigDecimal theWeight; + + @Schema(description = "责任人id", example = "30495") + private Long duEmpId; + +} 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 1a8c07c..c869000 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 @@ -89,6 +89,18 @@ public class MaterialPlanBoomDO extends BaseDO { * 零件重量 */ private BigDecimal matWeight; + /** + * 工序id + */ + private Long procedureId; + /** + * 泡沫否 Y 是 N 否 + */ + private String isFoam; + /** + * 订单打回原因 + */ + private String rejRemark; @TableField(exist = false) private String materialName; @TableField(exist = false) @@ -96,6 +108,8 @@ public class MaterialPlanBoomDO extends BaseDO { @TableField(exist = false) private String boomSpec; @TableField(exist = false) + private String procedureName; + @TableField(exist = false) private String boomUnit; @TableField(exist = false) private String compositionName; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyf/OrderYfDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyf/OrderYfDO.java index 7f20001..2288a00 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyf/OrderYfDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyf/OrderYfDO.java @@ -58,5 +58,7 @@ public class OrderYfDO extends BaseDO { * 备注 */ private String rem; + @TableField(exist = false) + private BigDecimal amount; } \ 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/orderyfdetail/OrderYfDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyfdetail/OrderYfDetailDO.java new file mode 100644 index 0000000..de9ec42 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyfdetail/OrderYfDetailDO.java @@ -0,0 +1,50 @@ +package com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyfdetail; + +import lombok.*; + +import java.time.LocalDate; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.*; +import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; + +/** + * 应收明细 DO + * + * @author 管理员 + */ +@TableName("cg_order_yf_detail") +@KeySequence("cg_order_yf_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class OrderYfDetailDO extends BaseDO { + + /** + * 主键 + */ + @TableId + private Integer id; + /** + * 回款金额 + */ + private BigDecimal cgYifu; + /** + * 备注 + */ + private String rem; + /** + * 应付日期 + */ + private LocalDate paymentDate; + /** + * 应付id + */ + private Integer cgId; + +} \ 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/processbom/ProcessBomDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDetailDO.java index 8851416..144c607 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDetailDO.java @@ -134,6 +134,8 @@ public class ProcessBomDetailDO extends BaseDO { @TableField(exist = false) private BigDecimal storageOkQty; @TableField(exist = false) + private Integer amounts; + @TableField(exist = false) private String bomCode; @TableField(exist = false) private Long boomDetailId; 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 new file mode 100644 index 0000000..6da439d --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseorderno/PurchaseOrderNoDO.java @@ -0,0 +1,114 @@ +package com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno; + +import lombok.*; + +import java.time.*; +import java.util.*; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; + +/** + * 采购订单主 DO + * + * @author 管理员 + */ +@TableName("project_purchase_order_no") +@KeySequence("project_purchase_order_no_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PurchaseOrderNoDO extends BaseDO { + + /** + * 自增字段，唯一 + */ + @TableId + private Long id; + /** + * 采购单号 + */ + private String purchaseNo; + /** + * 采购单类型，1按物料需求计划采购，2备库采购 + */ + private Integer purchaseType; + /** + * 采购物类型，1物料，2加工件 + */ + private Integer goodsType; + /** + * 暂估价金额 + */ + private BigDecimal estimatedPrice; + /** + * 实际价金额 + */ + private BigDecimal actualPrice; + /** + * 单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1 + */ + private Integer status; + /** + * 送审人 + */ + private Long submitUserId; + /** + * 送审时间 + */ + private LocalDateTime submitTime; + /** + * 审核人 + */ + private Long auditor; + /** + * 审核时间 + */ + private LocalDateTime auditTime; + /** + * 备注 + */ + private String description; + /** + * 供应商id + */ + private Long supplierId; + /** + * 是否打印 + */ + private String isPrint; + /** + * 打印时间 + */ + private LocalDateTime printDtime; + /** + * 订单日期 + */ + 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 new file mode 100644 index 0000000..f833e72 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java @@ -0,0 +1,163 @@ +package com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail; + +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.*; +import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; + +/** + * 采购订单明细 DO + * + * @author 管理员 + */ +@TableName("project_purchase_order_no_detail") +@KeySequence("project_purchase_order_no_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PurchaseOrderNoDetailDO extends BaseDO { + + /** + * 自增字段，唯一 + */ + @TableId + private Long id; + /** + * 采购单id + */ + private Long purchaseOrderId; + /** + * 加工件boom detail id + */ + private Long boomDetailId; + /** + * 零件名称 + */ + private String boomName; + /** + * 规格型号 + */ + private String boomSpec; + /** + * 系统单位 + */ + private String boomUnit; + /** + * 材质 + */ + private String composition; + /** + * 采购数量 + */ + private BigDecimal purchaseAmount; + /** + * 暂估价金额 + */ + private BigDecimal estimatedPrice; + /** + * 实际价金额 + */ + private BigDecimal actualPrice; + /** + * 预计到货日期 + */ + private LocalDateTime arriveTime; + /** + * 备注 + */ + private String description; + /** + * 需求数量 + */ + private BigDecimal boomAmount; + /** + * 需求到货日期 + */ + private LocalDateTime requireTime; + /** + * 物料需求计划id + */ + private Long projectMaterialPlanId; + /** + * 物料需求计划子项目id + */ + private Long projectMaterialPlanBoomId; + /** + * 订单子项目id + */ + private Long projectPlanSubId; + /** + * 子项目名称，唯一 + */ + private String name; + /** + * 子项目简码 + */ + private String nameSim; + /** + * 订单id + */ + private Long projectId; + /** + * 生产计划id + */ + private Long projectPlanId; + /** + * 客户id + */ + private Long customerId; + /** + * 客户简称 + */ + private String brief; + /** + * 项目名称 + */ + private String projectName; + /** + * 项目名称简码 + */ + private String projectNameSim; + /** + * 物料id + */ + private Long materialId; + /** + * 收货状态 未收货/收货中/收货完成 1/2/3 + */ + private Boolean receivingStatus; + /** + * 入库单id + */ + private Long storageId; + /** + * 入库单物料id + */ + private Long storageMatId; + /** + * 剩余数量 + */ + private BigDecimal purchaseRemAmount; + /** + * 零件理论重量 + */ + private BigDecimal theWeight; + /** + * 责任人id + */ + private Long duEmpId; + +} \ 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/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 18d28e8..e415d50 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 @@ -9,8 +9,10 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO 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.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.enums.BoomDetailTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; @@ -74,9 +76,11 @@ public interface MaterialPlanBoomMapper extends BaseMapperX default PageResult getMaterialPlanBoomPages(ProcessBoomPageReqVO pageReqVO){ MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(MaterialPlanBoomDO.class) - .select("a.nickname as nickname,b.spec as boomSpec") + .select("a.nickname as nickname,b.spec as boomSpec,g.name as procedureName,bc.`name` as compositionName") .leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId) .leftJoin(ProcessBomDetailDO.class, "b", ProcessBomDetailDO::getId, MaterialPlanBoomDO::getBoomDetailId) + .leftJoin(CompositionDO.class, "bc", CompositionDO::getId, ProcessBomDetailDO::getCompositionId) + .leftJoin(ProcedureDO.class, "g", ProcedureDO::getId, MaterialPlanBoomDO::getProcedureId) .orderByDesc(MaterialPlanBoomDO::getId) .disableSubLogicDel() ; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyf/OrderYfMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyf/OrderYfMapper.java index a5079b7..3725455 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyf/OrderYfMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyf/OrderYfMapper.java @@ -5,9 +5,14 @@ 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.orderys.vo.OrderYsPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyf.OrderYfDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderys.OrderYsDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.*; +import org.springframework.util.StringUtils; /** * 应付记录 Mapper @@ -18,16 +23,34 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.*; public interface OrderYfMapper extends BaseMapperX { default PageResult selectPage(OrderYfPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .betweenIfPresent(OrderYfDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(OrderYfDO::getCgOrderNum, reqVO.getCgOrderNum()) - .betweenIfPresent(OrderYfDO::getCgTime, reqVO.getCgTime()) - .likeIfPresent(OrderYfDO::getCgGysname, reqVO.getCgGysname()) - .eqIfPresent(OrderYfDO::getCgYf, reqVO.getCgYf()) - .eqIfPresent(OrderYfDO::getCgYifu, reqVO.getCgYifu()) - .eqIfPresent(OrderYfDO::getCgTypee, reqVO.getCgTypee()) - .eqIfPresent(OrderYfDO::getRem, reqVO.getRem()) - .orderByDesc(OrderYfDO::getId)); + + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(OrderYfDO.class) + .select("sum(i.amount) as amount") + .leftJoin( + "finance_invoice i ON i.order_code = t.cg_order_num AND i.business_type = 'FINANCE_RECEIVE_INVOICE' AND i.status !='3'") + .disableSubLogicDel() + .groupBy(OrderYfDO::getId) + .orderByDesc(OrderYfDO::getCreateTime); + + query.like(!StringUtils.isEmpty(reqVO.getCgOrderNum()), OrderYfDO::getCgOrderNum, reqVO.getCgOrderNum()) + .like(!StringUtils.isEmpty(reqVO.getCgGysname()), OrderYfDO::getCgGysname, reqVO.getCgGysname()) + .eq(!StringUtils.isEmpty(reqVO.getCgTypee()), OrderYfDO::getCgTypee, reqVO.getCgTypee()); + + return selectPage(reqVO, query); + } + default OrderYfDO selectOrderYfId(Integer id){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(OrderYfDO.class) + .select("sum(i.amount) as amount") + .leftJoin( + "finance_invoice i ON i.order_code = t.cg_order_num AND i.business_type = 'FINANCE_RECEIVE_INVOICE' AND i.status !='3'") + .disableSubLogicDel(); + query + .eq( OrderYsDO::getId, id); + + return selectOne(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/orderyfdetail/OrderYfDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyfdetail/OrderYfDetailMapper.java new file mode 100644 index 0000000..0ff09a2 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyfdetail/OrderYfDetailMapper.java @@ -0,0 +1,30 @@ +package com.chanko.yunxi.mes.module.heli.dal.mysql.orderyfdetail; + +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.dal.dataobject.orderyfdetail.OrderYfDetailDO; +import org.apache.ibatis.annotations.Mapper; +import com.chanko.yunxi.mes.module.heli.controller.admin.orderyfdetail.vo.*; + +/** + * 应收明细 Mapper + * + * @author 管理员 + */ +@Mapper +public interface OrderYfDetailMapper extends BaseMapperX { + + default PageResult selectPage(OrderYfDetailPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .betweenIfPresent(OrderYfDetailDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(OrderYfDetailDO::getCgYifu, reqVO.getCgYifu()) + .eqIfPresent(OrderYfDetailDO::getRem, reqVO.getRem()) + .betweenIfPresent(OrderYfDetailDO::getPaymentDate, reqVO.getPaymentDate()) + .eqIfPresent(OrderYfDetailDO::getCgId, reqVO.getCgId()) + .orderByDesc(OrderYfDetailDO::getId)); + } + +} \ 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/processbom/ProcessBomDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java index 5d7bc75..4b6f610 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java @@ -201,7 +201,7 @@ public interface ProcessBomDetailMapper extends BaseMapperX .select( "c.brief as customerName", "b.project_name as projectName","b.project_name_sim as projectNameSim") .select("d.name as projectSubName,d.id as projectSubId,d.name_sim as nameSim,f.name as compositionName") .select("b.id as projectId,g.plan_id as planId,c.id as customerId") - .select("u.nickname as nickname") + .select("u.nickname as nickname,t.amount*d.amount as amounts") .select("DATE_FORMAT(p.boom_arrive_date, '%Y-%m-%d') AS boomArriveDates") .select("p.boom_arrive_date as boomArriveDate,p.du_emp_id as duEmpId,h.project_material_plan_no as projectMaterialPlanNo") .leftJoin(ProcessBomDO.class,"g",ProcessBomDO::getId,ProcessBomDetailDO::getBomId) 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 new file mode 100644 index 0000000..56a6f43 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorderno/PurchaseOrderNoMapper.java @@ -0,0 +1,61 @@ +package com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorderno; + +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.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.github.yulichang.wrapper.MPJLambdaWrapper; +import org.apache.ibatis.annotations.Mapper; +import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.*; +import org.springframework.util.StringUtils; + +/** + * 采购订单主 Mapper + * + * @author 管理员 + */ +@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)); + } + + default PageResult getPurchaseOrderPage(PurchaseOrderNoPageReqVO pageReqVO){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(PurchaseOrderNoDO.class) + .select("s.name as supplierName") + .leftJoin(SupplierDO.class, "s", SupplierDO::getId, PurchaseOrderNoDO::getSupplierId) + .orderByDesc(PurchaseOrderNoDO::getCreateTime); + query.like(!StringUtils.isEmpty(pageReqVO.getPurchaseNo()), PurchaseOrderNoDO::getPurchaseNo, pageReqVO.getPurchaseNo()) + .like(!StringUtils.isEmpty(pageReqVO.getSupplierName()), "s.name", pageReqVO.getSupplierName()) + .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 new file mode 100644 index 0000000..21a7c85 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java @@ -0,0 +1,57 @@ +package com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordernodetail; + +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.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; +import org.apache.ibatis.annotations.Mapper; +import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail.vo.*; + +/** + * 采购订单明细 Mapper + * + * @author 管理员 + */ +@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)); + } + +} \ 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/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index fcdacfc..0ce8cb7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -683,9 +683,9 @@ public interface TaskDispatchDetailMapper extends BaseMapperX getPartPage(MaterialPlanPageReqVO pageReqVO){ MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(TaskDispatchDetailDO.class) - .select("f.name as compositionName,g.name as procedureName,d.amount as boomAmount") + .select("f.name as compositionName,g.name as procedureName,t.amount as boomAmount") .select("b.project_name_sim as projectNameSim,c.name_sim as nameSim") - .select("b.id as projectId,i.plan_id as planId,c.id as customerId,d.id as bomDetailId") + .select("b.id as projectId,i.plan_id as planId,e.id as customerId,d.id as bomDetailId") .select( "b.project_name as projectName", "c.name as projectSubName") .select("d.material_name as materialName,DATE_FORMAT(p.boom_arrive_date, '%Y-%m-%d') AS boomArriveDates") .select("e.brief as customerName,u.nickname as nickname,c.id as projectSubId") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceService.java index 8e4e246..6bdceb8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceService.java @@ -56,4 +56,6 @@ public interface InvoiceService { Long operate(InvoiceSaveReqVO operateReqVO); List getOrderYsInvoice(String code); + + List getOrderYfInvoice(String code); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java index 86ae1c9..3ba70be 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java @@ -113,4 +113,12 @@ public class InvoiceServiceImpl implements InvoiceService { return invoiceMapper.selectList(wrapper); } + @Override + public List getOrderYfInvoice(String code) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(InvoiceDO::getOrderCode, code); + wrapper.ne(InvoiceDO::getStatus, InvoiceStatusEnum.CANCEL.getCode()); + return invoiceMapper.selectList(wrapper); + } + } 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 955c556..b348fdf 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 @@ -287,6 +287,7 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { boomDO.setMatName(taskDispatchDetailDO.getMaterialName()); boomDO.setDuEmpId(taskDispatchDetailDO.getDuEmpId()); boomDO.setProjectPlanSubId(taskDispatchDetailDO.getProjectSubId()); + boomDO.setProcedureId(taskDispatchDetailDO.getProcedureId()); boomDO.setMplanStatus(0); boomDO.setMatWeight(taskDispatchDetailDO.getMatWeight()); boomDO.setDescription(taskDispatchDetailDO.getDescription()); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyf/OrderYfServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyf/OrderYfServiceImpl.java index 5bb5c5d..392e55b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyf/OrderYfServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyf/OrderYfServiceImpl.java @@ -1,5 +1,8 @@ package com.chanko.yunxi.mes.module.heli.service.orderyf; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyfdetail.OrderYfDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderysdetail.OrderYsDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.mysql.orderyfdetail.OrderYfDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -7,6 +10,8 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; +import java.util.stream.Collectors; + import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyf.OrderYfDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; @@ -29,6 +34,8 @@ public class OrderYfServiceImpl implements OrderYfService { @Resource private OrderYfMapper orderYfMapper; + @Resource + private OrderYfDetailMapper orderYfDetailMapper; @Override public Integer createOrderYf(OrderYfSaveReqVO createReqVO) { @@ -46,11 +53,21 @@ public class OrderYfServiceImpl implements OrderYfService { // 更新 OrderYfDO updateObj = BeanUtils.toBean(updateReqVO, OrderYfDO.class); - if(updateObj.getCgYifu().compareTo(updateReqVO.getCgYf())>=0){ - updateObj.setCgTypee(2); - } +// if(updateObj.getCgYifu().compareTo(updateReqVO.getCgYf())>=0){ +// updateObj.setCgTypee(2); +// } orderYfMapper.updateById(updateObj); + this.createOrUpdateOrderYfDetails(updateReqVO.getOrderYfDetails()); + + } + private void createOrUpdateOrderYfDetails(List orderYfDetails) { + // 分组更新与插入 + List updateList = orderYfDetails.stream().filter(o -> o.getId() != null).collect(Collectors.toList()); + List insertList = orderYfDetails.stream().filter(o -> o.getId() == null).collect(Collectors.toList()); + + if(!updateList.isEmpty()) orderYfDetailMapper.updateBatch(updateList); + if(!insertList.isEmpty()) orderYfDetailMapper.insertBatch(insertList); } public void createCg(OrderYfSaveReqVO createReqVO){ @@ -75,7 +92,7 @@ public class OrderYfServiceImpl implements OrderYfService { @Override public OrderYfDO getOrderYf(Integer id) { - return orderYfMapper.selectById(id); + return orderYfMapper.selectOrderYfId(id); } @Override diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyfdetail/OrderYfDetailService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyfdetail/OrderYfDetailService.java new file mode 100644 index 0000000..44b0fc2 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyfdetail/OrderYfDetailService.java @@ -0,0 +1,56 @@ +package com.chanko.yunxi.mes.module.heli.service.orderyfdetail; + +import java.util.*; +import javax.validation.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.orderyfdetail.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyfdetail.OrderYfDetailDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; + +/** + * 应收明细 Service 接口 + * + * @author 管理员 + */ +public interface OrderYfDetailService { + + /** + * 创建应收明细 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Integer createOrderYfDetail(@Valid OrderYfDetailSaveReqVO createReqVO); + + /** + * 更新应收明细 + * + * @param updateReqVO 更新信息 + */ + void updateOrderYfDetail(@Valid OrderYfDetailSaveReqVO updateReqVO); + + /** + * 删除应收明细 + * + * @param id 编号 + */ + void deleteOrderYfDetail(Integer id); + + /** + * 获得应收明细 + * + * @param id 编号 + * @return 应收明细 + */ + OrderYfDetailDO getOrderYfDetail(Integer id); + + /** + * 获得应收明细分页 + * + * @param pageReqVO 分页查询 + * @return 应收明细分页 + */ + PageResult getOrderYfDetailPage(OrderYfDetailPageReqVO pageReqVO); + + List getOrderYfDetails(Integer id); +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyfdetail/OrderYfDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyfdetail/OrderYfDetailServiceImpl.java new file mode 100644 index 0000000..9adaa66 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderyfdetail/OrderYfDetailServiceImpl.java @@ -0,0 +1,81 @@ +package com.chanko.yunxi.mes.module.heli.service.orderyfdetail; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderysdetail.OrderYsDetailDO; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.orderyfdetail.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyfdetail.OrderYfDetailDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; + +import com.chanko.yunxi.mes.module.heli.dal.mysql.orderyfdetail.OrderYfDetailMapper; + +import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; + +/** + * 应收明细 Service 实现类 + * + * @author 管理员 + */ +@Service +@Validated +public class OrderYfDetailServiceImpl implements OrderYfDetailService { + + @Resource + private OrderYfDetailMapper orderYfDetailMapper; + + @Override + public Integer createOrderYfDetail(OrderYfDetailSaveReqVO createReqVO) { + // 插入 + OrderYfDetailDO orderYfDetail = BeanUtils.toBean(createReqVO, OrderYfDetailDO.class); + orderYfDetailMapper.insert(orderYfDetail); + // 返回 + return orderYfDetail.getId(); + } + + @Override + public void updateOrderYfDetail(OrderYfDetailSaveReqVO updateReqVO) { + // 校验存在 + validateOrderYfDetailExists(updateReqVO.getId()); + // 更新 + OrderYfDetailDO updateObj = BeanUtils.toBean(updateReqVO, OrderYfDetailDO.class); + orderYfDetailMapper.updateById(updateObj); + } + + @Override + public void deleteOrderYfDetail(Integer id) { + // 校验存在 + validateOrderYfDetailExists(id); + // 删除 + orderYfDetailMapper.deleteById(id); + } + + private void validateOrderYfDetailExists(Integer id) { + if (orderYfDetailMapper.selectById(id) == null) { +// throw exception(ORDER_YF_DETAIL_NOT_EXISTS); + } + } + + @Override + public OrderYfDetailDO getOrderYfDetail(Integer id) { + return orderYfDetailMapper.selectById(id); + } + + @Override + public PageResult getOrderYfDetailPage(OrderYfDetailPageReqVO pageReqVO) { + return orderYfDetailMapper.selectPage(pageReqVO); + } + + @Override + public List getOrderYfDetails(Integer id) { + LambdaQueryWrapper eq = new LambdaQueryWrapper().eq(OrderYfDetailDO::getCgId, id); + return orderYfDetailMapper.selectList(eq); } + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index aab3119..71f5c4c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -1036,12 +1036,11 @@ public class ProcessBomServiceImpl implements ProcessBomService { MaterialPlanBoomDO boomDO = new MaterialPlanBoomDO(); boomDO.setProjectMaterialPlanId(planDO.getId()); boomDO.setBoomDetailId(processBomDetailDO.getId()); - boomDO.setBoomAmount(new BigDecimal(processBomDetailDO.getAmount())); + boomDO.setBoomAmount(new BigDecimal(processBomDetailDO.getAmounts())); boomDO.setBoomArriveDate(processBomDetailDO.getBoomArriveDate()); boomDO.setMatName(processBomDetailDO.getMaterialName()); boomDO.setDuEmpId(processBomDetailDO.getDuEmpId()); boomDO.setProjectPlanSubId(processBomDetailDO.getProjectSubId()); - boomDO.setMaterialId(processBomDetailDO.getMaterialId()); boomDO.setMplanStatus(0); materialPlanBoomDOList.add(boomDO); processBomDetailDO.setMplanDate(processBomDetailDO.getBoomArriveDate()); 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 new file mode 100644 index 0000000..6dfb5d2 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoService.java @@ -0,0 +1,56 @@ +package com.chanko.yunxi.mes.module.heli.service.purchaseorderno; + +import java.util.*; +import javax.validation.*; +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; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; + +/** + * 采购订单主 Service 接口 + * + * @author 管理员 + */ +public interface PurchaseOrderNoService { + + /** + * 创建采购订单主 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPurchaseOrderNo(@Valid PurchaseOrderNoSaveReqVO createReqVO); + + /** + * 更新采购订单主 + * + * @param updateReqVO 更新信息 + */ + void updatePurchaseOrderNo(@Valid PurchaseOrderNoSaveReqVO updateReqVO); + + /** + * 删除采购订单主 + * + * @param id 编号 + */ + void deletePurchaseOrderNo(Long id); + + /** + * 获得采购订单主 + * + * @param id 编号 + * @return 采购订单主 + */ + PurchaseOrderNoDO getPurchaseOrderNo(Long id); + + /** + * 获得采购订单主分页 + * + * @param pageReqVO 分页查询 + * @return 采购订单主分页 + */ + PageResult getPurchaseOrderNoPage(PurchaseOrderNoPageReqVO pageReqVO); + + PageResult getPurchaseOrderPage(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 new file mode 100644 index 0000000..9a1f908 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java @@ -0,0 +1,79 @@ +package com.chanko.yunxi.mes.module.heli.service.purchaseorderno; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +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; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +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.module.heli.enums.ErrorCodeConstants.*; + +/** + * 采购订单主 Service 实现类 + * + * @author 管理员 + */ +@Service +@Validated +public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { + + @Resource + private PurchaseOrderNoMapper purchaseOrderNoMapper; + + @Override + public Long createPurchaseOrderNo(PurchaseOrderNoSaveReqVO createReqVO) { + // 插入 + PurchaseOrderNoDO purchaseOrderNo = BeanUtils.toBean(createReqVO, PurchaseOrderNoDO.class); + purchaseOrderNoMapper.insert(purchaseOrderNo); + // 返回 + return purchaseOrderNo.getId(); + } + + @Override + public void updatePurchaseOrderNo(PurchaseOrderNoSaveReqVO updateReqVO) { + // 校验存在 + validatePurchaseOrderNoExists(updateReqVO.getId()); + // 更新 + PurchaseOrderNoDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderNoDO.class); + purchaseOrderNoMapper.updateById(updateObj); + } + + @Override + public void deletePurchaseOrderNo(Long id) { + // 校验存在 + validatePurchaseOrderNoExists(id); + // 删除 + purchaseOrderNoMapper.deleteById(id); + } + + private void validatePurchaseOrderNoExists(Long id) { + if (purchaseOrderNoMapper.selectById(id) == null) { +// throw exception(PURCHASE_ORDER_NO_NOT_EXISTS); + } + } + + @Override + public PurchaseOrderNoDO getPurchaseOrderNo(Long id) { + return purchaseOrderNoMapper.selectById(id); + } + + @Override + public PageResult getPurchaseOrderNoPage(PurchaseOrderNoPageReqVO pageReqVO) { + return purchaseOrderNoMapper.selectPage(pageReqVO); + } + + @Override + public PageResult getPurchaseOrderPage(PurchaseOrderNoPageReqVO pageReqVO) { + return purchaseOrderNoMapper.getPurchaseOrderPage(pageReqVO); + } + +} 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 new file mode 100644 index 0000000..82bc3b9 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java @@ -0,0 +1,55 @@ +package com.chanko.yunxi.mes.module.heli.service.purchaseordernodetail; + +import java.util.*; +import javax.validation.*; +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; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; + +/** + * 采购订单明细 Service 接口 + * + * @author 管理员 + */ +public interface PurchaseOrderNoDetailService { + + /** + * 创建采购订单明细 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPurchaseOrderNoDetail(@Valid PurchaseOrderNoDetailSaveReqVO createReqVO); + + /** + * 更新采购订单明细 + * + * @param updateReqVO 更新信息 + */ + void updatePurchaseOrderNoDetail(@Valid PurchaseOrderNoDetailSaveReqVO updateReqVO); + + /** + * 删除采购订单明细 + * + * @param id 编号 + */ + void deletePurchaseOrderNoDetail(Long id); + + /** + * 获得采购订单明细 + * + * @param id 编号 + * @return 采购订单明细 + */ + PurchaseOrderNoDetailDO getPurchaseOrderNoDetail(Long id); + + /** + * 获得采购订单明细分页 + * + * @param pageReqVO 分页查询 + * @return 采购订单明细分页 + */ + PageResult getPurchaseOrderNoDetailPage(PurchaseOrderNoDetailPageReqVO pageReqVO); + +} 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 new file mode 100644 index 0000000..0382e73 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java @@ -0,0 +1,74 @@ +package com.chanko.yunxi.mes.module.heli.service.purchaseordernodetail; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +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; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +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.module.heli.enums.ErrorCodeConstants.*; + +/** + * 采购订单明细 Service 实现类 + * + * @author 管理员 + */ +@Service +@Validated +public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailService { + + @Resource + private PurchaseOrderNoDetailMapper purchaseOrderNoDetailMapper; + + @Override + public Long createPurchaseOrderNoDetail(PurchaseOrderNoDetailSaveReqVO createReqVO) { + // 插入 + PurchaseOrderNoDetailDO purchaseOrderNoDetail = BeanUtils.toBean(createReqVO, PurchaseOrderNoDetailDO.class); + purchaseOrderNoDetailMapper.insert(purchaseOrderNoDetail); + // 返回 + return purchaseOrderNoDetail.getId(); + } + + @Override + public void updatePurchaseOrderNoDetail(PurchaseOrderNoDetailSaveReqVO updateReqVO) { + // 校验存在 + validatePurchaseOrderNoDetailExists(updateReqVO.getId()); + // 更新 + PurchaseOrderNoDetailDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderNoDetailDO.class); + purchaseOrderNoDetailMapper.updateById(updateObj); + } + + @Override + public void deletePurchaseOrderNoDetail(Long id) { + // 校验存在 + validatePurchaseOrderNoDetailExists(id); + // 删除 + purchaseOrderNoDetailMapper.deleteById(id); + } + + private void validatePurchaseOrderNoDetailExists(Long id) { + if (purchaseOrderNoDetailMapper.selectById(id) == null) { +// throw exception(PURCHASE_ORDER_NO_DETAIL_NOT_EXISTS); + } + } + + @Override + public PurchaseOrderNoDetailDO getPurchaseOrderNoDetail(Long id) { + return purchaseOrderNoDetailMapper.selectById(id); + } + + @Override + public PageResult getPurchaseOrderNoDetailPage(PurchaseOrderNoDetailPageReqVO pageReqVO) { + return purchaseOrderNoDetailMapper.selectPage(pageReqVO); + } + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/orderyfdetail/OrderYfDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/orderyfdetail/OrderYfDetailMapper.xml new file mode 100644 index 0000000..ad89700 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/orderyfdetail/OrderYfDetailMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/purchaseorderno/PurchaseOrderNoMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/purchaseorderno/PurchaseOrderNoMapper.xml new file mode 100644 index 0000000..e4c10c0 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/purchaseorderno/PurchaseOrderNoMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/purchaseordernodetail/PurchaseOrderNoDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/purchaseordernodetail/PurchaseOrderNoDetailMapper.xml new file mode 100644 index 0000000..cb11591 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/purchaseordernodetail/PurchaseOrderNoDetailMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/UserController.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/UserController.java index e767c18..aba53e0 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/UserController.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/UserController.java @@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.framework.common.enums.CommonStatusEnum; import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.framework.common.pojo.PageParam; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.*; @@ -104,7 +105,20 @@ public class UserController { return success(new PageResult<>(UserConvert.INSTANCE.convertList(pageResult.getList(), deptMap), pageResult.getTotal())); } - + @GetMapping("/all") + @Operation(summary = "获得全部用户列表") + @PreAuthorize("@ss.hasPermission('system:user:list')") + public CommonResult> all() { + // 获得用户分页列表 + List list = userService.getList(); + if (CollUtil.isEmpty(list)) { + return success(BeanUtils.toBean(list, UserRespVO.class)); + } + // 拼接数据 + Map deptMap = deptService.getDeptMap( + convertList(list, AdminUserDO::getDeptId)); + return success(UserConvert.INSTANCE.convertList(list, deptMap)); + } @GetMapping({"/list-all-simple", "/simple-list"}) @Operation(summary = "获取用户精简信息列表", description = "只包含被开启的用户，主要用于前端的下拉选项") public CommonResult> getSimpleUserList() { diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserService.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserService.java index f3962ec..99bf420 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserService.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserService.java @@ -204,4 +204,6 @@ public interface AdminUserService { boolean isPasswordMatch(String rawPassword, String encodedPassword); List getUserListByDeptName(String name); + + List getList(); } diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserServiceImpl.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserServiceImpl.java index 54ee554..fe9098f 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserServiceImpl.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/service/user/AdminUserServiceImpl.java @@ -453,6 +453,14 @@ public class AdminUserServiceImpl implements AdminUserService { return userMapper.getUserListByDeptName(name); } + @Override + public List getList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(AdminUserDO::getStatus, CommonStatusEnum.ENABLE.getStatus()); + wrapper.eq(AdminUserDO::getDeleted, 0); + return userMapper.selectList(wrapper); + } + /** * 对密码进行加密 * diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts index 013428b..7f398e9 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts @@ -55,3 +55,7 @@ export async function operateInvoice(data: InvoiceVO) { export const getOrderYsInvoice = async (code: string) => { return await request.get({ url: `/heli/invoice/getOrderYsInvoice?code=` + code }) } +// 查询应收记录详情 +export const getOrderYfInvoice = async (code: string) => { + return await request.get({ url: `/heli/invoice/getOrderYfInvoice?code=` + code }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/orderyf/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/orderyf/index.ts index bd05148..6e9ccee 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/orderyf/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/orderyf/index.ts @@ -1,42 +1,48 @@ -import request from '@/config/axios' - -export interface OrderYfVO { - id: number - cgOrderNum: string - cgTime: Date - cgGysname: string - cgYf: number - cgYifu: number - cgTypee: number - rem: string -} - -// 查询应付记录分页 -export const getOrderYfPage = async (params) => { - return await request.get({ url: `/heli/order-yf/page`, params }) -} - -// 查询应付记录详情 -export const getOrderYf = async (id: number) => { - return await request.get({ url: `/heli/order-yf/get?id=` + id }) -} - -// 新增应付记录 -export const createOrderYf = async (data: OrderYfVO) => { - return await request.post({ url: `/heli/order-yf/create`, data }) -} - -// 修改应付记录 -export const updateOrderYf = async (data: OrderYfVO) => { - return await request.put({ url: `/heli/order-yf/update`, data }) -} - -// 删除应付记录 -export const deleteOrderYf = async (id: number) => { - return await request.delete({ url: `/heli/order-yf/delete?id=` + id }) -} - -// 导出应付记录 Excel -export const exportOrderYf = async (params) => { - return await request.download({ url: `/heli/order-yf/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface OrderYfVO { + id: number + cgOrderNum: string + cgTime: Date + cgGysname: string + cgYf: number + cgYifu: number + cgTypee: number + rem: string + orderYfDetails:any[]; + +} + +// 查询应付记录分页 +export const getOrderYfPage = async (params) => { + return await request.get({ url: `/heli/order-yf/page`, params }) +} + +// 查询应付记录详情 +export const getOrderYf = async (id: number) => { + return await request.get({ url: `/heli/order-yf/get?id=` + id }) +} + +// 新增应付记录 +export const createOrderYf = async (data: OrderYfVO) => { + return await request.post({ url: `/heli/order-yf/create`, data }) +} + +// 修改应付记录 +export const updateOrderYf = async (data: OrderYfVO) => { + return await request.put({ url: `/heli/order-yf/update`, data }) +} + +// 删除应付记录 +export const deleteOrderYf = async (id: number) => { + return await request.delete({ url: `/heli/order-yf/delete?id=` + id }) +} + +// 导出应付记录 Excel +export const exportOrderYf = async (params) => { + return await request.download({ url: `/heli/order-yf/export-excel`, params }) +} +// 查询根据应付id查询应收记录表明细 +export const getOrderYfDetails = async (id: number) => { + return await request.get({ url: `/heli/order-ys-detail/getOrderYfDetails?id=` + id }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/orderyfdetail/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/orderyfdetail/index.ts new file mode 100644 index 0000000..377ff97 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/orderyfdetail/index.ts @@ -0,0 +1,43 @@ +import request from '@/config/axios' + +export interface OrderYfDetailVO { + id: number + cgYishou: number + rem: string + paymentDate: localdate + cgId: number +} + +// 查询应收明细分页 +export const getOrderYfDetailPage = async (params) => { + return await request.get({ url: `/heli/order-yf-detail/page`, params }) +} + +// 查询应收明细详情 +export const getOrderYfDetail = async (id: number) => { + return await request.get({ url: `/heli/order-yf-detail/get?id=` + id }) +} + +// 新增应收明细 +export const createOrderYfDetail = async (data: OrderYfDetailVO) => { + return await request.post({ url: `/heli/order-yf-detail/create`, data }) +} + +// 修改应收明细 +export const updateOrderYfDetail = async (data: OrderYfDetailVO) => { + return await request.put({ url: `/heli/order-yf-detail/update`, data }) +} + +// 删除应收明细 +export const deleteOrderYfDetail = async (id: number) => { + return await request.delete({ url: `/heli/order-yf-detail/delete?id=` + id }) +} + +// 导出应收明细 Excel +export const exportOrderYfDetail = async (params) => { + return await request.download({ url: `/heli/order-yf-detail/export-excel`, params }) +} +// 查询根据应付id查询应收记录表明细 +export const getOrderYfDetails = async (id: number) => { + return await request.get({ url: `/heli/order-yf-detail/getOrderYfDetails?id=` + id }) +} 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 new file mode 100644 index 0000000..62cd540 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseorderno/index.ts @@ -0,0 +1,57 @@ +import request from '@/config/axios' + +export interface PurchaseOrderNoVO { + id: number + purchaseNo: string + purchaseType: boolean + goodsType: boolean + estimatedPrice: number + actualPrice: number + status: boolean + submitUserId: number + submitTime: Date + auditor: number + auditTime: Date + description: string + supplierId: number + isPrint: string + printDtime: Date + ordDate: Date + receivingStatus: boolean + currencyType: number + taxRatio: number +} + +// 查询采购订单主分页 +export const getPurchaseOrderNoPage = async (params) => { + return await request.get({ url: `/heli/purchase-order-no/page`, params }) +} + +// 查询采购订单主详情 +export const getPurchaseOrderNo = async (id: number) => { + return await request.get({ url: `/heli/purchase-order-no/get?id=` + id }) +} + +// 新增采购订单主 +export const createPurchaseOrderNo = async (data: PurchaseOrderNoVO) => { + return await request.post({ url: `/heli/purchase-order-no/create`, data }) +} + +// 修改采购订单主 +export const updatePurchaseOrderNo = async (data: PurchaseOrderNoVO) => { + return await request.put({ url: `/heli/purchase-order-no/update`, data }) +} + +// 删除采购订单主 +export const deletePurchaseOrderNo = async (id: number) => { + return await request.delete({ url: `/heli/purchase-order-no/delete?id=` + id }) +} + +// 导出采购订单主 Excel +export const exportPurchaseOrderNo = async (params) => { + return await request.download({ url: `/heli/purchase-order-no/export-excel`, params }) +} +// 查询采购订单分页 +export const getPurchaseOrderPage = async (params) => { + return await request.get({ url: `/heli/purchase-order-no/getPurchaseOrderPage`, params }) +} 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 new file mode 100644 index 0000000..7504e06 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseordernodetail/index.ts @@ -0,0 +1,66 @@ +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 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/purchaseDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/purchaseDialog.vue index 51019fd..423c9ab 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/purchaseDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/purchaseDialog.vue @@ -1,5 +1,5 @@ diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/OrderYfForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/OrderYfForm.vue index 893c34a..8e4c1bf 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/OrderYfForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/OrderYfForm.vue @@ -1,5 +1,5 @@ diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/record.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/record.vue new file mode 100644 index 0000000..74804a6 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/record.vue @@ -0,0 +1,297 @@ + + + +