diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinesTypeEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinesTypeEnum.java index b56a354..3646998 100644 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/BusinesTypeEnum.java +++ b/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; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/MasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/MasterController.java index 79e7d38..c401fcc 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/MasterController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/MasterController.java @@ -1,95 +1,95 @@ -package com.chanko.yunxi.mes.module.heli.controller.admin.master; - -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.chanko.yunxi.mes.framework.common.pojo.PageParam; -import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; -import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; -import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; - -import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; - -import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; -import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.chanko.yunxi.mes.module.heli.controller.admin.master.vo.*; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.master.MasterDO; -import com.chanko.yunxi.mes.module.heli.service.master.MasterService; - -@Tag(name = "管理后台 - 借用主") -@RestController -@RequestMapping("/heli/master") -@Validated -public class MasterController { - - @Resource - private MasterService masterService; - - @PostMapping("/create") - @Operation(summary = "创建借用主") - @PreAuthorize("@ss.hasPermission('heli:master:create')") - public CommonResult createMaster(@Valid @RequestBody MasterSaveReqVO createReqVO) { - return success(masterService.createMaster(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新借用主") - @PreAuthorize("@ss.hasPermission('heli:master:update')") - public CommonResult updateMaster(@Valid @RequestBody MasterSaveReqVO updateReqVO) { - masterService.updateMaster(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除借用主") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('heli:master:delete')") - public CommonResult deleteMaster(@RequestParam("id") Integer id) { - masterService.deleteMaster(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得借用主") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('heli:master:query')") - public CommonResult getMaster(@RequestParam("id") Integer id) { - MasterDO master = masterService.getMaster(id); - return success(BeanUtils.toBean(master, MasterRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得借用主分页") - @PreAuthorize("@ss.hasPermission('heli:master:query')") - public CommonResult> getMasterPage(@Valid MasterPageReqVO pageReqVO) { - PageResult pageResult = masterService.getMasterPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MasterRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出借用主 Excel") - @PreAuthorize("@ss.hasPermission('heli:master:export')") - @OperateLog(type = EXPORT) - public void exportMasterExcel(@Valid MasterPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = masterService.getMasterPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "借用主.xls", "数据", MasterRespVO.class, - BeanUtils.toBean(list, MasterRespVO.class)); - } - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.controller.admin.master; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; + +import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; + +import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; +import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.chanko.yunxi.mes.module.heli.controller.admin.master.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.master.MasterDO; +import com.chanko.yunxi.mes.module.heli.service.master.MasterService; + +@Tag(name = "管理后台 - 借用主") +@RestController +@RequestMapping("/heli/master") +@Validated +public class MasterController { + + @Resource + private MasterService masterService; + + @PostMapping("/create") + @Operation(summary = "创建借用主") + @PreAuthorize("@ss.hasPermission('heli:master:create')") + public CommonResult createMaster(@Valid @RequestBody MasterSaveReqVO createReqVO) { + return success(masterService.createMaster(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新借用主") + @PreAuthorize("@ss.hasPermission('heli:master:update')") + public CommonResult updateMaster(@Valid @RequestBody MasterSaveReqVO updateReqVO) { + masterService.updateMaster(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除借用主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('heli:master:delete')") + public CommonResult deleteMaster(@RequestParam("id") Integer id) { + masterService.deleteMaster(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得借用主") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:master:query')") + public CommonResult getMaster(@RequestParam("id") Integer id) { + MasterDO master = masterService.getMaster(id); + return success(BeanUtils.toBean(master, MasterRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得借用主分页") + @PreAuthorize("@ss.hasPermission('heli:master:query')") + public CommonResult> getMasterPage(@Valid MasterPageReqVO pageReqVO) { + PageResult pageResult = masterService.getMasterPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MasterRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出借用主 Excel") + @PreAuthorize("@ss.hasPermission('heli:master:export')") + @OperateLog(type = EXPORT) + public void exportMasterExcel(@Valid MasterPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = masterService.getMasterPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "借用主.xls", "数据", MasterRespVO.class, + BeanUtils.toBean(list, MasterRespVO.class)); + } + +} \ 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/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 673e705..1a27af8 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 @@ -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 = "借用数量") - private BigDecimal jyNum; + @Schema(description = "借用人") + private Long jyUser; - @Schema(description = "归还数量") - private BigDecimal ghNum; + @Schema(description = "借用类型", example = "1") + private Integer jyType; - @Schema(description = "借用时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - 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; + @Schema(description = "数量") + private BigDecimal num; } \ 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/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 b790e3f..1e32bfa 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 @@ -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 = "借用数量") - @ExcelProperty("借用数量") - private BigDecimal jyNum; + @Schema(description = "借用人") + @ExcelProperty("借用人") + private Long jyUser; - @Schema(description = "归还数量") - @ExcelProperty("归还数量") - private BigDecimal ghNum; + @Schema(description = "借用类型", example = "1") + @ExcelProperty("借用类型") + private String jyType; - @Schema(description = "借用时间") - @ExcelProperty("借用时间") - private LocalDateTime jyTime; - - @Schema(description = "归还时间") - @ExcelProperty("归还时间") - private LocalDateTime ghTime; - - @Schema(description = "是否归还完成1否 2 是", example = "1") - @ExcelProperty("是否归还完成1否 2 是") - private Integer ghType; + @Schema(description = "数量") + @ExcelProperty("数量") + private BigDecimal num; + @Schema(description = "借用日期") + @ExcelProperty("借用日期") + private LocalDateTime jyDate; } \ 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/master/vo/MasterSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterSaveReqVO.java index a701cc3..18ce49d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterSaveReqVO.java +++ b/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 = "借用数量") - private BigDecimal jyNum; + @Schema(description = "借用人") + private Long jyUser; - @Schema(description = "归还数量") - private BigDecimal ghNum; + @Schema(description = "借用类型") + private String jyType; + @Schema(description = "数量") + private BigDecimal num; @Schema(description = "借用时间") - private LocalDateTime jyTime; - - @Schema(description = "归还时间") - private LocalDateTime ghTime; - - @Schema(description = "是否归还完成1否 2 是", example = "1") - private Integer ghType; - - @Schema(description = "是否归还完成1否 2 是", example = "1") - private int gh; + private LocalDateTime jyDate; -} +} \ 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 5392db6..0096aae 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 @@ -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 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 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); } 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 30505c0..b787cb5 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 @@ -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; + + } 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 72f1516..065b875 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 @@ -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 ghTime; - /** - * 是否归还完成1否 2 是 - */ - private Integer ghType; + private LocalDateTime jyDate; } \ 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/pricequoterecord/PricequoterecordDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pricequoterecord/PricequoterecordDO.java index 608bd71..800dd30 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pricequoterecord/PricequoterecordDO.java +++ b/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; } \ 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/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 cc85ea3..dd4d766 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 @@ -20,19 +20,14 @@ public interface MasterMapper extends BaseMapperX { default PageResult selectPage(MasterPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .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::getGhNum, reqVO.getGhNum()) - .betweenIfPresent(MasterDO::getJyTime, reqVO.getJyTime()) - .betweenIfPresent(MasterDO::getGhTime, reqVO.getGhTime()) - .eqIfPresent(MasterDO::getGhType, reqVO.getGhType()) + .eqIfPresent(MasterDO::getJyUser, reqVO.getJyUser()) + .eqIfPresent(MasterDO::getJyType, reqVO.getJyType()) + .eqIfPresent(MasterDO::getNum, reqVO.getNum()) .orderByDesc(MasterDO::getId)); } - } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index 4bd31c6..37f61b9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -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 { public int updateOwnerAndPostIdById(@Param("id") Long id,@Param("type") Integer type); - default PageResult planBbPage(TaskPlanJDBaoBiaoPageReqVO reqVO) { - MPJLambdaWrapper query = new MPJLambdaWrapper<>(); - query.select("MAX(d.code)as projectCode,MAX(d.project_name)as projectName,MAX(g.task_no) as taskNo,0 as planType," + - " MAX(e.name) as projectSubName, MAX(c.material_name) as materialName , MAX(f.name) as procdureName ,t.work_time as workTime,t.owner," + - "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") - .leftJoin(TaskDispatchDO.class,"b",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId) - .leftJoin(ProcessBomDetailDO.class,"c",ProcessBomDetailDO::getId,TaskDispatchDO::getBomDetailId) - .leftJoin(ProjectOrderDO.class,"d",ProjectOrderDO::getId,TaskDispatchDO::getProjectId) - .leftJoin(ProjectOrderSubDO.class,"e",ProjectOrderSubDO::getId,TaskDispatchDO::getProjectSubId) - .leftJoin(ProcedureDO.class,"f",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId) - .leftJoin(PlanTaskDO.class,"g",PlanTaskDO::getId,TaskDispatchDO::getTaskId) - .leftJoin(TaskReportDO.class,"h",TaskReportDO::getDispatchDetailId,TaskDispatchDetailDO::getId) - - .groupBy("b.project_id,b.project_sub_id,b.bom_detail_id,t.procedure_id,t.owner") - ; - query.eq(TaskDispatchDO::getDispatchType,"PRODUCTION") - .eq(reqVO.getProjectCode() !=null,ProjectOrderDO::getCode,reqVO.getProjectCode()) - .eq(reqVO.getProjectName() !=null,ProjectOrderDO::getProjectName,reqVO.getProjectName()) - .eq(reqVO.getTaskNo()!=null,PlanTaskDO::getTaskNo,reqVO.getTaskNo()) - .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); - } + List planBbPage(@Param("reqVO")TaskPlanJDBaoBiaoPageReqVO reqVO); + List planBb(@Param("reqVO")TaskPlanJDBaoBiaoPageReqVO reqVO); +// default PageResult planBbPage(TaskPlanJDBaoBiaoPageReqVO reqVO) { +// MPJLambdaWrapper query = new MPJLambdaWrapper<>(); +// query.select("MAX(d.code)as projectCode,MAX(d.project_name)as projectName,MAX(g.task_no) as taskNo,0 as planType," + +// " MAX(e.name) as projectSubName, MAX(c.material_name) as materialName , MAX(f.name) as procdureName ,t.work_time as workTime,t.owner," + +// "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(TaskDispatchDO.class,"b",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId) +// .leftJoin(ProcessBomDetailDO.class,"c",ProcessBomDetailDO::getId,TaskDispatchDO::getBomDetailId) +// .leftJoin(ProjectOrderDO.class,"d",ProjectOrderDO::getId,TaskDispatchDO::getProjectId) +// .leftJoin(ProjectOrderSubDO.class,"e",ProjectOrderSubDO::getId,TaskDispatchDO::getProjectSubId) +// .leftJoin(ProcedureDO.class,"f",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId) +// .leftJoin(PlanTaskDO.class,"g",PlanTaskDO::getId,TaskDispatchDO::getTaskId) +// .leftJoin(TaskReportDO.class,"h",TaskReportDO::getDispatchDetailId,TaskDispatchDetailDO::getId) +// +// .groupBy("b.project_id,b.project_sub_id,b.bom_detail_id,t.procedure_id,t.owner") +// ; +// query.eq(TaskDispatchDO::getDispatchType,"PRODUCTION") +// .eq(ObjectUtil.isNotEmpty(reqVO.getProjectCode()),ProjectOrderDO::getCode,reqVO.getProjectCode()) +// .eq(reqVO.getProjectName() !=null,ProjectOrderDO::getProjectName,reqVO.getProjectName()) +// .eq(reqVO.getTaskNo()!=null,PlanTaskDO::getTaskNo,reqVO.getTaskNo()) +// .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); +// } default boolean judgeHasOver(Long id){ MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.eq(TaskDispatchDetailDO::getDispatchId,id) @@ -483,4 +484,6 @@ public interface TaskDispatchDetailMapper extends BaseMapperX getMasterPage(MasterPageReqVO pageReqVO); - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.service.master; + +import java.util.*; +import javax.validation.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.master.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.master.MasterDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; + +/** + * 借用主 Service 接口 + * + * @author 管理员 + */ +public interface MasterService { + + /** + * 创建借用主 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Integer createMaster(@Valid MasterSaveReqVO createReqVO); + + /** + * 更新借用主 + * + * @param updateReqVO 更新信息 + */ + void updateMaster(@Valid MasterSaveReqVO updateReqVO); + + /** + * 删除借用主 + * + * @param id 编号 + */ + void deleteMaster(Integer id); + + /** + * 获得借用主 + * + * @param id 编号 + * @return 借用主 + */ + MasterDO getMaster(Integer id); + + /** + * 获得借用主分页 + * + * @param pageReqVO 分页查询 + * @return 借用主分页 + */ + PageResult getMasterPage(MasterPageReqVO pageReqVO); + +} \ 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/master/MasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/master/MasterServiceImpl.java index 0f38651..0efab02 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/master/MasterServiceImpl.java +++ b/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); } @@ -79,4 +71,4 @@ public class MasterServiceImpl implements MasterService { return masterMapper.selectPage(pageReqVO); } -} +} \ 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 772086d..5b20e33 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 @@ -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 { /** * 创建基础信息-报价记录 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 690bcfd..5bdbc66 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 @@ -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 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(); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java index ff504d1..c512aef 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/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 planBbPage(TaskPlanJDBaoBiaoPageReqVO pageReqVO) { - PageResult taskDispatchDOPageResult = taskDispatchDetailMapper.planBbPage(pageReqVO); + pageReqVO.setPageNo((pageReqVO.getPageNo()-1)*pageReqVO.getPageSize()); + List taskDispatchDOList = taskDispatchDetailMapper.planBb(pageReqVO); + List taskDispatchDOList1 = taskDispatchDetailMapper.planBbPage(pageReqVO); + int totalPage = new BigDecimal(taskDispatchDOList.size()).divide(new BigDecimal(pageReqVO.getPageSize()), 0, RoundingMode.CEILING).intValue(); + PageResult taskDispatchDOPageResult = new PageResult<>(taskDispatchDOList1, Long.parseLong(String.valueOf(taskDispatchDOList.size())), totalPage); return taskDispatchDOPageResult; } @Override 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 32f4d00..4d0292a 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 @@ -14,4 +14,89 @@ post_id = null WHERE id =#{id} + + diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/master/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/master/index.ts index 08cc80f..1cbdc7f 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/master/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/master/index.ts @@ -1,46 +1,43 @@ -import request from '@/config/axios' - -export interface MasterVO { - id: number - jyUser: string - jyType: number - jyBm: string - jyYt: string - rem: string - jyMaster: string - jyNum: number - ghNum: number - jyTime: Date - ghTime: Date - ghType: number -} - -// 查询借用主分页 -export const getMasterPage = async (params) => { - return await request.get({ url: `/heli/master/page`, params }) -} - -// 查询借用主详情 -export const getMaster = async (id: number) => { - return await request.get({ url: `/heli/master/get?id=` + id }) -} - -// 新增借用主 -export const createMaster = async (data: MasterVO) => { - return await request.post({ url: `/heli/master/create`, data }) -} - -// 修改借用主 -export const updateMaster = async (data: MasterVO) => { - return await request.put({ url: `/heli/master/update`, data }) -} - -// 删除借用主 -export const deleteMaster = async (id: number) => { - return await request.delete({ url: `/heli/master/delete?id=` + id }) -} - -// 导出借用主 Excel -export const exportMaster = async (params) => { - return await request.download({ url: `/heli/master/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface MasterVO { + id: number + jyBm: string + jyYt: string + rem: string + jyMaster: string + jyUser: number + jyType: number + num: number + jyDate:Date +} + +// 查询借用主分页 +export const getMasterPage = async (params) => { + return await request.get({ url: `/heli/master/page`, params }) +} + +// 查询借用主详情 +export const getMaster = async (id: number) => { + return await request.get({ url: `/heli/master/get?id=` + id }) +} + +// 新增借用主 +export const createMaster = async (data: MasterVO) => { + return await request.post({ url: `/heli/master/create`, data }) +} + +// 修改借用主 +export const updateMaster = async (data: MasterVO) => { + return await request.put({ url: `/heli/master/update`, data }) +} + +// 删除借用主 +export const deleteMaster = async (id: number) => { + return await request.delete({ url: `/heli/master/delete?id=` + id }) +} + +// 导出借用主 Excel +export const exportMaster = async (params) => { + return await request.download({ url: `/heli/master/export-excel`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/components/Form/src/Form.vue b/mes-ui/mes-ui-admin-vue3/src/components/Form/src/Form.vue index 3acc10a..83ba8eb 100644 --- a/mes-ui/mes-ui-admin-vue3/src/components/Form/src/Form.vue +++ b/mes-ui/mes-ui-admin-vue3/src/components/Form/src/Form.vue @@ -35,7 +35,7 @@ export default defineComponent({ type: Array as PropType, default: () => [] }, - // 是否需要栅格布局 + // 需要栅格布局 // update by 芋艿：将 true 改成 false，因为项目更常用这种方式 isCol: propTypes.bool.def(false), // 表单数据对象 diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts index da1f712..8bce072 100644 --- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts +++ b/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',//代办级别 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 4b43bb8..9a043e8 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 @@ -43,7 +43,7 @@ - + @@ -54,8 +54,8 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_KEHUXIANZHUANG)" :key="dict.valu - - + + - + @@ -86,7 +86,7 @@ v-for="dicts in getIntDictOptions(DICT_TYPE.HELI_TOUBIAOJIEGUO)" :key="dicts.val - +