From 4dadedc6a68d0c6f4b16743d5fdebcc7514aa141 Mon Sep 17 00:00:00 2001 From: z Date: Thu, 5 Jun 2025 19:27:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E8=A6=81=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/invoice/InvoiceController.java | 9 +- .../admin/orderys/vo/OrderYsExportVO.java | 11 +- .../admin/orderys/vo/OrderYsRespVO.java | 16 +- .../orderysdetail/vo/OrderYsDetailRespVO.java | 2 +- .../admin/taskreport/vo/TaskReportRespVO.java | 10 +- .../dal/dataobject/orderys/OrderYsDO.java | 17 + .../dal/dataobject/pgmaster/PgMasterDO.java | 1 + .../heli/dal/mysql/orderys/OrderYsMapper.java | 54 ++- .../projectleader/ProjectLeaderMapper.java | 4 +- .../mysql/taskreport/TaskReportMapper.java | 10 +- .../bgmasterline/BgMasterLineServiceImpl.java | 16 +- .../heli/service/invoice/InvoiceService.java | 4 + .../service/invoice/InvoiceServiceImpl.java | 9 + .../service/orderys/OrderYsServiceImpl.java | 2 +- .../heli/service/plan/PlanServiceImpl.java | 26 +- .../src/api/heli/invoice/index.ts | 4 + .../src/api/heli/orderys/index.ts | 1 + .../src/views/heli/invoice/detail.vue | 12 +- .../src/views/heli/orderys/OrderYsForm.vue | 136 +++++--- .../src/views/heli/orderys/index.vue | 65 ++-- .../src/views/heli/orderys/pagination.vue | 87 +++++ .../src/views/heli/orderys/record.vue | 325 ++++++++++++++++++ .../src/views/heli/plan/edit.vue | 231 ++++++++++++- .../src/views/heli/projectorder/audit.vue | 4 +- .../src/views/heli/projectorder/detail.vue | 86 ++--- .../src/views/heli/taskreport/index.vue | 96 ++++-- 26 files changed, 1031 insertions(+), 207 deletions(-) create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/pagination.vue create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/record.vue 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 360eea3..6a4cdd3 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 @@ -99,5 +99,12 @@ public class InvoiceController { ExcelUtils.write(response, "财务发票.xls", "数据", InvoiceRespVO.class, BeanUtils.toBean(list, InvoiceRespVO.class)); } - + @GetMapping("/getOrderYsInvoice") + @Operation(summary = "根据订单获得财务发票") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:invoice:query')") + public CommonResult> getOrderYsInvoice(@RequestParam("code") String code) { + List invoice = invoiceService.getOrderYsInvoice(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/orderys/vo/OrderYsExportVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsExportVO.java index b74f758..743e999 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsExportVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsExportVO.java @@ -17,13 +17,13 @@ import java.time.LocalDateTime; public class OrderYsExportVO { @Schema(description = "项目编号，唯一", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("项目编号") +// @ExcelProperty("项目编号") private String code; @Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") @ExcelProperty("项目名称") private String projectName; - @ExcelProperty(value = "生成日期", converter = TimestampToDateConvert.class) +// @ExcelProperty(value = "生成日期", converter = TimestampToDateConvert.class) private LocalDateTime cgTime; @Schema(description = "客户名称", example = "王五") @ExcelProperty("客户名称") @@ -38,8 +38,11 @@ public class OrderYsExportVO { @Schema(description = "已收金额") @ExcelProperty("已收金额") private BigDecimal cgYishou; - @Schema(description = "是否回款完成") - @ExcelProperty(value = "是否回款完成", converter = DictConvert.class) + @Schema(description = "已开票金额") + @ExcelProperty("已开票金额") + private BigDecimal amount; + @Schema(description = "回款状态") + @ExcelProperty(value = "回款状态", converter = DictConvert.class) @DictFormat("heli_yingfu_money") private Integer cgTypee; @Schema(description = "备注") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsRespVO.java index 4a58a1e..4a1886d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsRespVO.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.orderys.vo; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -44,11 +45,12 @@ public class OrderYsRespVO { @Schema(description = "应收金额") @ExcelProperty("应收金额") private BigDecimal cgYs; - @Schema(description = "已收金额") @ExcelProperty("已收金额") private BigDecimal cgYishou; - + @Schema(description = "已开票金额") + @ExcelProperty("已开票金额") + private BigDecimal amount; @Schema(description = "是否回款完成") @ExcelProperty("是否回款完成") private Integer cgTypee; @@ -57,4 +59,14 @@ public class OrderYsRespVO { @ExcelProperty("备注") private String rem; + private BigDecimal shouFuKuanBiLi; + + private BigDecimal twoFuKuanBiLi; + + private BigDecimal threeFuKuanBiLi; + + private BigDecimal fourFuKuanBiLi; + private BigDecimal fiveFuKuanBiLi; + private BigDecimal sixFuKuanBiLi; + } \ 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/orderysdetail/vo/OrderYsDetailRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderysdetail/vo/OrderYsDetailRespVO.java index 5ebd284..d509606 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderysdetail/vo/OrderYsDetailRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderysdetail/vo/OrderYsDetailRespVO.java @@ -38,7 +38,7 @@ public class OrderYsDetailRespVO { @Schema(description = "回款类型", example = "2") @ExcelProperty("回款类型") - private String cgType; + private Integer cgType; @Schema(description = "应收id", example = "30630") @ExcelProperty("应收id") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/vo/TaskReportRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/vo/TaskReportRespVO.java index 2e9ed0e..7c5789c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/vo/TaskReportRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/vo/TaskReportRespVO.java @@ -38,11 +38,11 @@ public class TaskReportRespVO { private String projectSubName; @Schema(description = "子项目编号") - @ExcelProperty("子项目编号") +// @ExcelProperty("子项目编号") private String projectSubCode; @Schema(description = "派工单号") - @ExcelProperty("派工单号") +// @ExcelProperty("派工单号") private String dispatchCode; @Schema(description = "零件名称") @@ -50,7 +50,7 @@ public class TaskReportRespVO { private String materialName; @Schema(description = "规格型号") - @ExcelProperty("规格型号") +// @ExcelProperty("规格型号") private String spec; @Schema(description = "报工人") @@ -70,11 +70,11 @@ public class TaskReportRespVO { private Integer amount; @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("生产开始时间") +// @ExcelProperty("生产开始时间") private LocalDateTime startTime; @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("生产结束时间") +// @ExcelProperty("生产结束时间") private LocalDateTime endTime; @Schema(description = "报工时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java index 52ddc7f..b07cbb8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java @@ -66,5 +66,22 @@ public class OrderYsDO extends BaseDO { * 备注 */ private String rem; + @TableField(exist = false) + private BigDecimal amount; + + @TableField(exist = false) + private BigDecimal shouFuKuanBiLi; + @TableField(exist = false) + private BigDecimal twoFuKuanBiLi; + @TableField(exist = false) + private BigDecimal threeFuKuanBiLi; + @TableField(exist = false) + private BigDecimal fourFuKuanBiLi; + @TableField(exist = false) + private BigDecimal fiveFuKuanBiLi; + @TableField(exist = false) + private BigDecimal sixFuKuanBiLi; + + } \ 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/pgmaster/PgMasterDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterDO.java index 1f22c49..33b6def 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterDO.java @@ -62,4 +62,5 @@ public class PgMasterDO extends BaseDO { */ private LocalDateTime pgDatetime; + } \ 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/orderys/OrderYsMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java index 2d94aba..5086aea 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java @@ -2,12 +2,21 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.orderys; import java.util.*; +import cn.hutool.core.collection.CollUtil; 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.customer.CustomerDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.invoice.InvoiceDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderys.OrderYsDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; +import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO; +import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.orderys.vo.*; +import org.springframework.util.StringUtils; /** * 应收记录 Mapper @@ -18,17 +27,40 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.orderys.vo.*; public interface OrderYsMapper extends BaseMapperX { default PageResult selectPage(OrderYsPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .betweenIfPresent(OrderYsDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(OrderYsDO::getCode, reqVO.getCode()) - .likeIfPresent(OrderYsDO::getProjectName, reqVO.getProjectName()) - .betweenIfPresent(OrderYsDO::getCgTime, reqVO.getCgTime()) - .likeIfPresent(OrderYsDO::getCgKhname, reqVO.getCgKhname()) - .eqIfPresent(OrderYsDO::getCgYs, reqVO.getCgYs()) - .eqIfPresent(OrderYsDO::getCgYishou, reqVO.getCgYishou()) - .eqIfPresent(OrderYsDO::getCgTypee, reqVO.getCgTypee()) - .eqIfPresent(OrderYsDO::getRem, reqVO.getRem()) - .orderByDesc(OrderYsDO::getId)); + + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(OrderYsDO.class) + .select("sum(i.amount) as amount") + .leftJoin( + "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE'") + .disableSubLogicDel() + .groupBy(OrderYsDO::getId) + .orderByDesc(OrderYsDO::getCreateTime); + + query.like(!StringUtils.isEmpty(reqVO.getProjectName()), OrderYsDO::getProjectName, reqVO.getProjectName()) + .like(!StringUtils.isEmpty(reqVO.getCgKhname()), OrderYsDO::getCgKhname, reqVO.getCgKhname()) + .eq(!StringUtils.isEmpty(reqVO.getCgTypee()), OrderYsDO::getCgTypee, reqVO.getCgTypee()); +// .eq(InvoiceDO::getType, "FINANCE_MAKE_INVOICE"); + + return selectPage(reqVO, query); + } + default OrderYsDO selectOrderYsId(Integer id){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(OrderYsDO.class) + .select("sum(i.amount) as amount") + .select("p.shou_Fu_Kuan_Bi_Li as shouFuKuanBiLi","p.two_Fu_Kuan_Bi_Li as twoFuKuanBiLi","p.three_Fu_Kuan_Bi_Li as threeFuKuanBiLi") + .select("p.four_Fu_Kuan_Bi_Li as fourFuKuanBiLi","p.five_Fu_Kuan_Bi_Li as fiveFuKuanBiLi","p.six_Fu_Kuan_Bi_Li as sixFuKuanBiLi") + .leftJoin( + "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE'") + .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getCode, OrderYsDO::getCode) + .disableSubLogicDel(); + + query + .eq( OrderYsDO::getId, id); +// .eq(InvoiceDO::getType, "FINANCE_MAKE_INVOICE"); + + 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/projectleader/ProjectLeaderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectleader/ProjectLeaderMapper.java index 04fd2ad..4f9d1de 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectleader/ProjectLeaderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectleader/ProjectLeaderMapper.java @@ -27,7 +27,8 @@ public interface ProjectLeaderMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProjectLeaderDO.class) .select("a.nickname as ownerName") - .leftJoin(AdminUserDO.class,"a",AdminUserDO::getId,ProjectLeaderDO::getOwner); + .leftJoin(AdminUserDO.class,"a",AdminUserDO::getId,ProjectLeaderDO::getOwner) + .disableSubLogicDel(); query.eq(!StringUtils.isEmpty(reqVO.getType()), ProjectLeaderDO::getType, reqVO.getType()); return selectPage(reqVO, query); @@ -38,6 +39,7 @@ public interface ProjectLeaderMapper extends BaseMapperX { query.selectAll(ProjectLeaderDO.class) .select("a.nickname as ownerName,a.username as userName") .leftJoin(AdminUserDO.class,"a",AdminUserDO::getId,ProjectLeaderDO::getOwner) + .disableSubLogicDel() .orderByDesc( ProjectLeaderDO::getCreateTime) .last("limit 1"); query.eq(ProjectLeaderDO::getType, type); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java index aad3963..bb9b0e9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java @@ -16,9 +16,11 @@ import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; @@ -49,7 +51,6 @@ public interface TaskReportMapper extends BaseMapperX { .leftJoin(AdminUserDO.class, "u2", AdminUserDO::getId, TaskReportDO::getUpdater) .orderByDesc(TaskReportDO::getId) .disableSubLogicDel(); - query.eq(reqVO.getOwner() != null, TaskReportDO::getOwner, reqVO.getOwner()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) @@ -57,7 +58,12 @@ public interface TaskReportMapper extends BaseMapperX { .like(!StringUtils.isEmpty(reqVO.getMaterialName()), ProcessBomDetailDO::getMaterialName, reqVO.getMaterialName()) .like(!StringUtils.isEmpty(reqVO.getOwnerName()), AdminUserDO::getNickname, reqVO.getOwnerName()) .eq(!StringUtils.isEmpty(reqVO.getDispatchDetailId()),TaskReportDO::getDispatchDetailId,reqVO.getDispatchDetailId()); - + if (reqVO.getStartTime() != null) { + query.between( TaskReportDO::getStartTime, reqVO.getStartTime()[0], reqVO.getStartTime()[1]); + } + if (reqVO.getStartTime() != null) { + query.between(TaskReportDO::getEndTime, reqVO.getEndTime()[0], reqVO.getEndTime()[1]); + } return selectPage(reqVO, query); } public int deleteByDispatchDetailIds(List dispatchDetailIds); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java index b6f4424..1942f7b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java @@ -1,7 +1,13 @@ package com.chanko.yunxi.mes.module.heli.service.bgmasterline; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterLineMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -34,6 +40,9 @@ public class BgMasterLineServiceImpl implements BgMasterLineService { private BgMasterLineMapper bgMasterLineMapper; @Resource private PgMasterLineMapper pgMasterLineMapper; + @Resource + private TaskDispatchDetailMapper taskDispatchDetailMapper; + //结束本次报工 @Override @@ -72,8 +81,11 @@ public class BgMasterLineServiceImpl implements BgMasterLineService { pgMasterLineDO.setActive("END"); pgMasterLineDO.setEntTime(currentDateTime); pgMasterLineMapper.updateById(pgMasterLineDO); - //更新工时 - + //修改派工单明细表检验状态为Y + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(TaskDispatchDetailDO::getId,pgMasterLineDO.getDispatchDetailId()); + wrapper.set(TaskDispatchDetailDO::getTestYn,"Y"); + taskDispatchDetailMapper.update(wrapper); }else{ //不相等时只更新当前报工状态 pgMasterLineDO.setActive("END"); 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 4f53472..8e4e246 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 @@ -5,6 +5,8 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.invoice.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.invoice.InvoiceDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import java.util.List; + /** * 财务发票 Service 接口 * @@ -52,4 +54,6 @@ public interface InvoiceService { PageResult getInvoicePage(InvoicePageReqVO pageReqVO); Long operate(InvoiceSaveReqVO operateReqVO); + + List getOrderYsInvoice(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 ef6859f..c1f89c0 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 @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.service.invoice; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum; import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.enums.InvoiceStatusEnum; @@ -16,6 +17,7 @@ import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.module.heli.dal.mysql.invoice.InvoiceMapper; import java.time.LocalDateTime; +import java.util.List; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; @@ -103,4 +105,11 @@ public class InvoiceServiceImpl implements InvoiceService { return operateReqVO.getId(); } + @Override + public List getOrderYsInvoice(String code) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(InvoiceDO::getOrderCode, code); + return invoiceMapper.selectList(wrapper); + } + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java index 73a9688..0cbd98b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java @@ -94,7 +94,7 @@ public class OrderYsServiceImpl implements OrderYsService { @Override public OrderYsDO getOrderYs(Integer id) { - return orderYsMapper.selectById(id); + return orderYsMapper.selectOrderYsId(id); } @Override diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java index 9ac6b44..32c82fa 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java @@ -12,6 +12,7 @@ import com.chanko.yunxi.mes.framework.web.core.util.WebFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.plan.vo.PlanPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.plan.vo.PlanSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.plansub.vo.PlanSubPageReqVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantask.PlanTaskDO; @@ -35,6 +36,7 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetai import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.taskreport.TaskReportMapper; import com.chanko.yunxi.mes.module.heli.enums.*; +import com.chanko.yunxi.mes.module.heli.service.customer.CustomerService; import com.chanko.yunxi.mes.module.heli.service.projectorder.ProjectOrderService; import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService; import jodd.util.StringUtil; @@ -102,8 +104,10 @@ public class PlanServiceImpl implements PlanService { private PlanTaskBomMapper planTaskBomMapper; @Resource private TaskDispatchMapper taskDispatchMapper; -@Resource -private TaskDispatchDetailMapper taskDispatchDetailMapper; + @Resource + private TaskDispatchDetailMapper taskDispatchDetailMapper; + @Resource + private CustomerService customerService; @Resource private TaskReportMapper taskReportMapper; @Override @@ -229,21 +233,27 @@ private TaskReportMapper taskReportMapper; planDO.setChangeNum(0); // 设置生产计划状态 planDO.setStatus(ProjectPlanStatusEnum.START.getCode()); - + ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(projectId); + CustomerDO customer = customerService.getCustomer(projectOrderDO.getCustomerId()); // 月度流水号 - SerialNumberDO serialNumberDO = new SerialNumberDO(); - serialNumberDO = serialNumberService.getSerialNumber(PROJECT_PLAN.name(), new SimpleDateFormat("yyyyMM").format(new Date())); - serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1); +// SerialNumberDO serialNumberDO = new SerialNumberDO(); +// serialNumberDO = serialNumberService.getSerialNumber(PROJECT_PLAN.name(), new SimpleDateFormat("yyyyMM").format(new Date())); +// serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1); + +// planDO.setPlanNo(PROJECT_PLAN.getCode(serialNumberDO.getSerialNumber().toString())); + String code = projectOrderDO.getCode().replace("-", ""); + planDO.setPlanNo("PP"+code); - planDO.setPlanNo(PROJECT_PLAN.getCode(serialNumberDO.getSerialNumber().toString())); Long userId = WebFrameworkUtils.getLoginUserId(); planDO.setCreator(userId.toString()); planMapper.insert(planDO); // 回写序列记录 - serialNumberService.updateSerialNumber(serialNumberDO); +// serialNumberService.updateSerialNumber(serialNumberDO); for(ProjectOrderSubDO item : projectOrderSubDOs){ PlanSubDO planSubDO = new PlanSubDO(); + planSubDO.setProjectSubCode(customer.getBrief()+'-'+projectOrderDO.getProjectNameSim()+'-'+item.getNameSim()); + planSubDO.setProjectSubShortName(item.getNameSim()); planSubDO.setProjectPlanId(planDO.getId()); planSubDO.setProjectId(projectId); planSubDO.setProjectSubId(item.getId()); 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 367afd7..013428b 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 @@ -51,3 +51,7 @@ export const exportInvoice = async (params) => { export async function operateInvoice(data: InvoiceVO) { return await request.post({ url: `/heli/invoice/operate`, data }) } +// 查询应收记录详情 +export const getOrderYsInvoice = async (code: string) => { + return await request.get({ url: `/heli/invoice/getOrderYsInvoice?code=` + code }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/orderys/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/orderys/index.ts index eedf5e6..8d94571 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/orderys/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/orderys/index.ts @@ -42,3 +42,4 @@ export const deleteOrderYs = async (id: number) => { export const exportOrderYs = async (params) => { return await request.download({ url: `/heli/order-ys/export-excel`, params }) } + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue index e8ff966..d36e316 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue @@ -156,13 +156,13 @@ const detailDisabled = ref(false) const formData: any = ref({ id: undefined, - businessType: "FINANCE_RECEIVE_INVOICE", + businessType: businessType.value, orderId: undefined, number: undefined, - type: undefined, + type: "2", billingDate: undefined, amount: undefined, - rate: undefined, + rate: 13, remark: undefined, submitter: undefined, submitTime: undefined, @@ -190,13 +190,13 @@ const formRules = reactive({ const resetForm = () => { formData.value = { id: undefined, - businessType: "FINANCE_RECEIVE_INVOICE", + businessType: businessType.value, projectId: undefined, number: undefined, - type: undefined, + type:"2", billingDate: undefined, amount: undefined, - rate: undefined, + rate: 13, remark: undefined, submitter: undefined, submitTime: undefined, diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue index c593138..ca9bc41 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue @@ -10,11 +10,11 @@ - - - + + + - + + + + - - - - + - + + + + - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +