From d609be3717fb1c270e7cc8cbaab7839ce2440431 Mon Sep 17 00:00:00 2001 From: z Date: Tue, 21 Jan 2025 14:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/master/vo/MasterPageReqVO.java | 2 +- .../admin/master/vo/MasterRespVO.java | 9 +++ .../PricequoterecordController.java | 1 - .../vo/PricequoterecordSaveReqVO.java | 5 +- .../vo/TaskPlanJDBaoBiaoPageReqVO.java | 2 + .../heli/dal/dataobject/master/MasterDO.java | 6 ++ .../taskdispatch/TaskDispatchDetailDO.java | 3 +- .../heli/dal/mysql/master/MasterMapper.java | 29 +++++--- .../PricequoterecordService.java | 2 - .../PricequoterecordServiceImpl.java | 6 +- .../taskdispatch/TaskDispatchDetailMapper.xml | 1 + .../views/heli/PriceQuoteRecord/detail.vue | 5 +- .../src/views/heli/master/index.vue | 24 +++---- .../src/views/heli/master/indexBb.vue | 68 ++++++++++--------- .../src/views/heli/plan/planSchedule.vue | 21 +++--- 15 files changed, 108 insertions(+), 76 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterPageReqVO.java index 1a27af8..10b16e1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterPageReqVO.java @@ -33,7 +33,7 @@ public class MasterPageReqVO extends PageParam { private String jyMaster; @Schema(description = "借用人") - private Long jyUser; + private String jyUser; @Schema(description = "借用类型", example = "1") private Integer jyType; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterRespVO.java index 1e32bfa..a5ab746 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterRespVO.java @@ -53,4 +53,13 @@ public class MasterRespVO { @ExcelProperty("借用日期") private LocalDateTime jyDate; + @Schema(description = "借用人") + @ExcelProperty("借用人") + private String jyUsers; + @Schema(description = "借用部门") + @ExcelProperty("借用部门") + private String jyBms; + @Schema(description = "借用物料名称") + @ExcelProperty("借用物料名称") + private String jyMasters; } \ 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/pricequoterecord/PricequoterecordController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/PricequoterecordController.java index 0096aae..5e86bc3 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/PricequoterecordController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/PricequoterecordController.java @@ -11,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.time.LocalDateTime; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/vo/PricequoterecordSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/vo/PricequoterecordSaveReqVO.java index b787cb5..16dd796 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/vo/PricequoterecordSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/vo/PricequoterecordSaveReqVO.java @@ -2,10 +2,7 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; @Schema(description = "管理后台 - 基础信息-报价记录新增/修改 Request VO") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskPlanJDBaoBiaoPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskPlanJDBaoBiaoPageReqVO.java index d463e02..2f81c8f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskPlanJDBaoBiaoPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskPlanJDBaoBiaoPageReqVO.java @@ -40,6 +40,8 @@ public class TaskPlanJDBaoBiaoPageReqVO extends PageParam { @Schema(description = "工序名称") private String procdureName; + @Schema(description = "类型") + private String type; @Schema(description = "总预计工时") private BigDecimal workTime; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/master/MasterDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/master/MasterDO.java index 065b875..63a6b9e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/master/MasterDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/master/MasterDO.java @@ -60,5 +60,11 @@ public class MasterDO extends BaseDO { * 借用时间 */ private LocalDateTime jyDate; + @TableField(exist = false) + private String jyUsers; + @TableField(exist = false) + private String jyBms; + @TableField(exist = false) + private String jyMasters; } \ 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/taskdispatch/TaskDispatchDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java index 03a6a6f..8f61b7e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java @@ -125,7 +125,8 @@ public class TaskDispatchDetailDO extends BaseDO { private String planCode; @TableField(exist = false) private String procdureName; - + @TableField(exist = false) + private String type; /** * 预计工时 */ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java index dd4d766..3c29ee2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java @@ -2,12 +2,19 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.master; import java.util.*; +import cn.hutool.core.util.ObjectUtil; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.heli.dal.dataobject.master.MasterDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; +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.master.vo.*; +import org.springframework.util.StringUtils; /** * 借用主 Mapper @@ -18,16 +25,18 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.master.vo.*; public interface MasterMapper extends BaseMapperX { default PageResult selectPage(MasterPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .betweenIfPresent(MasterDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(MasterDO::getJyBm, reqVO.getJyBm()) - .eqIfPresent(MasterDO::getJyYt, reqVO.getJyYt()) - .eqIfPresent(MasterDO::getRem, reqVO.getRem()) - .eqIfPresent(MasterDO::getJyMaster, reqVO.getJyMaster()) - .eqIfPresent(MasterDO::getJyUser, reqVO.getJyUser()) - .eqIfPresent(MasterDO::getJyType, reqVO.getJyType()) - .eqIfPresent(MasterDO::getNum, reqVO.getNum()) - .orderByDesc(MasterDO::getId)); + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(MasterDO.class) + .select("b.nickname as jyUsers,c.name as jyBms,d.name as jyMasters") + .leftJoin(AdminUserDO.class,"b",AdminUserDO::getId,MasterDO::getJyUser) + .leftJoin(DeptDO.class,"c",DeptDO::getId,MasterDO::getJyBm) + .leftJoin(MaterialDO.class,"d",MaterialDO::getId,MasterDO::getJyMaster); + query.eq(!ObjectUtil.isEmpty(reqVO.getJyYt()), MasterDO::getJyYt, reqVO.getJyYt()) + .eq(!ObjectUtil.isEmpty(reqVO.getJyType()), MasterDO::getJyType, reqVO.getJyType()) + .like(!ObjectUtil.isEmpty(reqVO.getJyBm()), DeptDO::getName, reqVO.getJyBm()) + .like(!ObjectUtil.isEmpty(reqVO.getJyMaster()), MaterialDO::getName, reqVO.getJyMaster()) + .like(!ObjectUtil.isEmpty(reqVO.getJyUser()), AdminUserDO::getNickname, reqVO.getJyUser()); + return selectPage(reqVO,query); } } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordService.java index 5b20e33..a84acb6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordService.java @@ -1,13 +1,11 @@ package com.chanko.yunxi.mes.module.heli.service.pricequoterecord; -import java.util.*; import javax.validation.*; import com.baomidou.mybatisplus.extension.service.IService; import com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pricequoterecord.PricequoterecordDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.PageParam; /** * 基础信息-报价记录 Service 接口 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordServiceImpl.java index 5bdbc66..ed92d36 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordServiceImpl.java @@ -5,16 +5,16 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.validation.Valid; + import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.*; + import com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pricequoterecord.PricequoterecordDO; 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.pricequoterecord.PricequoterecordMapper; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml index 4d0292a..f01164f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml @@ -23,6 +23,7 @@ f.name AS procdureName, t.work_time AS workTime, t.owner, + b.dispatch_type as type, t.amount AS amount, COALESCE(SUM(CASE WHEN h.work_time IS NULL THEN 0 ELSE h.work_time END), 0) AS bgWorkTime, COALESCE(SUM(CASE WHEN h.amount IS NULL THEN 0 ELSE h.amount END), 0) AS bgAmount, diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue index 9a043e8..2682f62 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue @@ -212,7 +212,7 @@ const formData = ref({ projectName: undefined, salesman: undefined, clientActuality: undefined, - winTheBiddingTime: [], + winTheBiddingTime: undefined, winTheResult: undefined, winTheGrasp: undefined, craftInfos: [], @@ -344,6 +344,9 @@ const submitForm = async (active) => { // 校验表单 formData.value.active = active await formRef.value.validate() + if (formData.value.winTheBiddingTime.length==0){ + formData.value.winTheBiddingTime='' + } // 提交请求 formLoading.value = true diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue index 6adbc42..1080bcb 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue @@ -94,15 +94,15 @@ - - + + + + - - + + + + - - + + + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue index 68f6036..7b994d9 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue @@ -94,15 +94,15 @@ - - + + + + - - + + + + - - + + + + - - - + + + + + + + + + + + + + + + + + + + + { list.value.map(item=>{ if (item.jyType=="4"){ item.quantityLent= Number(-Math.abs(item.num)); - }else { + }else if (item.jyType=="1"){ item.quantityLent= Number(item.num); + }else { + item.quantityLent=0 } }) total.value = data.total diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue index 4ceb383..62c9440 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue @@ -62,7 +62,7 @@ class="!w-240px" /> --> - + 搜索 @@ -83,14 +83,19 @@ - + - - + + + + +