diff --git a/.gitignore b/.gitignore index 167f26a..4df96df 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ application-my.yaml /mes-ui-app/unpackage/ +/.trae/ diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/MachineController.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/MachineController.java index 1b45e1b..57d6530 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/MachineController.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/MachineController.java @@ -9,6 +9,7 @@ import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machine.vo.MachineR import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machine.vo.MachineSaveReqVO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.machine.MachineDO; import com.ningxia.yunxi.chemmes.module.biz.service.machine.MachineService; +import com.ningxia.yunxi.chemmes.module.biz.service.machineparamdetail.MachineParamDetailService; import com.ningxia.yunxi.chemmes.module.system.dal.dataobject.user.AdminUserDO; import com.ningxia.yunxi.chemmes.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.Operation; @@ -36,6 +37,9 @@ public class MachineController { @Resource private AdminUserService userService; + @Resource + private MachineParamDetailService machineParamDetailService; + @PostMapping("/create") @Operation(summary = "创建机台主数据") @PreAuthorize("@ss.hasPermission('biz:machine:create')") @@ -66,7 +70,8 @@ public class MachineController { @PreAuthorize("@ss.hasPermission('biz:machine:query')") public CommonResult getMachine(@RequestParam("id") Integer id) { MachineDO machine = machineService.getMachine(id); - return success(BeanUtils.toBean(machine, MachineRespVO.class)); + MachineRespVO respVO = BeanUtils.toBean(machine, MachineRespVO.class); + return success(respVO); } @GetMapping("/page") @@ -90,8 +95,9 @@ public class MachineController { @GetMapping("/dropdown") @Operation(summary = "获得机台下拉框") @PreAuthorize("@ss.hasPermission('biz:machine:query')") - public CommonResult> getMachineDropdown(@RequestParam(value = "keyWord", required = false, defaultValue = "") String keyWord) { - List dropdownList = machineService.getMachineDropdown(keyWord); + public CommonResult> getMachineDropdown(@RequestParam(value = "keyWord", required = false, defaultValue = "") String keyWord, + @RequestParam(value = "procId", required = false) Integer procId) { + List dropdownList = machineService.getMachineDropdown(keyWord, procId); return success(BeanUtils.toBean(dropdownList, MachineRespVO.class)); } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/vo/MachineRespVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/vo/MachineRespVO.java index 325a69e..a2067ba 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/vo/MachineRespVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/vo/MachineRespVO.java @@ -4,10 +4,12 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ningxia.yunxi.chemmes.framework.excel.core.annotations.DictFormat; import com.ningxia.yunxi.chemmes.framework.excel.core.convert.DictConvert; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparamdetail.vo.MachineParamDetailRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 机台主数据 Response VO") @Data @@ -51,4 +53,6 @@ public class MachineRespVO { @ExcelProperty("创建者") private String creator; + private List details; + } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/vo/MachineSaveReqVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/vo/MachineSaveReqVO.java index 1e85b83..f82e9ef 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/vo/MachineSaveReqVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machine/vo/MachineSaveReqVO.java @@ -1,34 +1,30 @@ -package com.ningxia.yunxi.chemmes.module.biz.controller.admin.machine.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; - -@Schema(description = "管理后台 - 机台主数据新增/修改 Request VO") -@Data -public class MachineSaveReqVO { - - @Schema(description = "自增字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "25786") - private Integer id; - - @Schema(description = "机台编码") - private String machineCd; - - @Schema(description = "机台名称", example = "芋艿") - private String machineName; - - @Schema(description = "状态(1启用 2 未启用)", example = "1") - private Integer enabledStatus; - - @Schema(description = "备注", example = "你说的对") - private String remark; - - @Schema(description = "所属产线id", example = "13776") - private Integer belgLineId; - - @Schema(description = "所属工序id", example = "1070") - private Integer belgProcId; - -} \ No newline at end of file +package com.ningxia.yunxi.chemmes.module.biz.controller.admin.machine.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 机台主数据新增/修改 Request VO") +@Data +public class MachineSaveReqVO { + + @Schema(description = "自增字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "25786") + private Integer id; + + @Schema(description = "机台编码") + private String machineCd; + + @Schema(description = "机台名称", example = "芋艿") + private String machineName; + + @Schema(description = "状态(1启用 2 未启用)", example = "1") + private Integer enabledStatus; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "所属产线id", example = "13776") + private Integer belgLineId; + + @Schema(description = "所属工序id", example = "1070") + private Integer belgProcId; +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/MachineParamController.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/MachineParamController.java index 8cdf7d9..071b728 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/MachineParamController.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/MachineParamController.java @@ -1,95 +1,102 @@ -package com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam; - -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.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; -import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; -import com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult; -import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; -import static com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult.success; - -import com.ningxia.yunxi.chemmes.framework.excel.core.util.ExcelUtils; - -import com.ningxia.yunxi.chemmes.framework.operatelog.core.annotations.OperateLog; -import static com.ningxia.yunxi.chemmes.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo.*; -import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.machineparam.MachineParamDO; -import com.ningxia.yunxi.chemmes.module.biz.service.machineparam.MachineParamService; - -@Tag(name = "管理后台 - 机台工艺参数配置") -@RestController -@RequestMapping("/biz/machine-param") -@Validated -public class MachineParamController { - - @Resource - private MachineParamService machineParamService; - - @PostMapping("/create") - @Operation(summary = "创建机台工艺参数配置") - @PreAuthorize("@ss.hasPermission('biz:machine-param:create')") - public CommonResult createMachineParam(@Valid @RequestBody MachineParamSaveReqVO createReqVO) { - return success(machineParamService.createMachineParam(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新机台工艺参数配置") - @PreAuthorize("@ss.hasPermission('biz:machine-param:update')") - public CommonResult updateMachineParam(@Valid @RequestBody MachineParamSaveReqVO updateReqVO) { - machineParamService.updateMachineParam(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除机台工艺参数配置") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('biz:machine-param:delete')") - public CommonResult deleteMachineParam(@RequestParam("id") Integer id) { - machineParamService.deleteMachineParam(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得机台工艺参数配置") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('biz:machine-param:query')") - public CommonResult getMachineParam(@RequestParam("id") Integer id) { - MachineParamDO machineParam = machineParamService.getMachineParam(id); - return success(BeanUtils.toBean(machineParam, MachineParamRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得机台工艺参数配置分页") - @PreAuthorize("@ss.hasPermission('biz:machine-param:query')") - public CommonResult> getMachineParamPage(@Valid MachineParamPageReqVO pageReqVO) { - PageResult pageResult = machineParamService.getMachineParamPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MachineParamRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出机台工艺参数配置 Excel") - @PreAuthorize("@ss.hasPermission('biz:machine-param:export')") - @OperateLog(type = EXPORT) - public void exportMachineParamExcel(@Valid MachineParamPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = machineParamService.getMachineParamPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "机台工艺参数配置.xls", "数据", MachineParamRespVO.class, - BeanUtils.toBean(list, MachineParamRespVO.class)); - } - -} \ No newline at end of file +package com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam; + +import com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult; +import com.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; +import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; +import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; +import com.ningxia.yunxi.chemmes.framework.excel.core.util.ExcelUtils; +import com.ningxia.yunxi.chemmes.framework.operatelog.core.annotations.OperateLog; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo.MachineParamPageReqVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo.MachineParamRespVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo.MachineParamSaveReqVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparamdetail.vo.MachineParamDetailRespVO; +import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.machineparam.MachineParamDO; +import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.machineparamdetail.MachineParamDetailDO; +import com.ningxia.yunxi.chemmes.module.biz.service.machineparam.MachineParamService; +import com.ningxia.yunxi.chemmes.module.biz.service.machineparamdetail.MachineParamDetailService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult.success; +import static com.ningxia.yunxi.chemmes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; + +@Tag(name = "管理后台 - 机台工艺参数配置") +@RestController +@RequestMapping("/biz/machine-param") +@Validated +public class MachineParamController { + + @Resource + private MachineParamService machineParamService; + + @Resource + private MachineParamDetailService machineParamDetailService; + + @PostMapping("/create") + @Operation(summary = "创建机台工艺参数配置") + @PreAuthorize("@ss.hasPermission('biz:machine-param:create')") + public CommonResult createMachineParam(@Valid @RequestBody MachineParamSaveReqVO createReqVO) { + return success(machineParamService.createMachineParam(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新机台工艺参数配置") + @PreAuthorize("@ss.hasPermission('biz:machine-param:update')") + public CommonResult updateMachineParam(@Valid @RequestBody MachineParamSaveReqVO updateReqVO) { + machineParamService.updateMachineParam(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除机台工艺参数配置") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('biz:machine-param:delete')") + public CommonResult deleteMachineParam(@RequestParam("id") Integer id) { + machineParamService.deleteMachineParam(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得机台工艺参数配置") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('biz:machine-param:query')") + public CommonResult getMachineParam(@RequestParam("id") Integer id) { + MachineParamDO machineParam = machineParamService.getMachineParam(id); + MachineParamRespVO respVO = BeanUtils.toBean(machineParam, MachineParamRespVO.class); + List detailList = machineParamDetailService.getListByMachineParamId(machineParam.getId()); + respVO.setDetails(BeanUtils.toBean(detailList, MachineParamDetailRespVO.class)); + return success(respVO); + } + + @GetMapping("/page") + @Operation(summary = "获得机台工艺参数配置分页") + @PreAuthorize("@ss.hasPermission('biz:machine-param:query')") + public CommonResult> getMachineParamPage(@Valid MachineParamPageReqVO pageReqVO) { + PageResult pageResult = machineParamService.getMachineParamPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MachineParamRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出机台工艺参数配置 Excel") + @PreAuthorize("@ss.hasPermission('biz:machine-param:export')") + @OperateLog(type = EXPORT) + public void exportMachineParamExcel(@Valid MachineParamPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = machineParamService.getMachineParamPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "机台工艺参数配置.xls", "数据", MachineParamRespVO.class, + BeanUtils.toBean(list, MachineParamRespVO.class)); + } + +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/vo/MachineParamRespVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/vo/MachineParamRespVO.java index e8026b4..f5978d9 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/vo/MachineParamRespVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/vo/MachineParamRespVO.java @@ -1,14 +1,15 @@ package com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import com.ningxia.yunxi.chemmes.framework.excel.core.annotations.DictFormat; import com.ningxia.yunxi.chemmes.framework.excel.core.convert.DictConvert; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparamdetail.vo.MachineParamDetailRespVO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 机台工艺参数配置 Response VO") @Data @@ -72,4 +73,7 @@ public class MachineParamRespVO { @ExcelProperty("机台id") private Integer machineId; -} \ No newline at end of file + @Schema(description = "工艺参数明细列表") + private List details; + +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/vo/MachineParamSaveReqVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/vo/MachineParamSaveReqVO.java index c667f2a..d04b2eb 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/vo/MachineParamSaveReqVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparam/vo/MachineParamSaveReqVO.java @@ -1,52 +1,54 @@ -package com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; - -@Schema(description = "管理后台 - 机台工艺参数配置新增/修改 Request VO") -@Data -public class MachineParamSaveReqVO { - - @Schema(description = "自增字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "1633") - private Integer id; - - @Schema(description = "工序编码") - private String procCd; - - @Schema(description = "状态(1启用 2 未启用)", example = "2") - private Integer enabledStatus; - - @Schema(description = "备注", example = "随便") - private String remark; - - @Schema(description = "工序id", example = "30365") - private Integer procId; - - @Schema(description = "工序名称", example = "张三") - private String procName; - - @Schema(description = "物料编码") - private String matCode; - - @Schema(description = "物料名称", example = "李四") - private String matName; - - @Schema(description = "物料id", example = "3461") - private Integer mateId; - - @Schema(description = "规格型号") - private String spec; - - @Schema(description = "机台编码") - private String machineCd; - - @Schema(description = "机台名称", example = "李四") - private String machineName; - - @Schema(description = "机台id", example = "10661") - private Integer machineId; - -} \ No newline at end of file +package com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo; + +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparamdetail.vo.MachineParamDetailSaveReqVO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Schema(description = "管理后台 - 机台工艺参数配置新增/修改 Request VO") +@Data +public class MachineParamSaveReqVO { + + @Schema(description = "自增字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "1633") + private Integer id; + + @Schema(description = "工序编码") + private String procCd; + + @Schema(description = "状态(1启用 2 未启用)", example = "2") + private Integer enabledStatus; + + @Schema(description = "备注", example = "随便") + private String remark; + + @Schema(description = "工序id", example = "30365") + private Integer procId; + + @Schema(description = "工序名称", example = "张三") + private String procName; + + @Schema(description = "物料编码") + private String matCode; + + @Schema(description = "物料名称", example = "李四") + private String matName; + + @Schema(description = "物料id", example = "3461") + private Integer mateId; + + @Schema(description = "规格型号") + private String spec; + + @Schema(description = "机台编码") + private String machineCd; + + @Schema(description = "机台名称", example = "李四") + private String machineName; + + @Schema(description = "机台id", example = "10661") + private Integer machineId; + + private List details; + +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparamdetail/vo/MachineParamDetailSaveReqVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparamdetail/vo/MachineParamDetailSaveReqVO.java index 41eeae5..a122eaf 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparamdetail/vo/MachineParamDetailSaveReqVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/machineparamdetail/vo/MachineParamDetailSaveReqVO.java @@ -1,32 +1,24 @@ package com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparamdetail.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; +import lombok.Data; + import java.math.BigDecimal; @Schema(description = "管理后台 - 机台工艺参数配置子新增/修改 Request VO") @Data public class MachineParamDetailSaveReqVO { - @Schema(description = "自增字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "23169") - private Integer id; - - @Schema(description = "状态(1启用 2 未启用)", example = "1") - private Integer enabledStatus; - @Schema(description = "备注", example = "你猜") private String remark; - @Schema(description = "参数名称", example = "李四") + @Schema(description = "参数名称") private String procParamName; @Schema(description = "参数单位") private String procParamUnit; - @Schema(description = "参数id", example = "16112") + @Schema(description = "参数id") private Integer procParamId; @Schema(description = "标准值") @@ -43,8 +35,4 @@ public class MachineParamDetailSaveReqVO { @Schema(description = "是否预警(0 是 1否)") private String isAlert; - - @Schema(description = "主表id", example = "23736") - private Integer machineParamId; - } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/material/MaterialController.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/material/MaterialController.java index 0d66e4f..975d3d3 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/material/MaterialController.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/material/MaterialController.java @@ -1,95 +1,100 @@ -package com.ningxia.yunxi.chemmes.module.biz.controller.admin.material; - -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.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; -import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; -import com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult; -import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; -import static com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult.success; - -import com.ningxia.yunxi.chemmes.framework.excel.core.util.ExcelUtils; - -import com.ningxia.yunxi.chemmes.framework.operatelog.core.annotations.OperateLog; -import static com.ningxia.yunxi.chemmes.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.*; -import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.material.MaterialDO; -import com.ningxia.yunxi.chemmes.module.biz.service.material.MaterialService; - -@Tag(name = "管理后台 - 物料主数据") -@RestController -@RequestMapping("/biz/material") -@Validated -public class MaterialController { - - @Resource - private MaterialService materialService; - - @PostMapping("/create") - @Operation(summary = "创建物料主数据") - @PreAuthorize("@ss.hasPermission('biz:material:create')") - public CommonResult createMaterial(@Valid @RequestBody MaterialSaveReqVO createReqVO) { - return success(materialService.createMaterial(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新物料主数据") - @PreAuthorize("@ss.hasPermission('biz:material:update')") - public CommonResult updateMaterial(@Valid @RequestBody MaterialSaveReqVO updateReqVO) { - materialService.updateMaterial(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除物料主数据") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('biz:material:delete')") - public CommonResult deleteMaterial(@RequestParam("id") Integer id) { - materialService.deleteMaterial(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得物料主数据") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('biz:material:query')") - public CommonResult getMaterial(@RequestParam("id") Integer id) { - MaterialDO material = materialService.getMaterial(id); - return success(BeanUtils.toBean(material, MaterialRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得物料主数据分页") - @PreAuthorize("@ss.hasPermission('biz:material:query')") - public CommonResult> getMaterialPage(@Valid MaterialPageReqVO pageReqVO) { - PageResult pageResult = materialService.getMaterialPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出物料主数据 Excel") - @PreAuthorize("@ss.hasPermission('biz:material:export')") - @OperateLog(type = EXPORT) - public void exportMaterialExcel(@Valid MaterialPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialService.getMaterialPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "物料主数据.xls", "数据", MaterialRespVO.class, - BeanUtils.toBean(list, MaterialRespVO.class)); - } - -} \ No newline at end of file +package com.ningxia.yunxi.chemmes.module.biz.controller.admin.material; + +import com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult; +import com.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; +import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; +import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; +import com.ningxia.yunxi.chemmes.framework.excel.core.util.ExcelUtils; +import com.ningxia.yunxi.chemmes.framework.operatelog.core.annotations.OperateLog; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.MaterialPageReqVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.MaterialRespVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.MaterialSaveReqVO; +import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.material.MaterialDO; +import com.ningxia.yunxi.chemmes.module.biz.service.material.MaterialService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult.success; +import static com.ningxia.yunxi.chemmes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; + +@Tag(name = "管理后台 - 物料主数据") +@RestController +@RequestMapping("/biz/material") +@Validated +public class MaterialController { + + @Resource + private MaterialService materialService; + + @PostMapping("/create") + @Operation(summary = "创建物料主数据") + @PreAuthorize("@ss.hasPermission('biz:material:create')") + public CommonResult createMaterial(@Valid @RequestBody MaterialSaveReqVO createReqVO) { + return success(materialService.createMaterial(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新物料主数据") + @PreAuthorize("@ss.hasPermission('biz:material:update')") + public CommonResult updateMaterial(@Valid @RequestBody MaterialSaveReqVO updateReqVO) { + materialService.updateMaterial(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除物料主数据") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('biz:material:delete')") + public CommonResult deleteMaterial(@RequestParam("id") Integer id) { + materialService.deleteMaterial(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得物料主数据") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('biz:material:query')") + public CommonResult getMaterial(@RequestParam("id") Integer id) { + MaterialDO material = materialService.getMaterial(id); + return success(BeanUtils.toBean(material, MaterialRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得物料主数据分页") + @PreAuthorize("@ss.hasPermission('biz:material:query')") + public CommonResult> getMaterialPage(@Valid MaterialPageReqVO pageReqVO) { + PageResult pageResult = materialService.getMaterialPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaterialRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出物料主数据 Excel") + @PreAuthorize("@ss.hasPermission('biz:material:export')") + @OperateLog(type = EXPORT) + public void exportMaterialExcel(@Valid MaterialPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = materialService.getMaterialPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "物料主数据.xls", "数据", MaterialRespVO.class, + BeanUtils.toBean(list, MaterialRespVO.class)); + } + // 物料下拉框 + @GetMapping("/dropdown") + @Operation(summary = "获得物料主数据下拉框") + @PreAuthorize("@ss.hasPermission('biz:material:query')") + public CommonResult> getMaterialDropdown(@RequestParam(value = "keyWord", required = false, defaultValue = "") String keyWord) { + return success(BeanUtils.toBean(materialService.getMaterialDropdown(keyWord), MaterialRespVO.class)); + } + +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/procparam/ProcParamController.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/procparam/ProcParamController.java index 40b7a0d..38273f5 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/procparam/ProcParamController.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/procparam/ProcParamController.java @@ -1,95 +1,101 @@ -package com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam; - -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.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; -import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; -import com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult; -import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; -import static com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult.success; - -import com.ningxia.yunxi.chemmes.framework.excel.core.util.ExcelUtils; - -import com.ningxia.yunxi.chemmes.framework.operatelog.core.annotations.OperateLog; -import static com.ningxia.yunxi.chemmes.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.*; -import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.procparam.ProcParamDO; -import com.ningxia.yunxi.chemmes.module.biz.service.procparam.ProcParamService; - -@Tag(name = "管理后台 - 工序工艺参数配置") -@RestController -@RequestMapping("/biz/proc-param") -@Validated -public class ProcParamController { - - @Resource - private ProcParamService procParamService; - - @PostMapping("/create") - @Operation(summary = "创建工序工艺参数配置") - @PreAuthorize("@ss.hasPermission('biz:proc-param:create')") - public CommonResult createProcParam(@Valid @RequestBody ProcParamSaveReqVO createReqVO) { - return success(procParamService.createProcParam(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新工序工艺参数配置") - @PreAuthorize("@ss.hasPermission('biz:proc-param:update')") - public CommonResult updateProcParam(@Valid @RequestBody ProcParamSaveReqVO updateReqVO) { - procParamService.updateProcParam(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除工序工艺参数配置") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('biz:proc-param:delete')") - public CommonResult deleteProcParam(@RequestParam("id") Integer id) { - procParamService.deleteProcParam(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得工序工艺参数配置") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('biz:proc-param:query')") - public CommonResult getProcParam(@RequestParam("id") Integer id) { - ProcParamDO procParam = procParamService.getProcParam(id); - return success(BeanUtils.toBean(procParam, ProcParamRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得工序工艺参数配置分页") - @PreAuthorize("@ss.hasPermission('biz:proc-param:query')") - public CommonResult> getProcParamPage(@Valid ProcParamPageReqVO pageReqVO) { - PageResult pageResult = procParamService.getProcParamPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ProcParamRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出工序工艺参数配置 Excel") - @PreAuthorize("@ss.hasPermission('biz:proc-param:export')") - @OperateLog(type = EXPORT) - public void exportProcParamExcel(@Valid ProcParamPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = procParamService.getProcParamPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "工序工艺参数配置.xls", "数据", ProcParamRespVO.class, - BeanUtils.toBean(list, ProcParamRespVO.class)); - } - -} \ No newline at end of file +package com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam; + +import com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult; +import com.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; +import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; +import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; +import com.ningxia.yunxi.chemmes.framework.excel.core.util.ExcelUtils; +import com.ningxia.yunxi.chemmes.framework.operatelog.core.annotations.OperateLog; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.ProcParamPageReqVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.ProcParamRespVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.ProcParamSaveReqVO; +import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.procparam.ProcParamDO; +import com.ningxia.yunxi.chemmes.module.biz.service.procparam.ProcParamService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult.success; +import static com.ningxia.yunxi.chemmes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; + +@Tag(name = "管理后台 - 工序工艺参数配置") +@RestController +@RequestMapping("/biz/proc-param") +@Validated +public class ProcParamController { + + @Resource + private ProcParamService procParamService; + + @PostMapping("/create") + @Operation(summary = "创建工序工艺参数配置") + @PreAuthorize("@ss.hasPermission('biz:proc-param:create')") + public CommonResult createProcParam(@Valid @RequestBody ProcParamSaveReqVO createReqVO) { + return success(procParamService.createProcParam(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新工序工艺参数配置") + @PreAuthorize("@ss.hasPermission('biz:proc-param:update')") + public CommonResult updateProcParam(@Valid @RequestBody ProcParamSaveReqVO updateReqVO) { + procParamService.updateProcParam(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除工序工艺参数配置") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('biz:proc-param:delete')") + public CommonResult deleteProcParam(@RequestParam("id") Integer id) { + procParamService.deleteProcParam(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得工序工艺参数配置") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('biz:proc-param:query')") + public CommonResult getProcParam(@RequestParam("id") Integer id) { + ProcParamDO procParam = procParamService.getProcParam(id); + return success(BeanUtils.toBean(procParam, ProcParamRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得工序工艺参数配置分页") + @PreAuthorize("@ss.hasPermission('biz:proc-param:query')") + public CommonResult> getProcParamPage(@Valid ProcParamPageReqVO pageReqVO) { + PageResult pageResult = procParamService.getProcParamPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ProcParamRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出工序工艺参数配置 Excel") + @PreAuthorize("@ss.hasPermission('biz:proc-param:export')") + @OperateLog(type = EXPORT) + public void exportProcParamExcel(@Valid ProcParamPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = procParamService.getProcParamPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "工序工艺参数配置.xls", "数据", ProcParamRespVO.class, + BeanUtils.toBean(list, ProcParamRespVO.class)); + } + + // 下拉框 + @GetMapping("/dropdown") + @PreAuthorize("@ss.hasPermission('biz:proc-param:query')") + public CommonResult> getProcParamDropdown(@RequestParam(value = "keyWord", required = false, defaultValue = "") String keyWord, + @RequestParam(value = "procId", required = false, defaultValue = "") Integer procId) { + return success(BeanUtils.toBean(procParamService.getProcParamDropdown(keyWord, procId), ProcParamRespVO.class)); + } + +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/machine/MachineMapper.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/machine/MachineMapper.java index e10dcaf..c0d044d 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/machine/MachineMapper.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/machine/MachineMapper.java @@ -5,6 +5,7 @@ import com.ningxia.yunxi.chemmes.framework.mybatis.core.mapper.BaseMapperX; import com.ningxia.yunxi.chemmes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machine.vo.MachinePageReqVO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.machine.MachineDO; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -32,10 +33,12 @@ public interface MachineMapper extends BaseMapperX { .eqIfPresent(MachineDO::getMachineCd, code)); } - default List seleLectListByKeyWord(String keyWord) { + default List seleLectListByKeyWord(String keyWord, Integer procId) { return selectList(new LambdaQueryWrapperX() - .like(MachineDO::getMachineName, keyWord) - .or() - .like(MachineDO::getMachineCd, keyWord)); + .eqIfPresent(MachineDO::getBelgProcId, procId) + .and(StringUtils.isNotBlank(keyWord), wrapper -> wrapper + .like(MachineDO::getMachineName, keyWord) + .or() + .like(MachineDO::getMachineCd, keyWord))); } } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/machineparamdetail/MachineParamDetailMapper.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/machineparamdetail/MachineParamDetailMapper.java index 60838c1..c03a6fe 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/machineparamdetail/MachineParamDetailMapper.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/machineparamdetail/MachineParamDetailMapper.java @@ -1,5 +1,6 @@ package com.ningxia.yunxi.chemmes.module.biz.dal.mysql.machineparamdetail; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; import com.ningxia.yunxi.chemmes.framework.mybatis.core.mapper.BaseMapperX; import com.ningxia.yunxi.chemmes.framework.mybatis.core.query.LambdaQueryWrapperX; @@ -7,6 +8,8 @@ import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparamdetail. import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.machineparamdetail.MachineParamDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 机台工艺参数配置子 Mapper * @@ -32,4 +35,15 @@ public interface MachineParamDetailMapper extends BaseMapperX() + .eq(MachineParamDetailDO::getMachineParamId, machineParamId)); + } + + default List selectListByMachineParamId(Integer machineParamId) { + return selectList(new LambdaQueryWrapperX() + .eq(MachineParamDetailDO::getMachineParamId, machineParamId) + .orderByAsc(MachineParamDetailDO::getId)); + } + } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/material/MaterialMapper.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/material/MaterialMapper.java index 1d14110..f0e39d6 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/material/MaterialMapper.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/material/MaterialMapper.java @@ -7,6 +7,8 @@ import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.Materia import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.material.MaterialDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 物料主数据 Mapper * @@ -24,4 +26,15 @@ public interface MaterialMapper extends BaseMapperX { .orderByDesc(MaterialDO::getId)); } + default List selectMaterialDropdown(String keyWord) { + return selectList(new LambdaQueryWrapperX() + .eq(MaterialDO::getEnabledStatus, 0) + .and( + wrapper -> wrapper + .like(MaterialDO::getMatCode, keyWord) + .or() + .like(MaterialDO::getMatName, keyWord) + ) + ); + } } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/procparam/ProcParamMapper.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/procparam/ProcParamMapper.java index 3583b18..738311f 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/procparam/ProcParamMapper.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/procparam/ProcParamMapper.java @@ -1,13 +1,14 @@ package com.ningxia.yunxi.chemmes.module.biz.dal.mysql.procparam; -import java.util.*; - import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; -import com.ningxia.yunxi.chemmes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.ningxia.yunxi.chemmes.framework.mybatis.core.mapper.BaseMapperX; +import com.ningxia.yunxi.chemmes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.ProcParamPageReqVO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.procparam.ProcParamDO; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Mapper; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.*; + +import java.util.List; /** * 工序工艺参数配置 Mapper @@ -25,4 +26,14 @@ public interface ProcParamMapper extends BaseMapperX { .orderByDesc(ProcParamDO::getId)); } -} \ No newline at end of file + default List selectList(String keyWord, Integer procId) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProcParamDO::getEnabledStatus, 0) + .eqIfPresent(ProcParamDO::getProcId, procId) + .and(StringUtils.isNotBlank(keyWord), wrapper -> wrapper + .like(ProcParamDO::getProcName, keyWord) + .or() + .like(ProcParamDO::getProcCd, keyWord)) + ); + } +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machine/MachineService.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machine/MachineService.java index f56f734..fd59d81 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machine/MachineService.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machine/MachineService.java @@ -53,5 +53,5 @@ public interface MachineService { */ PageResult getMachinePage(MachinePageReqVO pageReqVO); - List getMachineDropdown(String keyWord); + List getMachineDropdown(String keyWord, Integer procId); } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machine/MachineServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machine/MachineServiceImpl.java index 50d9151..d88951d 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machine/MachineServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machine/MachineServiceImpl.java @@ -28,12 +28,9 @@ public class MachineServiceImpl implements MachineService { @Override public Integer createMachine(MachineSaveReqVO createReqVO) { - // 校验存在 validateMachineUnique(createReqVO); - // 插入 MachineDO machine = BeanUtils.toBean(createReqVO, MachineDO.class); machineMapper.insert(machine); - // 返回 return machine.getId(); } @@ -82,7 +79,7 @@ public class MachineServiceImpl implements MachineService { } @Override - public List getMachineDropdown(String keyWord) { - return machineMapper.seleLectListByKeyWord(keyWord); + public List getMachineDropdown(String keyWord, Integer procId) { + return machineMapper.seleLectListByKeyWord(keyWord,procId); } } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparam/MachineParamServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparam/MachineParamServiceImpl.java index 6d1edbf..d2fc212 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparam/MachineParamServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparam/MachineParamServiceImpl.java @@ -6,7 +6,9 @@ import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo.Mac import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparam.vo.MachineParamSaveReqVO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.machineparam.MachineParamDO; import com.ningxia.yunxi.chemmes.module.biz.dal.mysql.machineparam.MachineParamMapper; +import com.ningxia.yunxi.chemmes.module.biz.service.machineparamdetail.MachineParamDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; @@ -23,11 +25,17 @@ public class MachineParamServiceImpl implements MachineParamService { @Resource private MachineParamMapper machineParamMapper; + @Resource + private MachineParamDetailService machineParamDetailService; + @Override + @Transactional(rollbackFor = Exception.class) public Integer createMachineParam(MachineParamSaveReqVO createReqVO) { // 插入 MachineParamDO machineParam = BeanUtils.toBean(createReqVO, MachineParamDO.class); machineParamMapper.insert(machineParam); + machineParamDetailService.saveMachineParamDetails(machineParam.getId(), createReqVO.getDetails()); + // 返回 return machineParam.getId(); } @@ -39,6 +47,7 @@ public class MachineParamServiceImpl implements MachineParamService { // 更新 MachineParamDO updateObj = BeanUtils.toBean(updateReqVO, MachineParamDO.class); machineParamMapper.updateById(updateObj); + machineParamDetailService.saveMachineParamDetails(updateObj.getId(), updateReqVO.getDetails()); } @Override diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparamdetail/MachineParamDetailService.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparamdetail/MachineParamDetailService.java index 1477416..706ce01 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparamdetail/MachineParamDetailService.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparamdetail/MachineParamDetailService.java @@ -6,6 +6,7 @@ import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparamdetail. import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.machineparamdetail.MachineParamDetailDO; import javax.validation.Valid; +import java.util.List; /** * 机台工艺参数配置子 Service 接口 @@ -52,4 +53,7 @@ public interface MachineParamDetailService { */ PageResult getMachineParamDetailPage(MachineParamDetailPageReqVO pageReqVO); + void saveMachineParamDetails(Integer id, List details); + + List getListByMachineParamId(Integer id); } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparamdetail/MachineParamDetailServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparamdetail/MachineParamDetailServiceImpl.java index e8b899a..3511898 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparamdetail/MachineParamDetailServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/machineparamdetail/MachineParamDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.ningxia.yunxi.chemmes.module.biz.service.machineparamdetail; +import cn.hutool.core.util.ObjectUtil; import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; import com.ningxia.yunxi.chemmes.module.biz.controller.admin.machineparamdetail.vo.MachineParamDetailPageReqVO; @@ -10,6 +11,8 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; /** * 机台工艺参数配置子 Service 实现类 @@ -34,8 +37,6 @@ public class MachineParamDetailServiceImpl implements MachineParamDetailService @Override public void updateMachineParamDetail(MachineParamDetailSaveReqVO updateReqVO) { - // 校验存在 - validateMachineParamDetailExists(updateReqVO.getId()); // 更新 MachineParamDetailDO updateObj = BeanUtils.toBean(updateReqVO, MachineParamDetailDO.class); machineParamDetailMapper.updateById(updateObj); @@ -43,17 +44,10 @@ public class MachineParamDetailServiceImpl implements MachineParamDetailService @Override public void deleteMachineParamDetail(Integer id) { - // 校验存在 - validateMachineParamDetailExists(id); // 删除 machineParamDetailMapper.deleteById(id); } - private void validateMachineParamDetailExists(Integer id) { - if (machineParamDetailMapper.selectById(id) == null) { -// throw exception(MACHINE_PARAM_DETAIL_NOT_EXISTS); - } - } @Override public MachineParamDetailDO getMachineParamDetail(Integer id) { @@ -65,4 +59,27 @@ public class MachineParamDetailServiceImpl implements MachineParamDetailService return machineParamDetailMapper.selectPage(pageReqVO); } + @Override + public void saveMachineParamDetails(Integer machineParamId, List detailList) { + if (ObjectUtil.isEmpty(detailList)) { + return; + } + machineParamDetailMapper.deleteByMachineParamId(machineParamId); + List detailEntities = detailList.stream() + .map(detail -> { + MachineParamDetailDO detailEntity = BeanUtils.toBean(detail, MachineParamDetailDO.class); + detailEntity.setMachineParamId(machineParamId); + detailEntity.setEnabledStatus(0); + return detailEntity; + }) + .collect(Collectors.toList()); + + machineParamDetailMapper.insertBatch(detailEntities); + } + + @Override + public List getListByMachineParamId(Integer machineParamId) { + return machineParamDetailMapper.selectListByMachineParamId(machineParamId); + } } + diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/material/MaterialService.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/material/MaterialService.java index 795bd6c..24e5035 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/material/MaterialService.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/material/MaterialService.java @@ -1,55 +1,57 @@ -package com.ningxia.yunxi.chemmes.module.biz.service.material; - -import java.util.*; -import javax.validation.*; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.*; -import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.material.MaterialDO; -import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; -import com.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; - -/** - * 物料主数据 Service 接口 - * - * @author 管理员 - */ -public interface MaterialService { - - /** - * 创建物料主数据 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Integer createMaterial(@Valid MaterialSaveReqVO createReqVO); - - /** - * 更新物料主数据 - * - * @param updateReqVO 更新信息 - */ - void updateMaterial(@Valid MaterialSaveReqVO updateReqVO); - - /** - * 删除物料主数据 - * - * @param id 编号 - */ - void deleteMaterial(Integer id); - - /** - * 获得物料主数据 - * - * @param id 编号 - * @return 物料主数据 - */ - MaterialDO getMaterial(Integer id); - - /** - * 获得物料主数据分页 - * - * @param pageReqVO 分页查询 - * @return 物料主数据分页 - */ - PageResult getMaterialPage(MaterialPageReqVO pageReqVO); - -} \ No newline at end of file +package com.ningxia.yunxi.chemmes.module.biz.service.material; + +import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.MaterialPageReqVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.MaterialSaveReqVO; +import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.material.MaterialDO; + +import javax.validation.Valid; +import java.util.List; + +/** + * 物料主数据 Service 接口 + * + * @author 管理员 + */ +public interface MaterialService { + + /** + * 创建物料主数据 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Integer createMaterial(@Valid MaterialSaveReqVO createReqVO); + + /** + * 更新物料主数据 + * + * @param updateReqVO 更新信息 + */ + void updateMaterial(@Valid MaterialSaveReqVO updateReqVO); + + /** + * 删除物料主数据 + * + * @param id 编号 + */ + void deleteMaterial(Integer id); + + /** + * 获得物料主数据 + * + * @param id 编号 + * @return 物料主数据 + */ + MaterialDO getMaterial(Integer id); + + /** + * 获得物料主数据分页 + * + * @param pageReqVO 分页查询 + * @return 物料主数据分页 + */ + PageResult getMaterialPage(MaterialPageReqVO pageReqVO); + + List getMaterialDropdown(String keyWord); +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/material/MaterialServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/material/MaterialServiceImpl.java index 2af09fe..c338ccd 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/material/MaterialServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/material/MaterialServiceImpl.java @@ -3,6 +3,7 @@ package com.ningxia.yunxi.chemmes.module.biz.service.material; import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.MaterialPageReqVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.MaterialRespVO; import com.ningxia.yunxi.chemmes.module.biz.controller.admin.material.vo.MaterialSaveReqVO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.material.MaterialDO; import com.ningxia.yunxi.chemmes.module.biz.dal.mysql.material.MaterialMapper; @@ -10,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.List; /** * 物料主数据 Service 实现类 @@ -65,4 +67,8 @@ public class MaterialServiceImpl implements MaterialService { return materialMapper.selectPage(pageReqVO); } + @Override + public List getMaterialDropdown(String keyWord) { + return materialMapper.selectMaterialDropdown(keyWord); + } } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/procparam/ProcParamService.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/procparam/ProcParamService.java index f44d7b7..4710249 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/procparam/ProcParamService.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/procparam/ProcParamService.java @@ -1,55 +1,57 @@ -package com.ningxia.yunxi.chemmes.module.biz.service.procparam; - -import java.util.*; -import javax.validation.*; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.*; -import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.procparam.ProcParamDO; -import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; -import com.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; - -/** - * 工序工艺参数配置 Service 接口 - * - * @author 管理员 - */ -public interface ProcParamService { - - /** - * 创建工序工艺参数配置 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Integer createProcParam(@Valid ProcParamSaveReqVO createReqVO); - - /** - * 更新工序工艺参数配置 - * - * @param updateReqVO 更新信息 - */ - void updateProcParam(@Valid ProcParamSaveReqVO updateReqVO); - - /** - * 删除工序工艺参数配置 - * - * @param id 编号 - */ - void deleteProcParam(Integer id); - - /** - * 获得工序工艺参数配置 - * - * @param id 编号 - * @return 工序工艺参数配置 - */ - ProcParamDO getProcParam(Integer id); - - /** - * 获得工序工艺参数配置分页 - * - * @param pageReqVO 分页查询 - * @return 工序工艺参数配置分页 - */ - PageResult getProcParamPage(ProcParamPageReqVO pageReqVO); - -} \ No newline at end of file +package com.ningxia.yunxi.chemmes.module.biz.service.procparam; + +import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.ProcParamPageReqVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.procparam.vo.ProcParamSaveReqVO; +import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.procparam.ProcParamDO; + +import javax.validation.Valid; +import java.util.List; + +/** + * 工序工艺参数配置 Service 接口 + * + * @author 管理员 + */ +public interface ProcParamService { + + /** + * 创建工序工艺参数配置 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Integer createProcParam(@Valid ProcParamSaveReqVO createReqVO); + + /** + * 更新工序工艺参数配置 + * + * @param updateReqVO 更新信息 + */ + void updateProcParam(@Valid ProcParamSaveReqVO updateReqVO); + + /** + * 删除工序工艺参数配置 + * + * @param id 编号 + */ + void deleteProcParam(Integer id); + + /** + * 获得工序工艺参数配置 + * + * @param id 编号 + * @return 工序工艺参数配置 + */ + ProcParamDO getProcParam(Integer id); + + /** + * 获得工序工艺参数配置分页 + * + * @param pageReqVO 分页查询 + * @return 工序工艺参数配置分页 + */ + PageResult getProcParamPage(ProcParamPageReqVO pageReqVO); + + List getProcParamDropdown(String keyWord, Integer procId); +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/procparam/ProcParamServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/procparam/ProcParamServiceImpl.java index 3c1ce4b..be19b35 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/procparam/ProcParamServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/procparam/ProcParamServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.List; /** * 工序工艺参数配置 Service 实现类 @@ -65,4 +66,8 @@ public class ProcParamServiceImpl implements ProcParamService { return procParamMapper.selectPage(pageReqVO); } + @Override + public List getProcParamDropdown(String keyWord, Integer procId) { + return procParamMapper.selectList(keyWord, procId); + } } diff --git a/mes-ui/mes-ui-admin-vue3/src/api/biz/material/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/biz/material/index.ts index 4fec88a..420a5ae 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/biz/material/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/biz/material/index.ts @@ -1,46 +1,51 @@ -import request from '@/config/axios' - -export interface MaterialVO { - id: number - remark: string - matCode: string - matName: string - parentId: number - matType: string - enabledStatus: number - unit: string - brand: string - spec: string - safeStock: number - schemeId: number -} - -// 查询物料主数据分页 -export const getMaterialPage = async (params) => { - return await request.get({ url: `/biz/material/page`, params }) -} - -// 查询物料主数据详情 -export const getMaterial = async (id: number) => { - return await request.get({ url: `/biz/material/get?id=` + id }) -} - -// 新增物料主数据 -export const createMaterial = async (data: MaterialVO) => { - return await request.post({ url: `/biz/material/create`, data }) -} - -// 修改物料主数据 -export const updateMaterial = async (data: MaterialVO) => { - return await request.put({ url: `/biz/material/update`, data }) -} - -// 删除物料主数据 -export const deleteMaterial = async (id: number) => { - return await request.delete({ url: `/biz/material/delete?id=` + id }) -} - -// 导出物料主数据 Excel -export const exportMaterial = async (params) => { - return await request.download({ url: `/biz/material/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface MaterialVO { + id: number + remark: string + matCode: string + matName: string + parentId: number + matType: string + enabledStatus: number + unit: string + brand: string + spec: string + safeStock: number + schemeId: number +} + +// 查询物料主数据分页 +export const getMaterialPage = async (params) => { + return await request.get({ url: `/biz/material/page`, params }) +} + +// 查询物料主数据详情 +export const getMaterial = async (id: number) => { + return await request.get({ url: `/biz/material/get?id=` + id }) +} + +// 新增物料主数据 +export const createMaterial = async (data: MaterialVO) => { + return await request.post({ url: `/biz/material/create`, data }) +} + +// 修改物料主数据 +export const updateMaterial = async (data: MaterialVO) => { + return await request.put({ url: `/biz/material/update`, data }) +} + +// 删除物料主数据 +export const deleteMaterial = async (id: number) => { + return await request.delete({ url: `/biz/material/delete?id=` + id }) +} + +// 导出物料主数据 Excel +export const exportMaterial = async (params) => { + return await request.download({ url: `/biz/material/export-excel`, params }) +} + +// 获取物料下拉列表 +export const getMaterialDropdown = async (params) => { + return await request.get({ url: `/biz/material/dropdown`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/biz/procparam/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/biz/procparam/index.ts index 1c1096b..20be292 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/biz/procparam/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/biz/procparam/index.ts @@ -40,4 +40,9 @@ export const deleteProcParam = async (id: number) => { // 导出工序工艺参数配置 Excel export const exportProcParam = async (params) => { return await request.download({ url: `/biz/proc-param/export-excel`, params }) +} + +// 获取工序工艺参数下拉列表 +export const getProcParamDropdown = async (params) => { + return await request.get({ url: `/biz/proc-param/dropdown`, params }) } \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue index 617ddbb..deb50d7 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue @@ -68,43 +68,43 @@ - + - - - + + + - + - + - + - + - + - + + \ No newline at end of file + +/** 组件挂载时初始化下拉选项 */ +onMounted(() => { + initOptions() +}) + + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/machineparam/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/machineparam/index.vue index f092009..389aed9 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/machineparam/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/machineparam/index.vue @@ -6,12 +6,12 @@ :model="queryParams" ref="queryFormRef" :inline="true" - label-width="68px" + label-width="80px" > - + @@ -52,15 +52,6 @@ > 新增 - - 导出 - @@ -68,30 +59,25 @@ - - - - + + + + + + - - - - - - - - - + +