员工借用物料界面

mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinesTypeEnum.java

@@ -26,6 +26,7 @@ public enum BusinesTypeEnum {
     FINANCE_RECEIVE_INVOICE("发票接收"),
     FINANCE_INVOICE("财务发票"),
     MATERIAL("物料"),
+    QUOTATION_RECORD("报价记录"),
     ;
 
     private String description;

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterPageReqVO.java

@@ -20,12 +20,6 @@ public class MasterPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "借用人")
-    private Long jyUser;
-
-    @Schema(description = "1借出2归还", example = "2")
-    private Integer jyType;
-
     @Schema(description = "借用部门")
     private String jyBm;
 
@@ -38,21 +32,13 @@ public class MasterPageReqVO extends PageParam {
     @Schema(description = "借用物料名称")
     private String jyMaster;
 
-    @Schema(description = "借用数量")
+    @Schema(description = "借用人")
-    private BigDecimal jyNum;
+    private Long jyUser;
 
-    @Schema(description = "归还数量")
+    @Schema(description = "借用类型", example = "1")
-    private BigDecimal ghNum;
+    private Integer jyType;
 
-    @Schema(description = "借用时间")
+    @Schema(description = "数量")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private BigDecimal num;
-    private LocalDateTime[] jyTime;
-
-    @Schema(description = "归还时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] ghTime;
-
-    @Schema(description = "是否归还完成1否 2 是", example = "1")
-    private Integer ghType;
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterRespVO.java

@@ -22,17 +22,9 @@ public class MasterRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "借用人")
-    @ExcelProperty("借用人")
-    private Long jyUser;
-
-    @Schema(description = "1借出2归还", example = "2")
-    @ExcelProperty("1借出2归还")
-    private Integer jyType;
-
     @Schema(description = "借用部门")
     @ExcelProperty("借用部门")
-    private String jyBm;
+    private Integer jyBm;
 
     @Schema(description = "借用用途")
     @ExcelProperty("借用用途")
@@ -44,26 +36,21 @@ public class MasterRespVO {
 
     @Schema(description = "借用物料名称")
     @ExcelProperty("借用物料名称")
-    private String jyMaster;
+    private Integer jyMaster;
 
-    @Schema(description = "借用数量")
+    @Schema(description = "借用人")
-    @ExcelProperty("借用数量")
+    @ExcelProperty("借用人")
-    private BigDecimal jyNum;
+    private Long jyUser;
 
-    @Schema(description = "归还数量")
+    @Schema(description = "借用类型", example = "1")
-    @ExcelProperty("归还数量")
+    @ExcelProperty("借用类型")
-    private BigDecimal ghNum;
+    private String jyType;
 
-    @Schema(description = "借用时间")
+    @Schema(description = "数量")
-    @ExcelProperty("借用时间")
+    @ExcelProperty("数量")
-    private LocalDateTime jyTime;
+    private BigDecimal num;
-
+    @Schema(description = "借用日期")
-    @Schema(description = "归还时间")
+    @ExcelProperty("借用日期")
-    @ExcelProperty("归还时间")
+    private LocalDateTime jyDate;
-    private LocalDateTime ghTime;
-
-    @Schema(description = "是否归还完成1否 2 是", example = "1")
-    @ExcelProperty("是否归还完成1否 2 是")
-    private Integer ghType;
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterSaveReqVO.java

@@ -2,12 +2,12 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.master.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDateTime;
 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
@@ -16,14 +16,8 @@ public class MasterSaveReqVO {
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31322")
     private Integer id;
 
-    @Schema(description = "借用人")
-    private Long jyUser;
-
-    @Schema(description = "1借出2归还", example = "2")
-    private Integer jyType;
-
     @Schema(description = "借用部门")
-    private String jyBm;
+    private Integer jyBm;
 
     @Schema(description = "借用用途")
     private String jyYt;
@@ -32,25 +26,18 @@ public class MasterSaveReqVO {
     private String rem;
 
     @Schema(description = "借用物料名称")
-    private String jyMaster;
+    private Integer jyMaster;
 
-    @Schema(description = "借用数量")
+    @Schema(description = "借用人")
-    private BigDecimal jyNum;
+    private Long jyUser;
 
-    @Schema(description = "归还数量")
+    @Schema(description = "借用类型")
-    private BigDecimal ghNum;
+    private String jyType;
 
+    @Schema(description = "数量")
+    private BigDecimal num;
     @Schema(description = "借用时间")
-    private LocalDateTime jyTime;
+    private LocalDateTime jyDate;
-
-    @Schema(description = "归还时间")
-    private LocalDateTime ghTime;
-
-    @Schema(description = "是否归还完成1否 2 是", example = "1")
-    private Integer ghType;
-
-    @Schema(description = "是否归还完成1否 2 是", example = "1")
-    private int gh;
 
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/PricequoterecordController.java

@@ -1,5 +1,8 @@
 package com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord;
 
+import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
+import com.chanko.yunxi.mes.framework.operatelog.core.service.OperateLogFrameworkService;
+import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -11,6 +14,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.io.IOException;
 
@@ -37,19 +41,38 @@ public class PricequoterecordController {
 
     @Resource
     private PricequoterecordService pricequoterecordService;
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    private OperateLogFrameworkService operateLogFrameworkService;
 
     @PostMapping("/create")
     @Operation(summary = "创建基础信息-报价记录")
     @PreAuthorize("@ss.hasPermission('heli:pricequoterecord:create')")
     public CommonResult<Integer> createPricequoterecord(@Valid @RequestBody PricequoterecordSaveReqVO createReqVO) {
-        return success(pricequoterecordService.createPricequoterecord(createReqVO));
+        LocalDateTime startTime = LocalDateTime.now();
+        Integer pricequoterecord = pricequoterecordService.createPricequoterecord(createReqVO);
+        operateLogFrameworkService.createOperateLog(request,
+                startTime,
+                BusinesTypeEnum.QUOTATION_RECORD.name(),
+                Long.valueOf(pricequoterecord),
+                OperateTypeEnum.valueOf("SAVE").getType(),
+                createReqVO.getActiveOpinion());
+        return success(pricequoterecord);
     }
 //测试
     @PutMapping("/update")
     @Operation(summary = "更新基础信息-报价记录")
     @PreAuthorize("@ss.hasPermission('heli:pricequoterecord:update')")
     public CommonResult<Boolean> updatePricequoterecord(@Valid @RequestBody PricequoterecordSaveReqVO updateReqVO) {
+        LocalDateTime startTime = LocalDateTime.now();
         pricequoterecordService.updatePricequoterecord(updateReqVO);
+        operateLogFrameworkService.createOperateLog(request,
+                startTime,
+                BusinesTypeEnum.QUOTATION_RECORD.name(),
+                Long.valueOf(updateReqVO.getId()),
+                OperateTypeEnum.valueOf("UPDATE").getType(),
+                updateReqVO.getActiveOpinion());
         return success(true);
     }
 

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/vo/PricequoterecordSaveReqVO.java

@@ -30,9 +30,6 @@ public class PricequoterecordSaveReqVO {
     @Schema(description = "客户现状（0：潜在客户 1：已有客户）")
     private Integer clientActuality;
 
-    @Schema(description = "确定中标时间")
-    private LocalDateTime winTheBiddingTime;
-
     @Schema(description = "中标结果（0：中标 1：落标 2流标）")
     private Integer winTheResult;
 
@@ -42,8 +39,16 @@ public class PricequoterecordSaveReqVO {
     @Schema(description = "报价次数")
     private Integer baojiacishu;
 
+    @Schema(description = "操作意见")
+    private String activeOpinion;
+
     @Schema(description = "精整对手")
     private String jingzhengduishou;
     @Schema(description = "是否生成启动单（0：生成 1：不生成）")
     private Integer flag;
+
+    @Schema(description = "确定中标时间")
+    private LocalDateTime winTheBiddingTime;
+
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/master/MasterDO.java

@@ -5,9 +5,6 @@ import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
 
@@ -31,18 +28,10 @@ public class MasterDO extends BaseDO {
      */
     @TableId
     private Integer id;
-    /**
-     * 借用人
-     */
-    private Long jyUser;
-    /**
-     * 1借出2归还
-     */
-    private Integer jyType;
     /**
      * 借用部门
      */
-    private String jyBm;
+    private Integer jyBm;
     /**
      * 借用用途
      */
@@ -54,26 +43,22 @@ public class MasterDO extends BaseDO {
     /**
      * 借用物料名称
      */
-    private String jyMaster;
+    private Integer jyMaster;
     /**
-     * 借用数量
+     * 借用人
      */
-    private BigDecimal jyNum;
+    private Long jyUser;
     /**
-     * 归还数量
+     * 借用类型
      */
-    private BigDecimal ghNum;
+    private String jyType;
+    /**
+     * 数量
+     */
+    private BigDecimal num;
     /**
      * 借用时间
      */
-    private LocalDateTime jyTime;
+    private LocalDateTime jyDate;
-    /**
-     * 归还时间
-     */
-    private LocalDateTime ghTime;
-    /**
-     * 是否归还完成1否 2 是
-     */
-    private Integer ghType;
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pricequoterecord/PricequoterecordDO.java

@@ -31,42 +31,58 @@ public class PricequoterecordDO extends BaseDO {
     /**
      * 客户全称
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     private String clientName;
     /**
      * 客户简称
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
+
     private String clientNameJc;
     /**
      * 项目名称
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
+
     private String projectName;
     /**
      * 业务员
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
+
     private Long salesman;
     /**
      * 客户现状（0：潜在客户 1：已有客户）
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
+
     private Integer clientActuality;
-    /**
-     * 确定中标时间
-     */
-    private LocalDateTime winTheBiddingTime;
     /**
      * 中标结果（0：中标 1：落标 2流标）
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
+
     private Integer winTheResult;
     /**
      * 把握（0-4 ：二成-四成-六成-八成-十成）
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
+
     private Integer winTheGrasp;
     /**
      * 报价次数
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     private Integer baojiacishu;
     /**
      * 精整对手
      */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     private String jingzhengduishou;
+    /**
+     * 确定中标时间
+     */
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
+    private LocalDateTime winTheBiddingTime;
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java

@@ -20,19 +20,14 @@ public interface MasterMapper extends BaseMapperX<MasterDO> {
     default PageResult<MasterDO> selectPage(MasterPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MasterDO>()
                 .betweenIfPresent(MasterDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(MasterDO::getJyUser, reqVO.getJyUser())
-                .eqIfPresent(MasterDO::getJyType, reqVO.getJyType())
                 .eqIfPresent(MasterDO::getJyBm, reqVO.getJyBm())
                 .eqIfPresent(MasterDO::getJyYt, reqVO.getJyYt())
                 .eqIfPresent(MasterDO::getRem, reqVO.getRem())
                 .eqIfPresent(MasterDO::getJyMaster, reqVO.getJyMaster())
-                .eqIfPresent(MasterDO::getJyNum, reqVO.getJyNum())
+                .eqIfPresent(MasterDO::getJyUser, reqVO.getJyUser())
-                .eqIfPresent(MasterDO::getGhNum, reqVO.getGhNum())
+                .eqIfPresent(MasterDO::getJyType, reqVO.getJyType())
-                .betweenIfPresent(MasterDO::getJyTime, reqVO.getJyTime())
+                .eqIfPresent(MasterDO::getNum, reqVO.getNum())
-                .betweenIfPresent(MasterDO::getGhTime, reqVO.getGhTime())
-                .eqIfPresent(MasterDO::getGhType, reqVO.getGhType())
                 .orderByDesc(MasterDO::getId));
     }
 
-
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java

@@ -6,7 +6,6 @@ import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchDetailPageReqVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchDetailTotalVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskPlanJDBaoBiaoPageReqVO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantask.PlanTaskDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
@@ -37,34 +36,36 @@ import java.util.Set;
 public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetailDO> {
 
     public int updateOwnerAndPostIdById(@Param("id") Long id,@Param("type") Integer type);
-    default PageResult<TaskDispatchDetailDO> planBbPage(TaskPlanJDBaoBiaoPageReqVO reqVO) {
+    List<TaskDispatchDetailDO> planBbPage(@Param("reqVO")TaskPlanJDBaoBiaoPageReqVO reqVO);
-        MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
+    List<TaskDispatchDetailDO> planBb(@Param("reqVO")TaskPlanJDBaoBiaoPageReqVO reqVO);
-        query.select("MAX(d.code)as projectCode,MAX(d.project_name)as projectName,MAX(g.task_no) as taskNo,0 as planType," +
+//    default PageResult<TaskDispatchDetailDO> planBbPage(TaskPlanJDBaoBiaoPageReqVO reqVO) {
-                " MAX(e.name) as projectSubName, MAX(c.material_name) as materialName , MAX(f.name) as procdureName ,t.work_time as workTime,t.owner," +
+//        MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
-                "t.amount as amount ,SUM(h.work_time) as bgWorkTime,SUM(h.amount) as bgAmount, t.procedure_status as wgType ,t.end_time as endTime")
+//        query.select("MAX(d.code)as projectCode,MAX(d.project_name)as projectName,MAX(g.task_no) as taskNo,0 as planType," +
-                .leftJoin(TaskDispatchDO.class,"b",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId)
+//                " MAX(e.name) as projectSubName, MAX(c.material_name) as materialName , MAX(f.name) as procdureName ,t.work_time as workTime,t.owner," +
-                .leftJoin(ProcessBomDetailDO.class,"c",ProcessBomDetailDO::getId,TaskDispatchDO::getBomDetailId)
+//                "t.amount as amount ,COALESCE(SUM(h.work_time), 0) as bgWorkTime,COALESCE(SUM(h.amount), 0) as bgAmount, t.procedure_status as wgType ,t.end_time as endTime")
-                .leftJoin(ProjectOrderDO.class,"d",ProjectOrderDO::getId,TaskDispatchDO::getProjectId)
+//                .leftJoin(TaskDispatchDO.class,"b",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId)
-                .leftJoin(ProjectOrderSubDO.class,"e",ProjectOrderSubDO::getId,TaskDispatchDO::getProjectSubId)
+//                .leftJoin(ProcessBomDetailDO.class,"c",ProcessBomDetailDO::getId,TaskDispatchDO::getBomDetailId)
-                .leftJoin(ProcedureDO.class,"f",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId)
+//                .leftJoin(ProjectOrderDO.class,"d",ProjectOrderDO::getId,TaskDispatchDO::getProjectId)
-                .leftJoin(PlanTaskDO.class,"g",PlanTaskDO::getId,TaskDispatchDO::getTaskId)
+//                .leftJoin(ProjectOrderSubDO.class,"e",ProjectOrderSubDO::getId,TaskDispatchDO::getProjectSubId)
-                .leftJoin(TaskReportDO.class,"h",TaskReportDO::getDispatchDetailId,TaskDispatchDetailDO::getId)
+//                .leftJoin(ProcedureDO.class,"f",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId)
-
+//                .leftJoin(PlanTaskDO.class,"g",PlanTaskDO::getId,TaskDispatchDO::getTaskId)
-                .groupBy("b.project_id,b.project_sub_id,b.bom_detail_id,t.procedure_id,t.owner")
+//                .leftJoin(TaskReportDO.class,"h",TaskReportDO::getDispatchDetailId,TaskDispatchDetailDO::getId)
-                ;
+//
-        query.eq(TaskDispatchDO::getDispatchType,"PRODUCTION")
+//                .groupBy("b.project_id,b.project_sub_id,b.bom_detail_id,t.procedure_id,t.owner")
-            .eq(reqVO.getProjectCode() !=null,ProjectOrderDO::getCode,reqVO.getProjectCode())
+//                ;
-                .eq(reqVO.getProjectName() !=null,ProjectOrderDO::getProjectName,reqVO.getProjectName())
+//        query.eq(TaskDispatchDO::getDispatchType,"PRODUCTION")
-                .eq(reqVO.getTaskNo()!=null,PlanTaskDO::getTaskNo,reqVO.getTaskNo())
+//            .eq(ObjectUtil.isNotEmpty(reqVO.getProjectCode()),ProjectOrderDO::getCode,reqVO.getProjectCode())
-                .eq(reqVO.getProjectSubName()!=null,ProjectOrderSubDO::getName, reqVO.getProjectSubName())
+//                .eq(reqVO.getProjectName() !=null,ProjectOrderDO::getProjectName,reqVO.getProjectName())
-                .eq(reqVO.getMaterialName()!=null,ProcessBomDetailDO::getMaterialName, reqVO.getMaterialName())
+//                .eq(reqVO.getTaskNo()!=null,PlanTaskDO::getTaskNo,reqVO.getTaskNo())
-                .eq(reqVO.getOwner()!=null,TaskDispatchDetailDO::getOwner,reqVO.getOwner())
+//                .eq(reqVO.getProjectSubName()!=null,ProjectOrderSubDO::getName, reqVO.getProjectSubName())
-        ;
+//                .eq(reqVO.getMaterialName()!=null,ProcessBomDetailDO::getMaterialName, reqVO.getMaterialName())
-
+//                .eq(reqVO.getOwner()!=null,TaskDispatchDetailDO::getOwner,reqVO.getOwner())
-
+//        ;
-
+//
-        return selectPage(reqVO, query);
+//
-    }
+//
+//        return selectPage(reqVO, query);
+//    }
     default  boolean judgeHasOver(Long id){
         MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
         query.eq(TaskDispatchDetailDO::getDispatchId,id)
@@ -483,4 +484,6 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
         // 如果未超时，返回空的 PageResult
         return PageResult.empty();
     }
+
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/master/MasterServiceImpl.java

@@ -44,14 +44,6 @@ public class MasterServiceImpl implements MasterService {
         validateMasterExists(updateReqVO.getId());
         // 更新
         MasterDO updateObj = BeanUtils.toBean(updateReqVO, MasterDO.class);
-        if(updateReqVO.getGh()==1){
-            System.out.println("借用数量"+updateReqVO.getJyNum());
-            System.out.println("归还数量"+updateReqVO.getGhNum());
-            if(updateReqVO.getJyNum().compareTo(updateReqVO.getGhNum())==0){
-                updateObj.setGhType(2);
-            }
-        }
-
         masterMapper.updateById(updateObj);
     }
 

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordService.java

@@ -2,6 +2,8 @@ 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;
@@ -12,7 +14,7 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
  *
  * @author 管理员
  */
-public interface PricequoterecordService {
+public interface PricequoterecordService extends IService<PricequoterecordDO> {
 
     /**
      * 创建基础信息-报价记录

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.chanko.yunxi.mes.module.heli.service.pricequoterecord;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper;
 import org.springframework.stereotype.Service;
@@ -28,7 +29,7 @@ import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
-public class PricequoterecordServiceImpl implements PricequoterecordService {
+public class PricequoterecordServiceImpl extends ServiceImpl<PricequoterecordMapper, PricequoterecordDO> implements PricequoterecordService    {
 
     @Resource
     private PricequoterecordMapper pricequoterecordMapper;
@@ -74,7 +75,6 @@ public class PricequoterecordServiceImpl implements PricequoterecordService {
         // 更新
         PricequoterecordDO updateObj = BeanUtils.toBean(updateReqVO, PricequoterecordDO.class);
         pricequoterecordMapper.updateById(updateObj);
-
         if(updateObj.getWinTheResult()!=null && updateObj.getWinTheResult() == 0&& updateReqVO.getFlag() == 0){
             //生成启动单
             ProjectOrderDO projectOrderDO = new ProjectOrderDO();

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java

@@ -3,16 +3,12 @@ package com.chanko.yunxi.mes.module.heli.service.taskdispatch;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.chanko.yunxi.mes.framework.common.exception.ErrorCode;
 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.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
-import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.ProcessBomImportExcelVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.*;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipManufactureDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO;
@@ -22,10 +18,8 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatch
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.equipmanufacture.EquipManufactureMapper;
-import com.chanko.yunxi.mes.module.heli.dal.mysql.fpuser.FpUserMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.fpuserdetail.FpUserDetailMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper;
-import com.chanko.yunxi.mes.module.heli.dal.mysql.plansub.PlanSubMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderSubMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper;
@@ -34,21 +28,15 @@ import com.chanko.yunxi.mes.module.heli.enums.*;
 import com.chanko.yunxi.mes.module.heli.manager.CrossOrderManager;
 import com.chanko.yunxi.mes.module.heli.service.pgmaster.PgMasterService;
 import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService;
-import com.chanko.yunxi.mes.module.heli.service.zjbgmasterline.ZjBgMasterLineService;
 import com.chanko.yunxi.mes.module.heli.service.zjpgmaster.ZjPgMasterService;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.chanko.yunxi.mes.module.system.service.user.AdminUserService;
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
@@ -221,7 +209,11 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
 
     @Override
     public PageResult<TaskDispatchDetailDO> planBbPage(TaskPlanJDBaoBiaoPageReqVO pageReqVO) {
-        PageResult<TaskDispatchDetailDO> taskDispatchDOPageResult = taskDispatchDetailMapper.planBbPage(pageReqVO);
+        pageReqVO.setPageNo((pageReqVO.getPageNo()-1)*pageReqVO.getPageSize());
+        List<TaskDispatchDetailDO> taskDispatchDOList = taskDispatchDetailMapper.planBb(pageReqVO);
+        List<TaskDispatchDetailDO> taskDispatchDOList1 = taskDispatchDetailMapper.planBbPage(pageReqVO);
+        int totalPage = new BigDecimal(taskDispatchDOList.size()).divide(new BigDecimal(pageReqVO.getPageSize()), 0, RoundingMode.CEILING).intValue();
+        PageResult<TaskDispatchDetailDO> taskDispatchDOPageResult = new PageResult<>(taskDispatchDOList1, Long.parseLong(String.valueOf(taskDispatchDOList.size())), totalPage);
         return taskDispatchDOPageResult;
     }
     @Override

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml

@@ -14,4 +14,89 @@
         <if test="type == 2">post_id = null</if>
          WHERE id =#{id}
     </update>
+    <select id="planBbPage" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO">
+        SELECT d.code AS projectCode,
+               d.project_name AS projectName,
+               g.task_no AS taskNo, 0 AS planType,
+               e.name AS projectSubName,
+               c.material_name AS materialName,
+               f.name AS procdureName,
+               t.work_time AS workTime,
+               t.owner,
+               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,
+               t.procedure_status AS wgType, t.end_time AS endTime
+        FROM pro_task_dispatch_detail t
+        LEFT JOIN pro_task_dispatch b ON (b.id = t.dispatch_id  AND b.tenant_id = 2 AND b.deleted = 0)
+        LEFT JOIN pro_task_report h ON (h.dispatch_detail_id = t.id  AND h.tenant_id = 2 AND h.deleted = 0)
+        LEFT JOIN pro_process_bom_detail c ON (c.id = b.bom_detail_id AND c.tenant_id = 2  AND c.deleted = 0)
+        LEFT JOIN project_sale_order d ON (d.id = b.project_id AND d.tenant_id = 2 AND d.deleted = 0)
+        LEFT JOIN project_sale_order_sub e ON (e.id = b.project_sub_id AND e.tenant_id = 2 AND e.deleted = 0)
+        LEFT JOIN base_procedure f ON (f.id = t.procedure_id  AND f.tenant_id = 2 AND f.deleted = 0)
+        LEFT JOIN project_plan_task g ON (g.id = b.task_id AND g.tenant_id = 2 AND g.deleted = 0)
+        WHERE t.deleted = 0       AND t.tenant_id = 2
+        <if test="reqVO.projectCode != null and reqVO.projectCode != ''">
+            AND d.code = #{reqVO.projectCode}
+        </if>
+        <if test="reqVO.projectName != null and reqVO.projectName != ''">
+            AND d.project_name = #{reqVO.projectName}
+        </if>
+        <if test="reqVO.taskNo != null and reqVO.taskNo != ''">
+            AND  g.task_no = #{reqVO.taskNo}
+        </if>
+        <if test="reqVO.projectSubName != null and reqVO.projectSubName != ''">
+            AND   e.name = #{reqVO.projectSubName}
+        </if>
+        <if test="reqVO.materialName != null and reqVO.materialName != ''">
+            AND   c.material_name = #{reqVO.materialName}
+        </if>
+        <if test="reqVO.owner != null and reqVO.owner != ''">
+            AND   t.owner = #{reqVO.owner}
+        </if>
+        GROUP BY  t.id
+        limit #{reqVO.pageNo},#{reqVO.pageSize}
+    </select>
+    <select id="planBb" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO">
+        SELECT d.code AS projectCode,
+        d.project_name AS projectName,
+        g.task_no AS taskNo, 0 AS planType,
+        e.name AS projectSubName,
+        c.material_name AS materialName,
+        f.name AS procdureName,
+        t.work_time AS workTime,
+        t.owner,
+        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,
+        t.procedure_status AS wgType, t.end_time AS endTime
+        FROM pro_task_dispatch_detail t
+        LEFT JOIN pro_task_dispatch b ON (b.id = t.dispatch_id  AND b.tenant_id = 2 AND b.deleted = 0)
+        LEFT JOIN pro_task_report h ON (h.dispatch_detail_id = t.id  AND h.tenant_id = 2 AND h.deleted = 0)
+        LEFT JOIN pro_process_bom_detail c ON (c.id = b.bom_detail_id AND c.tenant_id = 2  AND c.deleted = 0)
+        LEFT JOIN project_sale_order d ON (d.id = b.project_id AND d.tenant_id = 2 AND d.deleted = 0)
+        LEFT JOIN project_sale_order_sub e ON (e.id = b.project_sub_id AND e.tenant_id = 2 AND e.deleted = 0)
+        LEFT JOIN base_procedure f ON (f.id = t.procedure_id  AND f.tenant_id = 2 AND f.deleted = 0)
+        LEFT JOIN project_plan_task g ON (g.id = b.task_id AND g.tenant_id = 2 AND g.deleted = 0)
+        WHERE t.deleted = 0       AND t.tenant_id = 2
+        <if test="reqVO.projectCode != null and reqVO.projectCode != ''">
+            AND d.code = #{reqVO.projectCode}
+        </if>
+        <if test="reqVO.projectName != null and reqVO.projectName != ''">
+            AND d.project_name = #{reqVO.projectName}
+        </if>
+        <if test="reqVO.taskNo != null and reqVO.taskNo != ''">
+            AND  g.task_no = #{reqVO.taskNo}
+        </if>
+        <if test="reqVO.projectSubName != null and reqVO.projectSubName != ''">
+            AND   e.name = #{reqVO.projectSubName}
+        </if>
+        <if test="reqVO.materialName != null and reqVO.materialName != ''">
+            AND   c.material_name = #{reqVO.materialName}
+        </if>
+        <if test="reqVO.owner != null and reqVO.owner != ''">
+            AND   t.owner = #{reqVO.owner}
+        </if>
+        GROUP BY  t.id
+    </select>
 </mapper>

mes-ui/mes-ui-admin-vue3/src/api/heli/master/index.ts

@@ -2,17 +2,14 @@ import request from '@/config/axios'
 
 export interface MasterVO {
   id: number
-  jyUser: string
-  jyType: number
   jyBm: string
   jyYt: string
   rem: string
   jyMaster: string
-  jyNum: number
+  jyUser: number
-  ghNum: number
+  jyType: number
-  jyTime: Date
+  num: number
-  ghTime: Date
+  jyDate:Date
-  ghType: number
 }
 
 // 查询借用主分页

mes-ui/mes-ui-admin-vue3/src/components/Form/src/Form.vue

@@ -35,7 +35,7 @@ export default defineComponent({
       type: Array as PropType<FormSchema[]>,
       default: () => []
     },
-    // 是否需要栅格布局
+    // 需要栅格布局
     // update by 芋艿：将 true 改成 false，因为项目更常用这种方式
     isCol: propTypes.bool.def(false),
     // 表单数据对象

mes-ui/mes-ui-admin-vue3/src/utils/dict.ts

@@ -266,6 +266,8 @@ export enum DICT_TYPE {
 
 	HELI_SHENHE='heli_shenhe',//审核类型
 	PICKCAR='pickcar',//审核类型
+  HELI_BORROW_TYPE='heli_borrow_type',//员工借用物料类型
+  HELI_USE='heli_use',//员工借用物料用途
 
 	PICKMODE='pickmode',//领料模式
 	DB_LEVEL='db_level',//代办级别

mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue

@@ -292,7 +292,7 @@ const queryData = async (type: string, id?: number) => {
 
 
       // 如为归档
-      let businessType = 'PROJECT_BAOJIA'
+      let businessType = 'QUOTATION_RECORD'
       if (type == 'detailArchive') {
         businessType = 'PROJECT_BAOJIA_SNAPSHOT'
       } else {

mes-ui/mes-ui-admin-vue3/src/views/heli/master/MasterForm.vue

@@ -1,90 +1,115 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" :style="{width: '2000px', height: '500px'}">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200">
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="160px"
+      label-width="180px"
       v-loading="formLoading"
     >
-		<el-row>
-			<el-col :span="6">
-				<el-form-item label="借用人" prop="jyUser">
-					<UserSelect v-model="formData.jyUser"  @update:newValue="handleSelectedUser1" class="!w-265px"/>
-					
-				  
-				</el-form-item>
-			</el-col>
-			
-			
-			<el-col :span="6">
-				<el-form-item label="借用部门" prop="jyBm">
-				  <el-input v-model="formData.jyBm" placeholder="请输入借用部门" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="6">
-				<el-form-item label="借用用途" prop="jyYt">
-				  <el-input v-model="formData.jyYt" placeholder="请输入借用用途" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="6">
-				<el-form-item label="借用物料名称" prop="jyMaster">
-				  <el-input v-model="formData.jyMaster" placeholder="请输入借用物料名称" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		
-     <el-row>
-		 <el-col :span="6">
-		 	<el-form-item label="借用数量" prop="jyNum">
-		 	  <el-input v-model="formData.jyNum" placeholder="请输入借用数量" />
-		 	</el-form-item>
-		 </el-col>
-		 <el-col :span="6">
-		 	<el-form-item label="借用时间" prop="jyTime">
-		 	  <el-date-picker
-		 	    v-model="formData.jyTime"
-		 	    type="date"
-		 	    value-format="x"
-		 	    placeholder="选择借用时间"
-		 	  />
-		 	</el-form-item>
-		 </el-col>
-     	<el-col :span="6">
-     		<el-form-item label="备注" prop="rem">
-     		  <el-input v-model="formData.rem" placeholder="请输入备注" />
-     		</el-form-item>
-     	</el-col>
-     	
-     	<el-col :span="6">
-     		<el-form-item v-if="xianshi" label="归还数量" prop="ghNum">
-     		  <el-input  v-model="formData.ghNum" placeholder="请输入归还数量" />
-     		</el-form-item>
-     	</el-col>
-     </el-row>
-      
       <el-row>
+        <el-col :span="8">
 
-      	<el-col :span="6">
+      <el-form-item label="借用人" prop="jyUser">
-      		<el-form-item v-if="xianshi" label="归还时间" prop="ghTime">
+<!--        <el-input v-model="formData.jyUser" placeholder="请输入借用人" />-->
-      		  <el-date-picker
+        <el-select v-model="formData.jyUser"  placeholder="请选择借用人">
-      		    v-model="formData.ghTime"
+          <el-option
-      		    type="date"
+            v-for="user in userList"
-      		    value-format="x"
+            :key="user.id"
-      		    placeholder="选择归还时间"
+            :label="user.nickname"
-      		  />
+            :value="user.id"
-      		</el-form-item>
+          />
-      	</el-col>
+        </el-select>
+      </el-form-item>
+        </el-col>
+        <el-col :span="8">
+      <el-form-item label="借用部门" prop="jyBm">
+<!--        <el-input v-model="formData.jyBm" placeholder="请输入借用部门" />-->
+<!--        <el-select v-model="formData.jyUser"  placeholder="请选择借用人">-->
+<!--          <el-option-->
+<!--            v-for="user in deptList"-->
+<!--            :key="user.id"-->
+<!--            :label="user.nickname"-->
+<!--            :value="user.id"-->
+<!--          />-->
+<!--        </el-select>-->
+        <BranchSelect v-model="formData.jyBm" placeholder="请选择借用部门"/>
+      </el-form-item>
+        </el-col>
+        <el-col :span="8">
+        <el-form-item label="借用类型" prop="jyType">
+          <el-select
+            v-model="formData.jyType"
+            placeholder="请选择借用类型"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BORROW_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        </el-col>
+        </el-row>
+     <el-row>
+       <el-col :span="8">
+      <el-form-item label="用途" prop="jyYt">
+        <el-select
+          v-model="formData.jyYt"
+          placeholder="请选择用途"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_USE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+       </el-col>
+       <el-col :span="8">
+       <el-form-item label="借用日期" prop="jyDate" >
+         <el-date-picker
+           v-model="formData.jyDate"
+           type="date"
+           value-format="x"
+           placeholder="选择借用日期"
+         />
+       </el-form-item>
+       </el-col>
+       <el-col :span="8">
+      <el-form-item label="借用物料名称" prop="jyMaster">
+<!--        <el-input v-model="formData.jyMaster" placeholder="请输入借用物料名称" />-->
+        <el-select v-model="formData.jyMaster"  placeholder="请选择借用物料名称">
+          <el-option
+            v-for="material in materialList"
+            :key="material.id"
+            :label="material.name"
+            :value="material.id"
+          />
+        </el-select>
+      </el-form-item>
+       </el-col>
+     </el-row>
+      <el-row>
+        <el-col :span="8">
+      <el-form-item label="数量" prop="num">
+        <el-input-number v-model="formData.num" placeholder="请输入数量" />
+      </el-form-item>
+        </el-col>
+        <el-col :span="8">
+      <el-form-item label="备注" prop="rem">
+        <el-input v-model="formData.rem" placeholder="请输入备注" />
+      </el-form-item>
+        </el-col>
       </el-row>
-      
-      
-      
-      
-      
-
-      
-
     </el-form>
+
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -93,50 +118,45 @@
 </template>
 <script setup lang="ts">
 import * as MasterApi from '@/api/heli/master'
-import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
+import MaterialSelect from "@/views/heli/hlvuestyle/materialSelect.vue";
+import * as UserApi from "@/api/system/user";
+import {getSimpList} from "@/api/heli/material";
+import * as MaterialApi from "@/api/heli/material";
+import * as DeptApi from "@/api/system/dept";
+import {getSimpleDeptList} from "@/api/system/dept";
+import BranchSelect from "@/views/heli/hlvuestyle/branchSelect.vue";
+import {number} from "vue-types";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const userList = ref<any[]>([]) // 用户列表
+const materialList = ref<any[]>([]) // 物料列表
+const deptList = ref<any[]>([]) // 部门列表
 const dialogVisible = ref(false) // 弹窗的是否展示
-const xianshi = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  jyUser: undefined,
-  jyType: undefined,
   jyBm: undefined,
   jyYt: undefined,
   rem: undefined,
   jyMaster: undefined,
-  jyNum: undefined,
+  jyUser: undefined,
-  ghNum: undefined,
+  jyType: undefined,
-  jyTime: undefined,
+  num: undefined,
-  ghTime: undefined,
+  jyDate:undefined
-  ghType: undefined,
-  gh:undefined,
 })
 const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 
-//项目负责人
-const handleSelectedUser1 = (newValue: any) => {
-  formData.value.jyUser = newValue?.id
-}
-
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
-  if(type=='guihuan'){
-	  xianshi.value = true
-  }else{
-	  	  xianshi.value = false
-  }
   resetForm()
   // 修改时，设置数据
   if (id) {
@@ -147,6 +167,9 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  userList.value = await UserApi.getSimpleUserList()
+  materialList.value = await MaterialApi.getSimpList()
+  deptList.value = await DeptApi.getSimpleDeptList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -163,11 +186,6 @@ const submitForm = async () => {
       await MasterApi.createMaster(data)
       message.success(t('common.createSuccess'))
     } else {
-	  if (formType.value === 'guihuan') {
-		  data.gh = 1
-	  }else{
-		  data.gh = 0
-	  }	  
       await MasterApi.updateMaster(data)
       message.success(t('common.updateSuccess'))
     }
@@ -183,17 +201,13 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    jyUser: undefined,
-    jyType: undefined,
     jyBm: undefined,
     jyYt: undefined,
     rem: undefined,
     jyMaster: undefined,
-    jyNum: undefined,
+    jyUser: undefined,
-    ghNum: undefined,
+    jyType: undefined,
-    jyTime: undefined,
+    num: undefined
-    ghTime: undefined,
-    ghType: undefined,
   }
   formRef.value?.resetFields()
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue

@@ -6,25 +6,17 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="160px"
+      label-width="100px"
     >
-
       <el-form-item label="借用人" prop="jyUser">
-         <UserSelect v-model="queryParams.jyUser"  @update:newValue="handleSelectedUser1" class="!w-265px"/>
+        <el-input
-         
+          v-model="queryParams.jyUser"
-		
+          placeholder="请输入借用人"
-		
-      </el-form-item>
-<!--      <el-form-item label="1借出2归还" prop="jyType">
-        <el-select
-          v-model="queryParams.jyType"
-          placeholder="请选择1借出2归还"
           clearable
+          @keyup.enter="handleQuery"
           class="!w-240px"
-        >
+        />
-          <el-option label="请选择字典生成" value="" />
+      </el-form-item>
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="借用部门" prop="jyBm">
         <el-input
           v-model="queryParams.jyBm"
@@ -34,50 +26,46 @@
           class="!w-240px"
         />
       </el-form-item>
+      <el-form-item label="借用类型" prop="jyType">
+        <el-select
+          v-model="queryParams.jyType"
+          placeholder="请选择借用类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BORROW_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用途" prop="jyYt">
+        <el-select
+          v-model="queryParams.jyYt"
+          placeholder="请选择用途"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_USE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 
-
+      <el-form-item label="物料名称" prop="jyMaster">
-      <el-form-item label="借用物料名称" prop="jyMaster">
         <el-input
           v-model="queryParams.jyMaster"
-          placeholder="请输入借用物料名称"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-     
-      <el-form-item label="借用时间" prop="jyTime">
-        <el-date-picker
-          v-model="queryParams.jyTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="归还时间" prop="ghTime">
-        <el-date-picker
-          v-model="queryParams.ghTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="是否归还" prop="ghType">
-        <el-select
-          v-model="queryParams.ghType"
-          placeholder="请选择是否归"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -89,51 +77,57 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <el-button
+<!--        <el-button-->
-          type="success"
+<!--          type="success"-->
-          plain
+<!--          plain-->
-          @click="handleExport"
+<!--          @click="handleExport"-->
-          :loading="exportLoading"
+<!--          :loading="exportLoading"-->
-          v-hasPermi="['heli:master:export']"
+<!--          v-hasPermi="['heli:master:export']"-->
-        >
+<!--        >-->
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+<!--          <Icon icon="ep:download" class="mr-5px" /> 导出-->
-        </el-button>
+<!--        </el-button>-->
       </el-form-item>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" class="hl-table" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column v-if="false" label="主键" align="center" prop="id" />
+      <el-table-column label="主键" align="center" prop="id" />
-
       <el-table-column label="借用人" align="center" prop="jyUser" >
-		  <template #default="scope">
+        <template #default="scope">
-		    {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}
+          {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}
-		  </template>
+        </template>
-	  </el-table-column>
+      </el-table-column>
-      <el-table-column v-if= "false" label="1借出2归还" align="center" prop="jyType" />
+      <el-table-column label="借用部门" align="center" prop="jyBm" >
-      <el-table-column label="借用部门" align="center" prop="jyBm" />
+        <template #default="scope">
-      <el-table-column label="借用用途" align="center" prop="jyYt" />
+          {{deptList.find((dept)=>dept.id==scope.row.jyBm)?.name}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="单据日期"
+        align="center"
+        prop="jyDate"
+        :formatter="dateFormatter1"
+        width="180px"
+      />
+      <el-table-column label="借用类型" align="center" prop="jyType" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_BORROW_TYPE" :value="scope.row.jyType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="用途" align="center" prop="jyYt">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_USE" :value="scope.row.jyYt" />
+          </template>
+      </el-table-column>
+      <el-table-column label="数量" align="center" prop="num" />
+      <el-table-column label="借用物料名称" align="center" prop="jyMaster" width="180">
+        <template #default="scope">
+          {{materialList.find((material)=>material.id==scope.row.jyMaster)?.name}}
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="rem" />
-      <el-table-column label="借用物料名称" align="center" prop="jyMaster" />
-      <el-table-column label="借用数量" align="center" prop="jyNum" />
-      <el-table-column label="归还数量" align="center" prop="ghNum" />
-      <el-table-column
-        label="借用时间"
-        align="center"
-        prop="jyTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column
-        label="归还时间"
-        align="center"
-        prop="ghTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="是否归还" align="center" prop="ghType" />
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
@@ -144,16 +138,6 @@
           >
             编辑
           </el-button>
-		  
-		  <el-button
-		    link
-		    type="primary"
-		    @click="openForm('guihuan', scope.row.id)"
-		    v-hasPermi="['heli:master:update']"
-		  >
-		    归还
-		  </el-button>
-		  
           <el-button
             link
             type="danger"
@@ -179,18 +163,22 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, dateFormatter1} from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as MasterApi from '@/api/heli/master'
 import MasterForm from './MasterForm.vue'
-import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
-import * as UserApi from '@/api/system/user'
+import * as UserApi from "@/api/system/user";
+import * as MaterialApi from "@/api/heli/material";
+import * as DeptApi from "@/api/system/dept";
 
 defineOptions({ name: 'Master' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const userList = ref<any[]>([]) // 用户列表
+const materialList = ref<any[]>([]) // 物料列表
+const deptList = ref<any[]>([]) // 部门列表
 const loading = ref(true) // 列表的加载中
 const list = ref([]) // 列表的数据
 const total = ref(0) // 列表的总页数
@@ -198,24 +186,16 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   createTime: [],
-  jyUser: undefined,
-  jyType: undefined,
   jyBm: undefined,
   jyYt: undefined,
   rem: undefined,
   jyMaster: undefined,
-  jyNum: undefined,
+  jyUser: undefined,
-  ghNum: undefined,
+  jyType: undefined,
-  jyTime: [],
+  num: undefined
-  ghTime: [],
-  ghType: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-//项目负责人
-const handleSelectedUser1 = (newValue: any) => {
-  queryParams.jyUser = newValue?.id
-}
 
 /** 查询列表 */
 const getList = async () => {
@@ -277,7 +257,9 @@ const handleExport = async () => {
 
 /** 初始化 **/
 onMounted(async () => {
-  await getList()
+  getList()
   userList.value = await UserApi.getSimpleUserList()
+  materialList.value = await MaterialApi.getSimpList()
+  deptList.value = await DeptApi.getSimpleDeptList()
 })
 </script>

mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue

@@ -0,0 +1,340 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="100px"
+    >
+      <el-form-item label="借用人" prop="jyUser">
+        <el-input
+          v-model="queryParams.jyUser"
+          placeholder="请输入借用人"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="借用部门" prop="jyBm">
+        <el-input
+          v-model="queryParams.jyBm"
+          placeholder="请输入借用部门"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="借用类型" prop="jyType">
+        <el-select
+          v-model="queryParams.jyType"
+          placeholder="请选择借用类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BORROW_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用途" prop="jyYt">
+        <el-select
+          v-model="queryParams.jyYt"
+          placeholder="请选择用途"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_USE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="物料名称" prop="jyMaster">
+        <el-input
+          v-model="queryParams.jyMaster"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          @click="openForm('create')"-->
+<!--          v-hasPermi="['heli:master:create']"-->
+<!--        >-->
+<!--          <Icon icon="ep:plus" class="mr-5px" /> 新增-->
+<!--        </el-button>-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          @click="handleExport"-->
+<!--          :loading="exportLoading"-->
+<!--          v-hasPermi="['heli:master:export']"-->
+<!--        >-->
+<!--          <Icon icon="ep:download" class="mr-5px" /> 导出-->
+<!--        </el-button>-->
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" show-summary :summary-method="getSummaries">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="借用人" align="center" prop="jyUser" >
+        <template #default="scope">
+          {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}
+        </template>
+      </el-table-column>
+      <el-table-column label="借用部门" align="center" prop="jyBm" >
+        <template #default="scope">
+          {{deptList.find((dept)=>dept.id==scope.row.jyBm)?.name}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="单据日期"
+        align="center"
+        prop="jyDate"
+        :formatter="dateFormatter1"
+        width="180px"
+      />
+      <el-table-column label="借用类型" align="center" prop="jyType" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_BORROW_TYPE" :value="scope.row.jyType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="用途" align="center" prop="jyYt">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_USE" :value="scope.row.jyYt" />
+          </template>
+      </el-table-column>
+      <el-table-column label="数量" align="center" prop="num" />
+      <el-table-column label="借出数量" align="center" prop="quantityLent" />
+      <el-table-column label="借用物料名称" align="center" prop="jyMaster" width="160">
+        <template #default="scope">
+          {{materialList.find((material)=>material.id==scope.row.jyMaster)?.name}}
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="rem" />
+      <el-table-column label="操作" align="center" width="140">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:master:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['heli:master:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MasterForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import {dateFormatter, dateFormatter1} from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as MasterApi from '@/api/heli/master'
+import MasterForm from './MasterForm.vue'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
+import * as UserApi from "@/api/system/user";
+import * as MaterialApi from "@/api/heli/material";
+import * as DeptApi from "@/api/system/dept";
+
+defineOptions({ name: 'Master' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const userList = ref<any[]>([]) // 用户列表
+const materialList = ref<any[]>([]) // 物料列表
+const deptList = ref<any[]>([]) // 部门列表
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  createTime: [],
+  jyBm: undefined,
+  jyYt: undefined,
+  rem: undefined,
+  jyMaster: undefined,
+  jyUser: undefined,
+  jyType: undefined,
+  num: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await MasterApi.getMasterPage(queryParams)
+    list.value = data.list
+    list.value.map(item=>{
+      if (item.jyType=="4"){
+        item.quantityLent= Number(-Math.abs(item.num));
+      }else {
+        item.quantityLent= Number(item.num);
+      }
+    })
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MasterApi.deleteMaster(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await MasterApi.exportMaster(queryParams)
+    download.excel(data, '借用主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+const getSummaries = (param: SummaryMethodProps) => {
+  const summaryField = ["quantityLent"];
+  console.log(param)
+  const { columns, data } = param;
+  const sums = [];
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = '合计';
+      return;
+    }
+    if (!summaryField.includes(column.property)) {
+      sums[index] = '';
+      return;
+    }
+    const values = data.map(item => Number(item[column.property]));
+    if (!values.every(value => isNaN(value))) {
+      sums[index] = values.reduce((prev, curr) => {
+        const value = Number(curr);
+        if (!isNaN(value)) {
+          return floatAdd(prev, curr);
+        } else {
+          return prev;
+        }
+      }, 0);
+      const thousandsField = [];
+      if (thousandsField.includes(column.property)) {
+        sums[index] = thousandsFormat(sums[index]);
+      }
+    } else {
+      sums[index] = '';
+    }
+  });
+  // const sumValue = computed(() => {
+  //   return list.value.reduce((sum, item) => sum + item.quantityLent, 0);
+  // });
+  // const sums = ['合计','','','','','','','',sumValue];
+  return sums;
+}
+const floatAdd = (a, b) => {
+  var c, d, e;
+  if (undefined === a || null === a || "" === a || isNaN(a)) { a = 0; }
+  if (undefined === b || null === b || "" === b || isNaN(b)) { b = 0; }
+  try {
+    c = a.toString().split(".")[1].length;
+  } catch (f) {
+    c = 0;
+  }
+  try {
+    d = b.toString().split(".")[1].length;
+  } catch (f) {
+    d = 0;
+  }
+  e = Math.pow(10, Math.max(c, d));
+  return (floatMul(a, e) + floatMul(b, e)) / e;
+};
+const floatMul = (a, b) => {
+  var c = 0,
+    d = a.toString(),
+    e = b.toString();
+  try {
+    c += d.split(".")[1].length;
+  } catch (f) {}
+  try {
+    c += e.split(".")[1].length;
+  } catch (f) {}
+  return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+}
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+
+  userList.value = await UserApi.getSimpleUserList()
+  materialList.value = await MaterialApi.getSimpList()
+  deptList.value = await DeptApi.getSimpleDeptList()
+})
+</script>

mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue

@@ -105,11 +105,9 @@ const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
   if (formData.value.cgYishou<formData.value.cgYs&&formData.value.cgTypee==2){
-    message.error("已收金额小于应收金额,回款未完成,请确认")
+    await message.confirm("已收金额小于应收金额,回款未完成,请确认")
-    return
   }else if (formData.value.cgYishou>=formData.value.cgYs&&formData.value.cgTypee==1){
-    message.error("已收金额大于等于应收金额,回款已完成,请确认")
+    await  message.confirm("已收金额大于等于应收金额,回款已完成,请确认")
-    return
   }
   // 提交请求
   formLoading.value = true