From d2ace5a57ec468f6ec0e3cd5733012f9952c27ed Mon Sep 17 00:00:00 2001 From: kkk-ops <1050738955@qq.com> Date: Fri, 9 Jan 2026 19:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=20?= =?UTF-8?q?=E8=AF=95=E4=BA=A7=E8=B4=A8=E6=A3=80=E5=BD=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mes/enums/ErrorCodeConstants.java | 2 + .../controller/admin/plan/PlanController.java | 37 +++++- .../admin/zjproduct/ZjProductController.java | 2 +- .../ZjProductRecordController.java | 106 ++++++++++++++++++ .../vo/ZjProductRecordPageReqVO.java | 49 ++++++++ .../vo/ZjProductRecordRespVO.java | 58 ++++++++++ .../vo/ZjProductRecordSaveReqVO.java | 45 ++++++++ .../zjproductrecord/ZjProductRecordDO.java | 69 ++++++++++++ .../ZjProductRecordMapper.java | 34 ++++++ .../mes/service/plan/PlanServiceImpl.java | 20 ++++ .../service/zjproduct/ZjProductService.java | 2 +- .../zjproduct/ZjProductServiceImpl.java | 2 +- .../ZjProductRecordService.java | 55 +++++++++ .../ZjProductRecordServiceImpl.java | 74 ++++++++++++ .../zjproductrecord/ZjProductRecordMapper.xml | 12 ++ .../src/main/resources/application-dev.yaml | 2 +- 16 files changed, 563 insertions(+), 6 deletions(-) create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/ZjProductRecordController.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordPageReqVO.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordRespVO.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordSaveReqVO.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjproductrecord/ZjProductRecordDO.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjproductrecord/ZjProductRecordMapper.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproductrecord/ZjProductRecordService.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproductrecord/ZjProductRecordServiceImpl.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/zjproductrecord/ZjProductRecordMapper.xml diff --git a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 28998b31b3..c19d9f6ece 100644 --- a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -83,6 +83,8 @@ public interface ErrorCodeConstants { ErrorCode ZJ_ITEM_NOT_EXISTS = new ErrorCode(5_0091, "检验项目不存在"); ErrorCode ZJ_SCHEMA_NOT_EXISTS = new ErrorCode(5_0092, "检验方案不存在"); ErrorCode ZJ_PRODUCT_NOT_EXISTS = new ErrorCode(5_0093, "检验参数不存在"); + ErrorCode ZJ_PRODUCT_RECORD_NOT_EXISTS = new ErrorCode(5_0093, "检验参数不存在"); + //======================================设备台账相关 1002000000================================================= diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java index 7c7609abc7..2af0c65a6d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java @@ -13,17 +13,24 @@ import cn.iocoder.yudao.module.iot.framework.mqtt.utils.DateUtils; import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionRespVO; import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionSaveReqVO; import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.*; +import cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo.ZjProductRecordRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo.ZjProductRecordSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.itemrequisition.ItemRequisitionDO; import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.zjproduct.ZjProductDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.zjproductrecord.ZjProductRecordDO; import cn.iocoder.yudao.module.mes.dal.mysql.plan.PlanMapper; import cn.iocoder.yudao.module.mes.service.itemrequisition.ItemAnalysisService; import cn.iocoder.yudao.module.mes.service.itemrequisition.entity.ItemRequisitionAndStock; import cn.iocoder.yudao.module.mes.service.organization.OrganizationService; import cn.iocoder.yudao.module.mes.service.plan.PlanService; +import cn.iocoder.yudao.module.mes.service.zjproduct.ZjProductService; +import cn.iocoder.yudao.module.mes.service.zjproductrecord.ZjProductRecordService; 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.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -31,6 +38,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -54,12 +62,37 @@ public class PlanController { @Resource private OrganizationService organizationService; + @Resource + private ZjProductService zjProductService; + + @Resource + private ZjProductRecordService zjProductRecordService; + @PostMapping("/create") @Operation(summary = "创建生产计划") + @Transactional(rollbackFor = Exception.class) //@PreAuthorize("@ss.hasPermission('mes:plan:create')") - public CommonResult createPlan(@Valid @RequestBody PlanSaveReqVO createReqVO) { - return success(planService.createPlan(createReqVO)); + public CommonResult createPlan(@Valid @RequestBody PlanSaveReqVO createReqVO) { + Long id = planService.createPlan(createReqVO); + if (createReqVO.getIsPreProduction() != null && createReqVO.getIsPreProduction().compareTo(new BigDecimal(1)) == 0) { + // 查对应产品的质检参数 + List zjProductDOList = zjProductService.getZjProductByProductId(createReqVO.getProductId()); + for (ZjProductDO source : zjProductDOList) { + ZjProductRecordDO zjProductRecordDO = new ZjProductRecordDO(); + // 属性映射 + zjProductRecordDO.setType(source.getType()); + zjProductRecordDO.setName(source.getName()); + zjProductRecordDO.setUnit(source.getUnit()); + zjProductRecordDO.setUpperVal(source.getUpperVal()); + zjProductRecordDO.setLowerVal(source.getLowerVal()); + zjProductRecordDO.setProductId(source.getProductId()); + zjProductRecordDO.setPlanId(id); + zjProductRecordService.createZjProductRecord(BeanUtils.toBean(zjProductRecordDO, ZjProductRecordSaveReqVO.class)); + } + } + + return success(true); } @PutMapping("/update") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproduct/ZjProductController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproduct/ZjProductController.java index 54083b9cfa..fab8e64dbb 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproduct/ZjProductController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproduct/ZjProductController.java @@ -102,7 +102,7 @@ public class ZjProductController { @Parameter(name = "productId", description = "产品ID") @PreAuthorize("@ss.hasPermission('erp:product:query')") public CommonResult> getZjProductByPlanId(@RequestParam("productId") Long productId) { - List pageResult = zjProductService.getZjProductByPlanId(productId); + List pageResult = zjProductService.getZjProductByProductId(productId); return success(BeanUtils.toBean(pageResult, ZjProductRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/ZjProductRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/ZjProductRecordController.java new file mode 100644 index 0000000000..9ce5ed5f95 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/ZjProductRecordController.java @@ -0,0 +1,106 @@ +package cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord; + +import cn.iocoder.yudao.module.mes.dal.dataobject.zjproduct.ZjProductDO; +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 cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo.*; +import cn.iocoder.yudao.module.mes.dal.dataobject.zjproductrecord.ZjProductRecordDO; +import cn.iocoder.yudao.module.mes.service.zjproductrecord.ZjProductRecordService; + +@Tag(name = "管理后台 - 试产质检记录") +@RestController +@RequestMapping("/mes/zj-product-record") +@Validated +public class ZjProductRecordController { + + @Resource + private ZjProductRecordService zjProductRecordService; + + @PostMapping("/create") + @Operation(summary = "创建试产质检记录") +// @PreAuthorize("@ss.hasPermission('mes:zj-product-record:create')") + public CommonResult createZjProductRecord(@Valid @RequestBody ZjProductRecordSaveReqVO createReqVO) { + return success(zjProductRecordService.createZjProductRecord(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新试产质检记录") +// @PreAuthorize("@ss.hasPermission('mes:zj-product-record:update')") + public CommonResult updateZjProductRecord(@Valid @RequestBody ZjProductRecordSaveReqVO updateReqVO) { + zjProductRecordService.updateZjProductRecord(updateReqVO); + return success(true); + } + + @PutMapping("/updateBatch") + @Operation(summary = "批量更新试产质检记录") + @PreAuthorize("@ss.hasPermission('erp:product:update')") + public CommonResult updateZjProductRecordBatch(@Valid @RequestBody List updateReqVOList) { + for (ZjProductRecordSaveReqVO source : updateReqVOList) { + zjProductRecordService.updateZjProductRecord(source); + } + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除试产质检记录") + @Parameter(name = "id", description = "编号", required = true) +// @PreAuthorize("@ss.hasPermission('mes:zj-product-record:delete')") + public CommonResult deleteZjProductRecord(@RequestParam("id") Long id) { + zjProductRecordService.deleteZjProductRecord(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得试产质检记录") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('erp:product:query')") + public CommonResult getZjProductRecord(@RequestParam("id") Long id) { + ZjProductRecordDO zjProductRecord = zjProductRecordService.getZjProductRecord(id); + return success(BeanUtils.toBean(zjProductRecord, ZjProductRecordRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得试产质检记录分页") + @PreAuthorize("@ss.hasPermission('erp:product:query')") + public CommonResult> getZjProductRecordPage(@Valid ZjProductRecordPageReqVO pageReqVO) { + PageResult pageResult = zjProductRecordService.getZjProductRecordPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ZjProductRecordRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出试产质检记录 Excel") +// @PreAuthorize("@ss.hasPermission('mes:zj-product-record:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportZjProductRecordExcel(@Valid ZjProductRecordPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = zjProductRecordService.getZjProductRecordPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "试产质检记录.xls", "数据", ZjProductRecordRespVO.class, + BeanUtils.toBean(list, ZjProductRecordRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordPageReqVO.java new file mode 100644 index 0000000000..ecc87c6cee --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordPageReqVO.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 试产质检记录分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ZjProductRecordPageReqVO extends PageParam { + + @Schema(description = "工序", example = "2") + private String type; + + @Schema(description = "名称", example = "赵六") + private String name; + + @Schema(description = "单位") + private String unit; + + @Schema(description = "上限值") + private Double upperVal; + + @Schema(description = "下限值") + private Double lowerVal; + + @Schema(description = "关联产品id", example = "6649") + private Long productId; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "关联计划id", example = "13611") + private Long planId; + + @Schema(description = "实际值", example = "你猜") + private String realVal; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordRespVO.java new file mode 100644 index 0000000000..d361ca1104 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordRespVO.java @@ -0,0 +1,58 @@ +package cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 试产质检记录 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ZjProductRecordRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5254") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "工序", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("工序") + private String type; + + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("名称") + private String name; + + @Schema(description = "单位") + @ExcelProperty("单位") + private String unit; + + @Schema(description = "上限值") + @ExcelProperty("上限值") + private Double upperVal; + + @Schema(description = "下限值") + @ExcelProperty("下限值") + private Double lowerVal; + + @Schema(description = "关联产品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6649") + @ExcelProperty("关联产品id") + private Long productId; + + @Schema(description = "备注", example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "关联计划id", example = "13611") + @ExcelProperty("关联计划id") + private Long planId; + + @Schema(description = "实际值", example = "你猜") + @ExcelProperty("实际值") + private String realVal; +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordSaveReqVO.java new file mode 100644 index 0000000000..e01ca037fd --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/vo/ZjProductRecordSaveReqVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 试产质检记录新增/修改 Request VO") +@Data +public class ZjProductRecordSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5254") + private Long id; + + @Schema(description = "工序", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "工序不能为空") + private String type; + + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "名称不能为空") + private String name; + + @Schema(description = "单位") + private String unit; + + @Schema(description = "上限值") + private Double upperVal; + + @Schema(description = "下限值") + private Double lowerVal; + + @Schema(description = "关联产品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6649") + @NotNull(message = "关联产品id不能为空") + private Long productId; + + @Schema(description = "实际值", example = "你猜") + private String realVal; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "关联计划id", example = "13611") + private Long planId; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjproductrecord/ZjProductRecordDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjproductrecord/ZjProductRecordDO.java new file mode 100644 index 0000000000..c8d9fffc83 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjproductrecord/ZjProductRecordDO.java @@ -0,0 +1,69 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.zjproductrecord; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 试产质检记录 DO + * + * @author 内蒙必硕 + */ +@TableName("mes_zj_product_record") +@KeySequence("mes_zj_product_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ZjProductRecordDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 工序 + */ + private String type; + /** + * 名称 + */ + private String name; + /** + * 单位 + */ + private String unit; + /** + * 上限值 + */ + private Double upperVal; + /** + * 下限值 + */ + private Double lowerVal; + /** + * 关联产品id + */ + private Long productId; + /** + * 备注 + */ + private String remark; + /** + * 关联计划id + */ + private Long planId; + + /** + * 实际值 + */ + private String realVal; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjproductrecord/ZjProductRecordMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjproductrecord/ZjProductRecordMapper.java new file mode 100644 index 0000000000..9ad7cbb210 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjproductrecord/ZjProductRecordMapper.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.zjproductrecord; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.mes.dal.dataobject.zjproductrecord.ZjProductRecordDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo.*; + +/** + * 试产质检记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface ZjProductRecordMapper extends BaseMapperX { + + default PageResult selectPage(ZjProductRecordPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ZjProductRecordDO::getType, reqVO.getType()) + .likeIfPresent(ZjProductRecordDO::getName, reqVO.getName()) + .eqIfPresent(ZjProductRecordDO::getUnit, reqVO.getUnit()) + .eqIfPresent(ZjProductRecordDO::getUpperVal, reqVO.getUpperVal()) + .eqIfPresent(ZjProductRecordDO::getLowerVal, reqVO.getLowerVal()) + .eqIfPresent(ZjProductRecordDO::getProductId, reqVO.getProductId()) + .eqIfPresent(ZjProductRecordDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(ZjProductRecordDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(ZjProductRecordDO::getPlanId, reqVO.getPlanId()) + .orderByDesc(ZjProductRecordDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java index 16d30c4035..ef12354f10 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java @@ -5,8 +5,11 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO; +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.out.ErpStockOutSaveReqVO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.erp.service.product.ErpProductService; +import cn.iocoder.yudao.module.erp.service.stock.ErpStockOutService; +import cn.iocoder.yudao.module.erp.service.stock.ErpStockService; import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionSaveReqVO; import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionStatusEnum; import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanPageReqVO; @@ -66,6 +69,9 @@ public class PlanServiceImpl implements PlanService { @Resource private ItemAnalysisService analysisService; + @Resource + private ErpStockOutService stockService; + @Override @Transactional(rollbackFor = Exception.class) public Long createPlan(PlanSaveReqVO createReqVO) { @@ -123,6 +129,20 @@ public class PlanServiceImpl implements PlanService { saveReqVO.setPlanId(plan.getId()); saveReqVO.setId(id); itemRequisitionService.updateItemRequisition(saveReqVO); + // 创建入领料出库单 + ErpStockOutSaveReqVO stockOut = new ErpStockOutSaveReqVO(); + List itemList = new ArrayList<>(); + stockOut.setOutTime(LocalDateTime.now()); + stockOut.setOutType("领料出库"); + for (ItemRequisitionAndStock requisition : list) { + ErpStockOutSaveReqVO.Item item = new ErpStockOutSaveReqVO.Item(); + item.setWarehouseId(3L); + item.setProductId(requisition.getItemId()); + item.setCount(requisition.getNumber()); + itemList.add(item); + } + stockOut.setItems(itemList); + stockService.createStockOut(stockOut); return plan.getId(); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproduct/ZjProductService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproduct/ZjProductService.java index 5aef12b8c5..b5ca5beb7b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproduct/ZjProductService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproduct/ZjProductService.java @@ -58,5 +58,5 @@ public interface ZjProductService { * @param productId 产品ID * @return 产品质检明细列表 */ - List getZjProductByPlanId(Long productId); + List getZjProductByProductId(Long productId); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproduct/ZjProductServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproduct/ZjProductServiceImpl.java index d161cde4a9..a7f1ae29e1 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproduct/ZjProductServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproduct/ZjProductServiceImpl.java @@ -73,7 +73,7 @@ public class ZjProductServiceImpl implements ZjProductService { } @Override - public List getZjProductByPlanId(Long productId) { + public List getZjProductByProductId(Long productId) { return zjProductMapper.selectListByProductId(productId); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproductrecord/ZjProductRecordService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproductrecord/ZjProductRecordService.java new file mode 100644 index 0000000000..ca367640b4 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproductrecord/ZjProductRecordService.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.mes.service.zjproductrecord; + +import java.util.*; +import javax.validation.*; +import cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo.*; +import cn.iocoder.yudao.module.mes.dal.dataobject.zjproductrecord.ZjProductRecordDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +/** + * 试产质检记录 Service 接口 + * + * @author 内蒙必硕 + */ +public interface ZjProductRecordService { + + /** + * 创建试产质检记录 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createZjProductRecord(@Valid ZjProductRecordSaveReqVO createReqVO); + + /** + * 更新试产质检记录 + * + * @param updateReqVO 更新信息 + */ + void updateZjProductRecord(@Valid ZjProductRecordSaveReqVO updateReqVO); + + /** + * 删除试产质检记录 + * + * @param id 编号 + */ + void deleteZjProductRecord(Long id); + + /** + * 获得试产质检记录 + * + * @param id 编号 + * @return 试产质检记录 + */ + ZjProductRecordDO getZjProductRecord(Long id); + + /** + * 获得试产质检记录分页 + * + * @param pageReqVO 分页查询 + * @return 试产质检记录分页 + */ + PageResult getZjProductRecordPage(ZjProductRecordPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproductrecord/ZjProductRecordServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproductrecord/ZjProductRecordServiceImpl.java new file mode 100644 index 0000000000..3dc2ca721a --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjproductrecord/ZjProductRecordServiceImpl.java @@ -0,0 +1,74 @@ +package cn.iocoder.yudao.module.mes.service.zjproductrecord; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.mes.controller.admin.zjproductrecord.vo.*; +import cn.iocoder.yudao.module.mes.dal.dataobject.zjproductrecord.ZjProductRecordDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.mes.dal.mysql.zjproductrecord.ZjProductRecordMapper; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * 试产质检记录 Service 实现类 + * + * @author 内蒙必硕 + */ +@Service +@Validated +public class ZjProductRecordServiceImpl implements ZjProductRecordService { + + @Resource + private ZjProductRecordMapper zjProductRecordMapper; + + @Override + public Long createZjProductRecord(ZjProductRecordSaveReqVO createReqVO) { + // 插入 + ZjProductRecordDO zjProductRecord = BeanUtils.toBean(createReqVO, ZjProductRecordDO.class); + zjProductRecordMapper.insert(zjProductRecord); + // 返回 + return zjProductRecord.getId(); + } + + @Override + public void updateZjProductRecord(ZjProductRecordSaveReqVO updateReqVO) { + // 校验存在 + validateZjProductRecordExists(updateReqVO.getId()); + // 更新 + ZjProductRecordDO updateObj = BeanUtils.toBean(updateReqVO, ZjProductRecordDO.class); + zjProductRecordMapper.updateById(updateObj); + } + + @Override + public void deleteZjProductRecord(Long id) { + // 校验存在 + validateZjProductRecordExists(id); + // 删除 + zjProductRecordMapper.deleteById(id); + } + + private void validateZjProductRecordExists(Long id) { + if (zjProductRecordMapper.selectById(id) == null) { + throw exception(ZJ_PRODUCT_RECORD_NOT_EXISTS); + } + } + + @Override + public ZjProductRecordDO getZjProductRecord(Long id) { + return zjProductRecordMapper.selectById(id); + } + + @Override + public PageResult getZjProductRecordPage(ZjProductRecordPageReqVO pageReqVO) { + return zjProductRecordMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/zjproductrecord/ZjProductRecordMapper.xml b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/zjproductrecord/ZjProductRecordMapper.xml new file mode 100644 index 0000000000..0088c67bc8 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/zjproductrecord/ZjProductRecordMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml index 653abe9b50..5ce1e071f9 100644 --- a/yudao-server/src/main/resources/application-dev.yaml +++ b/yudao-server/src/main/resources/application-dev.yaml @@ -56,7 +56,7 @@ spring: tdengine: name: tdengine - url: jdbc:TAOS-RS://192.168.5.5:6042/besure?charset=UTF-8&locale=en_US.UTF-8 + url: jdbc:TAOS-RS://ngsk.tech:16042/besure?charset=UTF-8&locale=en_US.UTF-8 username: root password: taosdata driver-class-name: com.taosdata.jdbc.rs.RestfulDriver