From f7e072e180ac76e17bfeda57e0b430a2d7d10b39 Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 8 Jan 2025 19:49:15 +0800 Subject: [PATCH] =?UTF-8?q?add(hwmom-mes):=20=E6=B7=BB=E5=8A=A0=E7=AD=89?= =?UTF-8?q?=E5=90=8C=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E5=92=8C=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?,=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=A1?= =?UTF-8?q?=E9=87=8F=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseEqualMaterialInfoController.java | 117 ++++++ .../BaseMaterialInfoController.java | 117 ++++++ .../BaseMaterialTypeController.java | 117 ++++++ .../BaseMeasurementUnitInfoController.java | 117 ++++++ .../BaseSupplierInfoController.java | 117 ++++++ .../mes/domain/BaseEqualMaterialInfo.java | 56 +++ .../dromara/mes/domain/BaseMaterialInfo.java | 273 +++++++++++++ .../dromara/mes/domain/BaseMaterialType.java | 82 ++++ .../mes/domain/BaseMeasurementUnitInfo.java | 71 ++++ .../dromara/mes/domain/BaseSupplierInfo.java | 68 ++++ .../domain/bo/BaseEqualMaterialInfoBo.java | 49 +++ .../mes/domain/bo/BaseMaterialInfoBo.java | 269 +++++++++++++ .../mes/domain/bo/BaseMaterialTypeBo.java | 77 ++++ .../domain/bo/BaseMeasurementUnitInfoBo.java | 71 ++++ .../mes/domain/bo/BaseSupplierInfoBo.java | 68 ++++ .../domain/vo/BaseEqualMaterialInfoVo.java | 104 +++++ .../mes/domain/vo/BaseMaterialInfoVo.java | 378 ++++++++++++++++++ .../mes/domain/vo/BaseMaterialTypeVo.java | 137 +++++++ .../domain/vo/BaseMeasurementUnitInfoVo.java | 118 ++++++ .../mes/domain/vo/BaseSupplierInfoVo.java | 119 ++++++ .../mapper/BaseEqualMaterialInfoMapper.java | 15 + .../mes/mapper/BaseMaterialInfoMapper.java | 15 + .../mes/mapper/BaseMaterialTypeMapper.java | 15 + .../mapper/BaseMeasurementUnitInfoMapper.java | 15 + .../mes/mapper/BaseSupplierInfoMapper.java | 15 + .../IBaseEqualMaterialInfoService.java | 69 ++++ .../mes/service/IBaseMaterialInfoService.java | 69 ++++ .../mes/service/IBaseMaterialTypeService.java | 59 +++ .../IBaseMeasurementUnitInfoService.java | 59 +++ .../mes/service/IBaseSupplierInfoService.java | 69 ++++ .../BaseEqualMaterialInfoServiceImpl.java | 141 +++++++ .../impl/BaseMaterialInfoServiceImpl.java | 185 +++++++++ .../impl/BaseMaterialTypeServiceImpl.java | 130 ++++++ .../BaseMeasurementUnitInfoServiceImpl.java | 123 ++++++ .../impl/BaseSupplierInfoServiceImpl.java | 140 +++++++ .../mes/BaseEqualMaterialInfoMapper.xml | 7 + .../mapper/mes/BaseMaterialInfoMapper.xml | 7 + .../mapper/mes/BaseMaterialTypeMapper.xml | 7 + .../mes/BaseMeasurementUnitInfoMapper.xml | 7 + .../mapper/mes/BaseSupplierInfoMapper.xml | 7 + 40 files changed, 3679 insertions(+) create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseEqualMaterialInfoController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialTypeController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMeasurementUnitInfoController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseSupplierInfoController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMeasurementUnitInfo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseSupplierInfo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseEqualMaterialInfoBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialTypeBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMeasurementUnitInfoBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseSupplierInfoBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseEqualMaterialInfoVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMeasurementUnitInfoVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseSupplierInfoVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseEqualMaterialInfoMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMaterialInfoMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMaterialTypeMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMeasurementUnitInfoMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseSupplierInfoMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseEqualMaterialInfoService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMaterialInfoService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMaterialTypeService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMeasurementUnitInfoService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseSupplierInfoService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialInfoServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMeasurementUnitInfoServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseSupplierInfoServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseEqualMaterialInfoMapper.xml create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMaterialInfoMapper.xml create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMaterialTypeMapper.xml create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMeasurementUnitInfoMapper.xml create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseSupplierInfoMapper.xml diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseEqualMaterialInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseEqualMaterialInfoController.java new file mode 100644 index 0000000..190cbcc --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseEqualMaterialInfoController.java @@ -0,0 +1,117 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.BaseEqualMaterialInfoVo; +import org.dromara.mes.domain.bo.BaseEqualMaterialInfoBo; +import org.dromara.mes.service.IBaseEqualMaterialInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 等同物料信息 + * 前端访问路由地址为:/mes/baseEqualMaterialInfo + * + * @author zangch + * @date 2025-01-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseEqualMaterialInfo") +public class BaseEqualMaterialInfoController extends BaseController { + + private final IBaseEqualMaterialInfoService baseEqualMaterialInfoService; + + /** + * 查询等同物料信息列表 + */ + @SaCheckPermission("mes:baseEqualMaterialInfo:list") + @GetMapping("/list") + public TableDataInfo list(BaseEqualMaterialInfoBo bo, PageQuery pageQuery) { + return baseEqualMaterialInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出等同物料信息列表 + */ + @SaCheckPermission("mes:baseEqualMaterialInfo:export") + @Log(title = "等同物料信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseEqualMaterialInfoBo bo, HttpServletResponse response) { + List list = baseEqualMaterialInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "等同物料信息", BaseEqualMaterialInfoVo.class, response); + } + + /** + * 获取等同物料信息详细信息 + * + * @param equalMaterialInfoId 主键 + */ + @SaCheckPermission("mes:baseEqualMaterialInfo:query") + @GetMapping("/{equalMaterialInfoId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long equalMaterialInfoId) { + return R.ok(baseEqualMaterialInfoService.queryById(equalMaterialInfoId)); + } + + /** + * 新增等同物料信息 + */ + @SaCheckPermission("mes:baseEqualMaterialInfo:add") + @Log(title = "等同物料信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseEqualMaterialInfoBo bo) { + return toAjax(baseEqualMaterialInfoService.insertByBo(bo)); + } + + /** + * 修改等同物料信息 + */ + @SaCheckPermission("mes:baseEqualMaterialInfo:edit") + @Log(title = "等同物料信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseEqualMaterialInfoBo bo) { + return toAjax(baseEqualMaterialInfoService.updateByBo(bo)); + } + + /** + * 删除等同物料信息 + * + * @param equalMaterialInfoIds 主键串 + */ + @SaCheckPermission("mes:baseEqualMaterialInfo:remove") + @Log(title = "等同物料信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{equalMaterialInfoIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] equalMaterialInfoIds) { + return toAjax(baseEqualMaterialInfoService.deleteWithValidByIds(List.of(equalMaterialInfoIds), true)); + } + + + /** + * 下拉框查询等同物料信息列表 + */ + + @GetMapping("getBaseEqualMaterialInfoList") + public R> getBaseEqualMaterialInfolist(BaseEqualMaterialInfoBo bo) { + List list = baseEqualMaterialInfoService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java new file mode 100644 index 0000000..e738804 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java @@ -0,0 +1,117 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.BaseMaterialInfoVo; +import org.dromara.mes.domain.bo.BaseMaterialInfoBo; +import org.dromara.mes.service.IBaseMaterialInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 物料信息 + * 前端访问路由地址为:/mes/baseMaterialInfo + * + * @author zangch + * @date 2025-01-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseMaterialInfo") +public class BaseMaterialInfoController extends BaseController { + + private final IBaseMaterialInfoService baseMaterialInfoService; + + /** + * 查询物料信息列表 + */ + @SaCheckPermission("mes:baseMaterialInfo:list") + @GetMapping("/list") + public TableDataInfo list(BaseMaterialInfoBo bo, PageQuery pageQuery) { + return baseMaterialInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出物料信息列表 + */ + @SaCheckPermission("mes:baseMaterialInfo:export") + @Log(title = "物料信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseMaterialInfoBo bo, HttpServletResponse response) { + List list = baseMaterialInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "物料信息", BaseMaterialInfoVo.class, response); + } + + /** + * 获取物料信息详细信息 + * + * @param materialId 主键 + */ + @SaCheckPermission("mes:baseMaterialInfo:query") + @GetMapping("/{materialId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long materialId) { + return R.ok(baseMaterialInfoService.queryById(materialId)); + } + + /** + * 新增物料信息 + */ + @SaCheckPermission("mes:baseMaterialInfo:add") + @Log(title = "物料信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseMaterialInfoBo bo) { + return toAjax(baseMaterialInfoService.insertByBo(bo)); + } + + /** + * 修改物料信息 + */ + @SaCheckPermission("mes:baseMaterialInfo:edit") + @Log(title = "物料信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseMaterialInfoBo bo) { + return toAjax(baseMaterialInfoService.updateByBo(bo)); + } + + /** + * 删除物料信息 + * + * @param materialIds 主键串 + */ + @SaCheckPermission("mes:baseMaterialInfo:remove") + @Log(title = "物料信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{materialIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] materialIds) { + return toAjax(baseMaterialInfoService.deleteWithValidByIds(List.of(materialIds), true)); + } + + + /** + * 下拉框查询物料信息列表 + */ + + @GetMapping("getBaseMaterialInfoList") + public R> getBaseMaterialInfolist(BaseMaterialInfoBo bo) { + List list = baseMaterialInfoService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialTypeController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialTypeController.java new file mode 100644 index 0000000..2da8376 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialTypeController.java @@ -0,0 +1,117 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.BaseMaterialTypeVo; +import org.dromara.mes.domain.bo.BaseMaterialTypeBo; +import org.dromara.mes.service.IBaseMaterialTypeService; + +/** + * 物料类型信息 + * 前端访问路由地址为:/mes/baseMaterialType + * + * @author zangch + * @date 2025-01-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseMaterialType") +public class BaseMaterialTypeController extends BaseController { + + private final IBaseMaterialTypeService baseMaterialTypeService; + + /** + * 查询物料类型信息列表 + */ + @SaCheckPermission("mes:baseMaterialType:list") + @GetMapping("/list") + public R> list(BaseMaterialTypeBo bo) { + List list = baseMaterialTypeService.queryList(bo); + return R.ok(list); + } + + /** + * 导出物料类型信息列表 + */ + @SaCheckPermission("mes:baseMaterialType:export") + @Log(title = "物料类型信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseMaterialTypeBo bo, HttpServletResponse response) { + List list = baseMaterialTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "物料类型信息", BaseMaterialTypeVo.class, response); + } + + /** + * 获取物料类型信息详细信息 + * + * @param matrialTypeId 主键 + */ + @SaCheckPermission("mes:baseMaterialType:query") + @GetMapping("/{matrialTypeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long matrialTypeId) { + return R.ok(baseMaterialTypeService.queryById(matrialTypeId)); + } + + /** + * 新增物料类型信息 + */ + @SaCheckPermission("mes:baseMaterialType:add") + @Log(title = "物料类型信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseMaterialTypeBo bo) { + return toAjax(baseMaterialTypeService.insertByBo(bo)); + } + + /** + * 修改物料类型信息 + */ + @SaCheckPermission("mes:baseMaterialType:edit") + @Log(title = "物料类型信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseMaterialTypeBo bo) { + return toAjax(baseMaterialTypeService.updateByBo(bo)); + } + + /** + * 删除物料类型信息 + * + * @param matrialTypeIds 主键串 + */ + @SaCheckPermission("mes:baseMaterialType:remove") + @Log(title = "物料类型信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{matrialTypeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] matrialTypeIds) { + return toAjax(baseMaterialTypeService.deleteWithValidByIds(List.of(matrialTypeIds), true)); + } + + + /** + * 下拉框查询物料类型信息列表 + */ + + @GetMapping("getBaseMaterialTypeList") + public R> getBaseMaterialTypelist(BaseMaterialTypeBo bo) { + List list = baseMaterialTypeService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMeasurementUnitInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMeasurementUnitInfoController.java new file mode 100644 index 0000000..45f883b --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMeasurementUnitInfoController.java @@ -0,0 +1,117 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.BaseMeasurementUnitInfoVo; +import org.dromara.mes.domain.bo.BaseMeasurementUnitInfoBo; +import org.dromara.mes.service.IBaseMeasurementUnitInfoService; + +/** + * 计量单位信息 + * 前端访问路由地址为:/mes/baseMeasurementUnitInfo + * + * @author zangch + * @date 2025-01-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseMeasurementUnitInfo") +public class BaseMeasurementUnitInfoController extends BaseController { + + private final IBaseMeasurementUnitInfoService baseMeasurementUnitInfoService; + + /** + * 查询计量单位信息列表 + */ + @SaCheckPermission("mes:baseMeasurementUnitInfo:list") + @GetMapping("/list") + public R> list(BaseMeasurementUnitInfoBo bo) { + List list = baseMeasurementUnitInfoService.queryList(bo); + return R.ok(list); + } + + /** + * 导出计量单位信息列表 + */ + @SaCheckPermission("mes:baseMeasurementUnitInfo:export") + @Log(title = "计量单位信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseMeasurementUnitInfoBo bo, HttpServletResponse response) { + List list = baseMeasurementUnitInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "计量单位信息", BaseMeasurementUnitInfoVo.class, response); + } + + /** + * 获取计量单位信息详细信息 + * + * @param unitId 主键 + */ + @SaCheckPermission("mes:baseMeasurementUnitInfo:query") + @GetMapping("/{unitId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long unitId) { + return R.ok(baseMeasurementUnitInfoService.queryById(unitId)); + } + + /** + * 新增计量单位信息 + */ + @SaCheckPermission("mes:baseMeasurementUnitInfo:add") + @Log(title = "计量单位信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseMeasurementUnitInfoBo bo) { + return toAjax(baseMeasurementUnitInfoService.insertByBo(bo)); + } + + /** + * 修改计量单位信息 + */ + @SaCheckPermission("mes:baseMeasurementUnitInfo:edit") + @Log(title = "计量单位信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseMeasurementUnitInfoBo bo) { + return toAjax(baseMeasurementUnitInfoService.updateByBo(bo)); + } + + /** + * 删除计量单位信息 + * + * @param unitIds 主键串 + */ + @SaCheckPermission("mes:baseMeasurementUnitInfo:remove") + @Log(title = "计量单位信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{unitIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] unitIds) { + return toAjax(baseMeasurementUnitInfoService.deleteWithValidByIds(List.of(unitIds), true)); + } + + + /** + * 下拉框查询计量单位信息列表 + */ + + @GetMapping("getBaseMeasurementUnitInfoList") + public R> getBaseMeasurementUnitInfolist(BaseMeasurementUnitInfoBo bo) { + List list = baseMeasurementUnitInfoService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseSupplierInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseSupplierInfoController.java new file mode 100644 index 0000000..ffe3853 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseSupplierInfoController.java @@ -0,0 +1,117 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.BaseSupplierInfoVo; +import org.dromara.mes.domain.bo.BaseSupplierInfoBo; +import org.dromara.mes.service.IBaseSupplierInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 供应商信息 + * 前端访问路由地址为:/mes/baseSupplierInfo + * + * @author ZangCH + * @date 2025-01-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseSupplierInfo") +public class BaseSupplierInfoController extends BaseController { + + private final IBaseSupplierInfoService baseSupplierInfoService; + + /** + * 查询供应商信息列表 + */ + @SaCheckPermission("mes:baseSupplierInfo:list") + @GetMapping("/list") + public TableDataInfo list(BaseSupplierInfoBo bo, PageQuery pageQuery) { + return baseSupplierInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出供应商信息列表 + */ + @SaCheckPermission("mes:baseSupplierInfo:export") + @Log(title = "供应商信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseSupplierInfoBo bo, HttpServletResponse response) { + List list = baseSupplierInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "供应商信息", BaseSupplierInfoVo.class, response); + } + + /** + * 获取供应商信息详细信息 + * + * @param supplierId 主键 + */ + @SaCheckPermission("mes:baseSupplierInfo:query") + @GetMapping("/{supplierId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long supplierId) { + return R.ok(baseSupplierInfoService.queryById(supplierId)); + } + + /** + * 新增供应商信息 + */ + @SaCheckPermission("mes:baseSupplierInfo:add") + @Log(title = "供应商信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseSupplierInfoBo bo) { + return toAjax(baseSupplierInfoService.insertByBo(bo)); + } + + /** + * 修改供应商信息 + */ + @SaCheckPermission("mes:baseSupplierInfo:edit") + @Log(title = "供应商信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseSupplierInfoBo bo) { + return toAjax(baseSupplierInfoService.updateByBo(bo)); + } + + /** + * 删除供应商信息 + * + * @param supplierIds 主键串 + */ + @SaCheckPermission("mes:baseSupplierInfo:remove") + @Log(title = "供应商信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{supplierIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] supplierIds) { + return toAjax(baseSupplierInfoService.deleteWithValidByIds(List.of(supplierIds), true)); + } + + + /** + * 下拉框查询供应商信息列表 + */ + + @GetMapping("getBaseSupplierInfoList") + public R> getBaseSupplierInfolist(BaseSupplierInfoBo bo) { + List list = baseSupplierInfoService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java new file mode 100644 index 0000000..bf43f39 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java @@ -0,0 +1,56 @@ +package org.dromara.mes.domain; + +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 等同物料信息对象 base_equal_material_info + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_equal_material_info") +public class BaseEqualMaterialInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "equal_material_info_id", type = IdType.AUTO) + private Long equalMaterialInfoId; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 等同物料ID + */ + private Long equalMaterialId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 物料名称 + */ + @TableField(exist = false) + private String materialName;//映射字段 +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java new file mode 100644 index 0000000..2984590 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java @@ -0,0 +1,273 @@ +package org.dromara.mes.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 物料信息对象 base_material_info + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_material_info") +public class BaseMaterialInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "material_id", type = IdType.AUTO) + private Long materialId; + + /** + * ERP信息 + */ + private String erpId; + + /** + * 物料编码 + */ + private String materialCode; + + /** + * 旧物料编码 + */ + private String oldMaterialCode; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 物料类型ID + */ + private Long materialTypeId; + + /** + * 物料大类(1原材料 2半成品 3成品) + */ + private String materialCategories; + + /** + * 物料小类 + */ + private String materialSubclass; + + /** + * 批次标识(0否 1是) + */ + private String batchFlag; + + /** + * 小批次数量 + */ + private Long batchAmount; + + /** + * 计量单位ID + */ + private Long materialUnitId; + + /** + * 计量单位名称 + */ + private String materialUnit; + + /** + * 物料组 + */ + private String materialMatkl; + + /** + * 物料规格 + */ + private String materialSpec; + + /** + * 净重 + */ + private Long netWeight; + + /** + * 毛重 + */ + private Long grossWeight; + + /** + * 绑定标识(1是 0否) + */ + private String alwaysFlag; + + /** + * 所属工厂 + */ + private Long factoryId; + + /** + * 创建组织 + */ + private Long createOrgId; + + /** + * 使用组织 + */ + private Long useOrgId; + + /** + * 所属产线 + */ + private Long prodLineId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 删除标识(0否 1是) + */ + private String deletedFlag; + + /** + * 采购计价单位 + */ + private Long purchasePriceUnitId; + + /** + * 审核日期 + */ + private Date approveDate; + + /** + * erp最后更新日期 + */ + private Date erpModifyDate; + + /** + * 最大库存数量 + */ + private Long maxStockAmount; + + /** + * 最小库存数量 + */ + private Long minStockAmount; + + /** + * 安全库存数量 + */ + private Long safeStockAmount; + + /** + * 申请标识(1是 0否) + */ + private String applyFlag; + + /** + * 物料分类（1ERP同步 2虚拟物料 3MES物料） + */ + private String materialClassfication; + + /** + * 自动出库标识(1是 0否) + */ + private String autoOutstockFlag; + + /** + * 辅料标识(1是 0否) + */ + private String accessoriesFlag; + + /** + * 低值易耗品标识(1是 0否) + */ + private String lowValueConsumableFlag; + + /** + * 品牌 + */ + private String brand; + + /** + * 层级 + */ + private String plyrating; + + /** + * 花纹 + */ + private String pattern; + + /** + * 速度级别 + */ + private String speedLevel; + + /** + * 负荷载重 + */ + private String load; + + /** + * 轮胎标记（1全钢胎 2半钢胎 3工程胎） + */ + private String tireMarkings; + + /** + * 最小停放时间（秒） + */ + private Long minParkingTime; + + /** + * 最大停放时间（秒） + */ + private Long maxParkingTime; + + /** + * 标准重量 + */ + private Long standardWeight; + + /** + * 标准重量上限 + */ + private Long weightUpperLimit; + + /** + * 标准重量下限 + */ + private Long weightLowerLimit; + + /** + * 内胎标记(0无 1有) + */ + private String innerTubeFlag; + + /** + * 销售类型(0内销 1外销) + */ + private String saleType; + + /** + * 备注 + */ + private String remark; + + + /** + * 所属工厂名称 + */ + @TableField(exist = false) + private String factoryName; //映射字段 +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java new file mode 100644 index 0000000..1594d0e --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java @@ -0,0 +1,82 @@ +package org.dromara.mes.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 物料类型信息对象 base_material_type + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_material_type") +public class BaseMaterialType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 物料类型ID + */ + private Long matrialTypeId; + + /** + * 父级标识 + */ + private Long parentId; + + /** + * 物料类型编号 + */ + private String matrialTypeCode; + + /** + * 物料类型名称 + */ + private String matrialTypeName; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 物料大类(1原材料 2半成品 3成品) + */ + private String materialCategories; + + /** + * 物料小类 + */ + private String materialSubclass; + + /** + * 工序ID + */ + private Long processId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + + /** + * 工序名称 + */ + @TableField(exist = false) + private String processName;//映射字段 + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMeasurementUnitInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMeasurementUnitInfo.java new file mode 100644 index 0000000..4505e4d --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMeasurementUnitInfo.java @@ -0,0 +1,71 @@ +package org.dromara.mes.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 计量单位信息对象 base_measurement_unit_info + * + * @author zangch + * @date 2025-01-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_measurement_unit_info") +public class BaseMeasurementUnitInfo extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "unit_id", type = IdType.AUTO) + private Long unitId; + + /** + * 父级标识 + */ + private Long parentId; + + /** + * 计量单位编号 + */ + private String unitCode; + + /** + * 计量单位名称 + */ + private String unitName; + + /** + * 计量单位转换（与最顶级转换关系，最顶级是1） + */ + private Long unitConversion; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 单位类型（1长度 2质量 3时间 4面积 5体积） + */ + private String unitType; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseSupplierInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseSupplierInfo.java new file mode 100644 index 0000000..3d98124 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseSupplierInfo.java @@ -0,0 +1,68 @@ +package org.dromara.mes.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 供应商信息对象 base_supplier_info + * + * @author ZangCH + * @date 2025-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_supplier_info") +public class BaseSupplierInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "supplier_id", type = IdType.AUTO) + private Long supplierId; + + /** + * 供应商编号 + */ + private String supplierCode; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * erp的主键 + */ + private Long erpId; + + /** + * 激活状态（1启用 0停用） + */ + private String supplierStatus; + + /** + * 审核日期 + */ + private Date auditDate; + + /** + * erp最后更新时间 + */ + private Date erpModifyDate; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseEqualMaterialInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseEqualMaterialInfoBo.java new file mode 100644 index 0000000..ff40ba6 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseEqualMaterialInfoBo.java @@ -0,0 +1,49 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.BaseEqualMaterialInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 等同物料信息业务对象 base_equal_material_info + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseEqualMaterialInfo.class, reverseConvertGenerate = false) +public class BaseEqualMaterialInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long equalMaterialInfoId; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 等同物料ID + */ + private Long equalMaterialId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java new file mode 100644 index 0000000..2d37d7d --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java @@ -0,0 +1,269 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.BaseMaterialInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 物料信息业务对象 base_material_info + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseMaterialInfo.class, reverseConvertGenerate = false) +public class BaseMaterialInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long materialId; + + /** + * ERP信息 + */ + @NotBlank(message = "ERP信息不能为空", groups = { AddGroup.class, EditGroup.class }) + private String erpId; + + /** + * 物料编码 + */ + @NotBlank(message = "物料编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialCode; + + /** + * 旧物料编码 + */ + private String oldMaterialCode; + + /** + * 物料名称 + */ + @NotBlank(message = "物料名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialName; + + /** + * 物料类型ID + */ + private Long materialTypeId; + + /** + * 物料大类(1原材料 2半成品 3成品) + */ + private String materialCategories; + + /** + * 物料小类 + */ + private String materialSubclass; + + /** + * 批次标识(0否 1是) + */ + private String batchFlag; + + /** + * 小批次数量 + */ + private Long batchAmount; + + /** + * 计量单位ID + */ + private Long materialUnitId; + + /** + * 计量单位名称 + */ + private String materialUnit; + + /** + * 物料组 + */ + private String materialMatkl; + + /** + * 物料规格 + */ + private String materialSpec; + + /** + * 净重 + */ + private Long netWeight; + + /** + * 毛重 + */ + private Long grossWeight; + + /** + * 绑定标识(1是 0否) + */ + private String alwaysFlag; + + /** + * 所属工厂 + */ + private Long factoryId; + + /** + * 创建组织 + */ + private Long createOrgId; + + /** + * 使用组织 + */ + private Long useOrgId; + + /** + * 所属产线 + */ + private Long prodLineId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 删除标识(0否 1是) + */ + private String deletedFlag; + + /** + * 采购计价单位 + */ + private Long purchasePriceUnitId; + + /** + * 审核日期 + */ + private Date approveDate; + + /** + * erp最后更新日期 + */ + private Date erpModifyDate; + + /** + * 最大库存数量 + */ + private Long maxStockAmount; + + /** + * 最小库存数量 + */ + private Long minStockAmount; + + /** + * 安全库存数量 + */ + private Long safeStockAmount; + + /** + * 申请标识(1是 0否) + */ + private String applyFlag; + + /** + * 物料分类（1ERP同步 2虚拟物料 3MES物料） + */ + private String materialClassfication; + + /** + * 自动出库标识(1是 0否) + */ + private String autoOutstockFlag; + + /** + * 辅料标识(1是 0否) + */ + private String accessoriesFlag; + + /** + * 低值易耗品标识(1是 0否) + */ + private String lowValueConsumableFlag; + + /** + * 品牌 + */ + private String brand; + + /** + * 层级 + */ + private String plyrating; + + /** + * 花纹 + */ + private String pattern; + + /** + * 速度级别 + */ + private String speedLevel; + + /** + * 负荷载重 + */ + private String load; + + /** + * 轮胎标记（1全钢胎 2半钢胎 3工程胎） + */ + private String tireMarkings; + + /** + * 最小停放时间（秒） + */ + private Long minParkingTime; + + /** + * 最大停放时间（秒） + */ + private Long maxParkingTime; + + /** + * 标准重量 + */ + private Long standardWeight; + + /** + * 标准重量上限 + */ + private Long weightUpperLimit; + + /** + * 标准重量下限 + */ + private Long weightLowerLimit; + + /** + * 内胎标记(0无 1有) + */ + private String innerTubeFlag; + + /** + * 销售类型(0内销 1外销) + */ + private String saleType; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialTypeBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialTypeBo.java new file mode 100644 index 0000000..438f20d --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialTypeBo.java @@ -0,0 +1,77 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.BaseMaterialType; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 物料类型信息业务对象 base_material_type + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseMaterialType.class, reverseConvertGenerate = false) +public class BaseMaterialTypeBo extends BaseEntity { + + /** + * 物料类型ID + */ + private Long matrialTypeId; + + /** + * 父级标识 + */ + @NotNull(message = "父级标识不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long parentId; + + /** + * 物料类型编号 + */ + @NotBlank(message = "物料类型编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String matrialTypeCode; + + /** + * 物料类型名称 + */ + @NotBlank(message = "物料类型名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String matrialTypeName; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 物料大类(1原材料 2半成品 3成品) + */ + private String materialCategories; + + /** + * 物料小类 + */ + private String materialSubclass; + + /** + * 工序ID + */ + private Long processId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMeasurementUnitInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMeasurementUnitInfoBo.java new file mode 100644 index 0000000..916d4aa --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMeasurementUnitInfoBo.java @@ -0,0 +1,71 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.BaseMeasurementUnitInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 计量单位信息业务对象 base_measurement_unit_info + * + * @author zangch + * @date 2025-01-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseMeasurementUnitInfo.class, reverseConvertGenerate = false) +public class BaseMeasurementUnitInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long unitId; + + /** + * 父级标识 + */ + private Long parentId; + + /** + * 计量单位编号 + */ + @NotBlank(message = "计量单位编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String unitCode; + + /** + * 计量单位名称 + */ + @NotBlank(message = "计量单位名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String unitName; + + /** + * 计量单位转换（与最顶级转换关系，最顶级是1） + */ + private Long unitConversion; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 单位类型（1长度 2质量 3时间 4面积 5体积） + */ + private String unitType; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseSupplierInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseSupplierInfoBo.java new file mode 100644 index 0000000..cf33d24 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseSupplierInfoBo.java @@ -0,0 +1,68 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.BaseSupplierInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 供应商信息业务对象 base_supplier_info + * + * @author ZangCH + * @date 2025-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseSupplierInfo.class, reverseConvertGenerate = false) +public class BaseSupplierInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long supplierId; + + /** + * 供应商编号 + */ + @NotBlank(message = "供应商编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String supplierCode; + + /** + * 供应商名称 + */ + @NotBlank(message = "供应商名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String supplierName; + + /** + * erp的主键 + */ + private Long erpId; + + /** + * 激活状态（1启用 0停用） + */ + private String supplierStatus; + + /** + * 审核日期 + */ + private Date auditDate; + + /** + * erp最后更新时间 + */ + private Date erpModifyDate; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseEqualMaterialInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseEqualMaterialInfoVo.java new file mode 100644 index 0000000..9a598dc --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseEqualMaterialInfoVo.java @@ -0,0 +1,104 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.BaseEqualMaterialInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 等同物料信息视图对象 base_equal_material_info + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseEqualMaterialInfo.class) +public class BaseEqualMaterialInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long equalMaterialInfoId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materialId; + + /** + * 等同物料ID + */ + @ExcelProperty(value = "等同物料ID") + private Long equalMaterialId; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName; +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java new file mode 100644 index 0000000..5a3ea64 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java @@ -0,0 +1,378 @@ +package org.dromara.mes.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.mes.domain.BaseMaterialInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 物料信息视图对象 base_material_info + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseMaterialInfo.class) +public class BaseMaterialInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long materialId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * ERP信息 + */ + @ExcelProperty(value = "ERP信息") + private String erpId; + + /** + * 物料编码 + */ + @ExcelProperty(value = "物料编码") + private String materialCode; + + /** + * 旧物料编码 + */ + @ExcelProperty(value = "旧物料编码") + private String oldMaterialCode; + + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName; + + /** + * 物料类型ID + */ + @ExcelProperty(value = "物料类型ID") + private Long materialTypeId; + + /** + * 物料大类(1原材料 2半成品 3成品) + */ + @ExcelProperty(value = "物料大类(1原材料 2半成品 3成品)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_material_categories") + private String materialCategories; + + /** + * 物料小类 + */ + @ExcelProperty(value = "物料小类") + private String materialSubclass; + + /** + * 批次标识(0否 1是) + */ + @ExcelProperty(value = "批次标识(0否 1是)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_batch_flag") + private String batchFlag; + + /** + * 小批次数量 + */ + @ExcelProperty(value = "小批次数量") + private Long batchAmount; + + /** + * 计量单位ID + */ + @ExcelProperty(value = "计量单位ID") + private Long materialUnitId; + + /** + * 计量单位名称 + */ + @ExcelProperty(value = "计量单位名称") + private String materialUnit; + + /** + * 物料组 + */ + @ExcelProperty(value = "物料组") + private String materialMatkl; + + /** + * 物料规格 + */ + @ExcelProperty(value = "物料规格") + private String materialSpec; + + /** + * 净重 + */ + @ExcelProperty(value = "净重") + private Long netWeight; + + /** + * 毛重 + */ + @ExcelProperty(value = "毛重") + private Long grossWeight; + + /** + * 绑定标识(1是 0否) + */ + @ExcelProperty(value = "绑定标识(1是 0否)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "always_flag") + private String alwaysFlag; + + /** + * 所属工厂 + */ + @ExcelProperty(value = "所属工厂") + private Long factoryId; + + /** + * 创建组织 + */ + @ExcelProperty(value = "创建组织") + private Long createOrgId; + + /** + * 使用组织 + */ + @ExcelProperty(value = "使用组织") + private Long useOrgId; + + /** + * 所属产线 + */ + @ExcelProperty(value = "所属产线") + private Long prodLineId; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 删除标识(0否 1是) + */ + @ExcelProperty(value = "删除标识(0否 1是)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "deleted_flag") + private String deletedFlag; + + /** + * 采购计价单位 + */ + @ExcelProperty(value = "采购计价单位") + private Long purchasePriceUnitId; + + /** + * 审核日期 + */ + @ExcelProperty(value = "审核日期") + private Date approveDate; + + /** + * erp最后更新日期 + */ + @ExcelProperty(value = "erp最后更新日期") + private Date erpModifyDate; + + /** + * 最大库存数量 + */ + @ExcelProperty(value = "最大库存数量") + private Long maxStockAmount; + + /** + * 最小库存数量 + */ + @ExcelProperty(value = "最小库存数量") + private Long minStockAmount; + + /** + * 安全库存数量 + */ + @ExcelProperty(value = "安全库存数量") + private Long safeStockAmount; + + /** + * 申请标识(1是 0否) + */ + @ExcelProperty(value = "申请标识(1是 0否)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "apply_flag") + private String applyFlag; + + /** + * 物料分类（1ERP同步 2虚拟物料 3MES物料） + */ + @ExcelProperty(value = "物料分类", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "material_classfication") + private String materialClassfication; + + /** + * 自动出库标识(1是 0否) + */ + @ExcelProperty(value = "自动出库标识(1是 0否)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "auto_outstock_flag") + private String autoOutstockFlag; + + /** + * 辅料标识(1是 0否) + */ + @ExcelProperty(value = "辅料标识(1是 0否)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_accessories_flag") + private String accessoriesFlag; + + /** + * 低值易耗品标识(1是 0否) + */ + @ExcelProperty(value = "低值易耗品标识(1是 0否)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_low_value_consumable_flag") + private String lowValueConsumableFlag; + + /** + * 品牌 + */ + @ExcelProperty(value = "品牌") + private String brand; + + /** + * 层级 + */ + @ExcelProperty(value = "层级") + private String plyrating; + + /** + * 花纹 + */ + @ExcelProperty(value = "花纹") + private String pattern; + + /** + * 速度级别 + */ + @ExcelProperty(value = "速度级别") + private String speedLevel; + + /** + * 负荷载重 + */ + @ExcelProperty(value = "负荷载重") + private String load; + + /** + * 轮胎标记（1全钢胎 2半钢胎 3工程胎） + */ + @ExcelProperty(value = "轮胎标记", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "tire_markings") + private String tireMarkings; + + /** + * 最小停放时间（秒） + */ + @ExcelProperty(value = "最小停放时间", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "秒=") + private Long minParkingTime; + + /** + * 最大停放时间（秒） + */ + @ExcelProperty(value = "最大停放时间", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "秒=") + private Long maxParkingTime; + + /** + * 标准重量 + */ + @ExcelProperty(value = "标准重量") + private Long standardWeight; + + /** + * 标准重量上限 + */ + @ExcelProperty(value = "标准重量上限") + private Long weightUpperLimit; + + /** + * 标准重量下限 + */ + @ExcelProperty(value = "标准重量下限") + private Long weightLowerLimit; + + /** + * 内胎标记(0无 1有) + */ + @ExcelProperty(value = "内胎标记(0无 1有)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "inner_tube_flag") + private String innerTubeFlag; + + /** + * 销售类型(0内销 1外销) + */ + @ExcelProperty(value = "销售类型(0内销 1外销)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sale_type") + private String saleType; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + /** + * 所属工厂 + */ + @ExcelProperty(value = "所属工厂") + private String factoryName; + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java new file mode 100644 index 0000000..f9fe420 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java @@ -0,0 +1,137 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.BaseMaterialType; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 物料类型信息视图对象 base_material_type + * + * @author zangch + * @date 2025-01-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseMaterialType.class) +public class BaseMaterialTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 物料类型ID + */ + @ExcelProperty(value = "物料类型ID") + private Long matrialTypeId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 父级标识 + */ + @ExcelProperty(value = "父级标识") + private Long parentId; + + /** + * 物料类型编号 + */ + @ExcelProperty(value = "物料类型编号") + private String matrialTypeCode; + + /** + * 物料类型名称 + */ + @ExcelProperty(value = "物料类型名称") + private String matrialTypeName; + + /** + * 祖级列表 + */ + @ExcelProperty(value = "祖级列表") + private String ancestors; + + /** + * 物料大类(1原材料 2半成品 3成品) + */ + @ExcelProperty(value = "物料大类(1原材料 2半成品 3成品)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_material_categories") + private String materialCategories; + + /** + * 物料小类 + */ + @ExcelProperty(value = "物料小类") + private String materialSubclass; + + /** + * 工序ID + */ + @ExcelProperty(value = "工序ID") + private Long processId; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + + /** + * 工序名称 + */ + @ExcelProperty(value = "工序名称") + private String processName; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMeasurementUnitInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMeasurementUnitInfoVo.java new file mode 100644 index 0000000..ee961ba --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMeasurementUnitInfoVo.java @@ -0,0 +1,118 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.BaseMeasurementUnitInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 计量单位信息视图对象 base_measurement_unit_info + * + * @author zangch + * @date 2025-01-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseMeasurementUnitInfo.class) +public class BaseMeasurementUnitInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long unitId; + + /** + * 父级标识 + */ + @ExcelProperty(value = "父级标识") + private Long parentId; + + /** + * 计量单位编号 + */ + @ExcelProperty(value = "计量单位编号") + private String unitCode; + + /** + * 计量单位名称 + */ + @ExcelProperty(value = "计量单位名称") + private String unitName; + + /** + * 计量单位转换（与最顶级转换关系，最顶级是1） + */ + @ExcelProperty(value = "计量单位转换", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "与=最顶级转换关系，最顶级是1") + private Long unitConversion; + + /** + * 祖级列表 + */ + @ExcelProperty(value = "祖级列表") + private String ancestors; + + /** + * 单位类型（1长度 2质量 3时间 4面积 5体积） + */ + @ExcelProperty(value = "单位类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "unit_type") + private String unitType; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识(1是 0否) + */ + @ExcelProperty(value = "激活标识(1是 0否)") + private String activeFlag; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseSupplierInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseSupplierInfoVo.java new file mode 100644 index 0000000..faf21c0 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseSupplierInfoVo.java @@ -0,0 +1,119 @@ +package org.dromara.mes.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.mes.domain.BaseSupplierInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 供应商信息视图对象 base_supplier_info + * + * @author ZangCH + * @date 2025-01-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseSupplierInfo.class) +public class BaseSupplierInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long supplierId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 供应商编号 + */ + @ExcelProperty(value = "供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ExcelProperty(value = "供应商名称") + private String supplierName; + + /** + * erp的主键 + */ + @ExcelProperty(value = "erp的主键") + private Long erpId; + + /** + * 激活状态（1启用 0停用） + */ + @ExcelProperty(value = "激活状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String supplierStatus; + + /** + * 审核日期 + */ + @ExcelProperty(value = "审核日期") + private Date auditDate; + + /** + * erp最后更新时间 + */ + @ExcelProperty(value = "erp最后更新时间") + private Date erpModifyDate; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseEqualMaterialInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseEqualMaterialInfoMapper.java new file mode 100644 index 0000000..59b9c22 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseEqualMaterialInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.BaseEqualMaterialInfo; +import org.dromara.mes.domain.vo.BaseEqualMaterialInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 等同物料信息Mapper接口 + * + * @author zangch + * @date 2025-01-07 + */ +public interface BaseEqualMaterialInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMaterialInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMaterialInfoMapper.java new file mode 100644 index 0000000..e0f12ee --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMaterialInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.BaseMaterialInfo; +import org.dromara.mes.domain.vo.BaseMaterialInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 物料信息Mapper接口 + * + * @author zangch + * @date 2025-01-07 + */ +public interface BaseMaterialInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMaterialTypeMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMaterialTypeMapper.java new file mode 100644 index 0000000..2a6c6fc --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMaterialTypeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.BaseMaterialType; +import org.dromara.mes.domain.vo.BaseMaterialTypeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 物料类型信息Mapper接口 + * + * @author zangch + * @date 2025-01-07 + */ +public interface BaseMaterialTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMeasurementUnitInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMeasurementUnitInfoMapper.java new file mode 100644 index 0000000..9634aa5 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseMeasurementUnitInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.BaseMeasurementUnitInfo; +import org.dromara.mes.domain.vo.BaseMeasurementUnitInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 计量单位信息Mapper接口 + * + * @author zangch + * @date 2025-01-08 + */ +public interface BaseMeasurementUnitInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseSupplierInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseSupplierInfoMapper.java new file mode 100644 index 0000000..359989d --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseSupplierInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.BaseSupplierInfo; +import org.dromara.mes.domain.vo.BaseSupplierInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 供应商信息Mapper接口 + * + * @author ZangCH + * @date 2025-01-07 + */ +public interface BaseSupplierInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseEqualMaterialInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseEqualMaterialInfoService.java new file mode 100644 index 0000000..aa16271 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseEqualMaterialInfoService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.BaseEqualMaterialInfo; +import org.dromara.mes.domain.vo.BaseEqualMaterialInfoVo; +import org.dromara.mes.domain.bo.BaseEqualMaterialInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 等同物料信息Service接口 + * + * @author zangch + * @date 2025-01-07 + */ +public interface IBaseEqualMaterialInfoService { + + /** + * 查询等同物料信息 + * + * @param equalMaterialInfoId 主键 + * @return 等同物料信息 + */ + BaseEqualMaterialInfoVo queryById(Long equalMaterialInfoId); + + /** + * 分页查询等同物料信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 等同物料信息分页列表 + */ + TableDataInfo queryPageList(BaseEqualMaterialInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的等同物料信息列表 + * + * @param bo 查询条件 + * @return 等同物料信息列表 + */ + List queryList(BaseEqualMaterialInfoBo bo); + + /** + * 新增等同物料信息 + * + * @param bo 等同物料信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BaseEqualMaterialInfoBo bo); + + /** + * 修改等同物料信息 + * + * @param bo 等同物料信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BaseEqualMaterialInfoBo bo); + + /** + * 校验并批量删除等同物料信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMaterialInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMaterialInfoService.java new file mode 100644 index 0000000..e450c17 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMaterialInfoService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.BaseMaterialInfo; +import org.dromara.mes.domain.vo.BaseMaterialInfoVo; +import org.dromara.mes.domain.bo.BaseMaterialInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 物料信息Service接口 + * + * @author zangch + * @date 2025-01-07 + */ +public interface IBaseMaterialInfoService { + + /** + * 查询物料信息 + * + * @param materialId 主键 + * @return 物料信息 + */ + BaseMaterialInfoVo queryById(Long materialId); + + /** + * 分页查询物料信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 物料信息分页列表 + */ + TableDataInfo queryPageList(BaseMaterialInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的物料信息列表 + * + * @param bo 查询条件 + * @return 物料信息列表 + */ + List queryList(BaseMaterialInfoBo bo); + + /** + * 新增物料信息 + * + * @param bo 物料信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BaseMaterialInfoBo bo); + + /** + * 修改物料信息 + * + * @param bo 物料信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BaseMaterialInfoBo bo); + + /** + * 校验并批量删除物料信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMaterialTypeService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMaterialTypeService.java new file mode 100644 index 0000000..f1fcefc --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMaterialTypeService.java @@ -0,0 +1,59 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.BaseMaterialType; +import org.dromara.mes.domain.vo.BaseMaterialTypeVo; +import org.dromara.mes.domain.bo.BaseMaterialTypeBo; + +import java.util.Collection; +import java.util.List; + +/** + * 物料类型信息Service接口 + * + * @author zangch + * @date 2025-01-07 + */ +public interface IBaseMaterialTypeService { + + /** + * 查询物料类型信息 + * + * @param matrialTypeId 主键 + * @return 物料类型信息 + */ + BaseMaterialTypeVo queryById(Long matrialTypeId); + + + /** + * 查询符合条件的物料类型信息列表 + * + * @param bo 查询条件 + * @return 物料类型信息列表 + */ + List queryList(BaseMaterialTypeBo bo); + + /** + * 新增物料类型信息 + * + * @param bo 物料类型信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BaseMaterialTypeBo bo); + + /** + * 修改物料类型信息 + * + * @param bo 物料类型信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BaseMaterialTypeBo bo); + + /** + * 校验并批量删除物料类型信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMeasurementUnitInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMeasurementUnitInfoService.java new file mode 100644 index 0000000..ec923f4 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseMeasurementUnitInfoService.java @@ -0,0 +1,59 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.BaseMeasurementUnitInfo; +import org.dromara.mes.domain.vo.BaseMeasurementUnitInfoVo; +import org.dromara.mes.domain.bo.BaseMeasurementUnitInfoBo; + +import java.util.Collection; +import java.util.List; + +/** + * 计量单位信息Service接口 + * + * @author zangch + * @date 2025-01-08 + */ +public interface IBaseMeasurementUnitInfoService { + + /** + * 查询计量单位信息 + * + * @param unitId 主键 + * @return 计量单位信息 + */ + BaseMeasurementUnitInfoVo queryById(Long unitId); + + + /** + * 查询符合条件的计量单位信息列表 + * + * @param bo 查询条件 + * @return 计量单位信息列表 + */ + List queryList(BaseMeasurementUnitInfoBo bo); + + /** + * 新增计量单位信息 + * + * @param bo 计量单位信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BaseMeasurementUnitInfoBo bo); + + /** + * 修改计量单位信息 + * + * @param bo 计量单位信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BaseMeasurementUnitInfoBo bo); + + /** + * 校验并批量删除计量单位信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseSupplierInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseSupplierInfoService.java new file mode 100644 index 0000000..f2de4a3 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseSupplierInfoService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.BaseSupplierInfo; +import org.dromara.mes.domain.vo.BaseSupplierInfoVo; +import org.dromara.mes.domain.bo.BaseSupplierInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 供应商信息Service接口 + * + * @author ZangCH + * @date 2025-01-07 + */ +public interface IBaseSupplierInfoService { + + /** + * 查询供应商信息 + * + * @param supplierId 主键 + * @return 供应商信息 + */ + BaseSupplierInfoVo queryById(Long supplierId); + + /** + * 分页查询供应商信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 供应商信息分页列表 + */ + TableDataInfo queryPageList(BaseSupplierInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的供应商信息列表 + * + * @param bo 查询条件 + * @return 供应商信息列表 + */ + List queryList(BaseSupplierInfoBo bo); + + /** + * 新增供应商信息 + * + * @param bo 供应商信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BaseSupplierInfoBo bo); + + /** + * 修改供应商信息 + * + * @param bo 供应商信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BaseSupplierInfoBo bo); + + /** + * 校验并批量删除供应商信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java new file mode 100644 index 0000000..8df3baa --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java @@ -0,0 +1,141 @@ +package org.dromara.mes.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.BaseMaterialInfo; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.BaseEqualMaterialInfoBo; +import org.dromara.mes.domain.vo.BaseEqualMaterialInfoVo; +import org.dromara.mes.domain.BaseEqualMaterialInfo; +import org.dromara.mes.mapper.BaseEqualMaterialInfoMapper; +import org.dromara.mes.service.IBaseEqualMaterialInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 等同物料信息Service业务层处理 + * + * @author zangch + * @date 2025-01-07 + */ +@RequiredArgsConstructor +@Service +public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoService { + + private final BaseEqualMaterialInfoMapper baseMapper; + + /** + * 查询等同物料信息 + * + * @param equalMaterialInfoId 主键 + * @return 等同物料信息 + */ + @Override + public BaseEqualMaterialInfoVo queryById(Long equalMaterialInfoId){ + return baseMapper.selectVoById(equalMaterialInfoId); + } + + /** + * 分页查询等同物料信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 等同物料信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BaseEqualMaterialInfoBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的等同物料信息列表 + * + * @param bo 查询条件 + * @return 等同物料信息列表 + */ + @Override + public List queryList(BaseEqualMaterialInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseEqualMaterialInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseEqualMaterialInfo.class) + .selectAll(BaseEqualMaterialInfo.class) + + //关联查询物料名称 + .select(BaseMaterialInfo::getMaterialName) + .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, BaseEqualMaterialInfo::getMaterialId) + + .eq(bo.getEqualMaterialInfoId() != null, BaseEqualMaterialInfo::getEqualMaterialInfoId, bo.getEqualMaterialInfoId()) + .eq(bo.getMaterialId() != null, BaseEqualMaterialInfo::getMaterialId, bo.getMaterialId()) + .eq(bo.getEqualMaterialId() != null, BaseEqualMaterialInfo::getEqualMaterialId, bo.getEqualMaterialId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseEqualMaterialInfo::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(BaseEqualMaterialInfo::getCreateTime); + return lqw; + } + + /** + * 新增等同物料信息 + * + * @param bo 等同物料信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BaseEqualMaterialInfoBo bo) { + BaseEqualMaterialInfo add = MapstructUtils.convert(bo, BaseEqualMaterialInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setEqualMaterialInfoId(add.getEqualMaterialInfoId()); + } + return flag; + } + + /** + * 修改等同物料信息 + * + * @param bo 等同物料信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BaseEqualMaterialInfoBo bo) { + BaseEqualMaterialInfo update = MapstructUtils.convert(bo, BaseEqualMaterialInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseEqualMaterialInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除等同物料信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialInfoServiceImpl.java new file mode 100644 index 0000000..3ba89f5 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialInfoServiceImpl.java @@ -0,0 +1,185 @@ +package org.dromara.mes.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.ProdBaseFactoryInfo; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.BaseMaterialInfoBo; +import org.dromara.mes.domain.vo.BaseMaterialInfoVo; +import org.dromara.mes.domain.BaseMaterialInfo; +import org.dromara.mes.mapper.BaseMaterialInfoMapper; +import org.dromara.mes.service.IBaseMaterialInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 物料信息Service业务层处理 + * + * @author zangch + * @date 2025-01-07 + */ +@RequiredArgsConstructor +@Service +public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService { + + private final BaseMaterialInfoMapper baseMapper; + + /** + * 查询物料信息 + * + * @param materialId 主键 + * @return 物料信息 + */ + @Override + public BaseMaterialInfoVo queryById(Long materialId){ + return baseMapper.selectVoById(materialId); + } + + /** + * 分页查询物料信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 物料信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BaseMaterialInfoBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的物料信息列表 + * + * @param bo 查询条件 + * @return 物料信息列表 + */ + @Override + public List queryList(BaseMaterialInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseMaterialInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseMaterialInfo.class) + .selectAll(BaseMaterialInfo.class) + + .select(ProdBaseFactoryInfo::getFactoryName) + .leftJoin(ProdBaseFactoryInfo.class, ProdBaseFactoryInfo::getFactoryId, BaseMaterialInfo::getFactoryId) + + + .eq(bo.getMaterialId() != null, BaseMaterialInfo::getMaterialId, bo.getMaterialId()) + .eq(StringUtils.isNotBlank(bo.getErpId()), BaseMaterialInfo::getErpId, bo.getErpId()) + .eq(StringUtils.isNotBlank(bo.getMaterialCode()), BaseMaterialInfo::getMaterialCode, bo.getMaterialCode()) + .eq(StringUtils.isNotBlank(bo.getOldMaterialCode()), BaseMaterialInfo::getOldMaterialCode, bo.getOldMaterialCode()) + .like(StringUtils.isNotBlank(bo.getMaterialName()), BaseMaterialInfo::getMaterialName, bo.getMaterialName()) + .eq(bo.getMaterialTypeId() != null, BaseMaterialInfo::getMaterialTypeId, bo.getMaterialTypeId()) + .eq(StringUtils.isNotBlank(bo.getMaterialCategories()), BaseMaterialInfo::getMaterialCategories, bo.getMaterialCategories()) + .eq(StringUtils.isNotBlank(bo.getMaterialSubclass()), BaseMaterialInfo::getMaterialSubclass, bo.getMaterialSubclass()) + .eq(StringUtils.isNotBlank(bo.getBatchFlag()), BaseMaterialInfo::getBatchFlag, bo.getBatchFlag()) + .eq(bo.getBatchAmount() != null, BaseMaterialInfo::getBatchAmount, bo.getBatchAmount()) + .eq(bo.getMaterialUnitId() != null, BaseMaterialInfo::getMaterialUnitId, bo.getMaterialUnitId()) + .eq(StringUtils.isNotBlank(bo.getMaterialUnit()), BaseMaterialInfo::getMaterialUnit, bo.getMaterialUnit()) + .eq(StringUtils.isNotBlank(bo.getMaterialMatkl()), BaseMaterialInfo::getMaterialMatkl, bo.getMaterialMatkl()) + .eq(StringUtils.isNotBlank(bo.getMaterialSpec()), BaseMaterialInfo::getMaterialSpec, bo.getMaterialSpec()) + .eq(bo.getNetWeight() != null, BaseMaterialInfo::getNetWeight, bo.getNetWeight()) + .eq(bo.getGrossWeight() != null, BaseMaterialInfo::getGrossWeight, bo.getGrossWeight()) + .eq(StringUtils.isNotBlank(bo.getAlwaysFlag()), BaseMaterialInfo::getAlwaysFlag, bo.getAlwaysFlag()) + .eq(bo.getFactoryId() != null, BaseMaterialInfo::getFactoryId, bo.getFactoryId()) + .eq(bo.getCreateOrgId() != null, BaseMaterialInfo::getCreateOrgId, bo.getCreateOrgId()) + .eq(bo.getUseOrgId() != null, BaseMaterialInfo::getUseOrgId, bo.getUseOrgId()) + .eq(bo.getProdLineId() != null, BaseMaterialInfo::getProdLineId, bo.getProdLineId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseMaterialInfo::getActiveFlag, bo.getActiveFlag()) + .eq(StringUtils.isNotBlank(bo.getDeletedFlag()), BaseMaterialInfo::getDeletedFlag, bo.getDeletedFlag()) + .eq(bo.getPurchasePriceUnitId() != null, BaseMaterialInfo::getPurchasePriceUnitId, bo.getPurchasePriceUnitId()) + .between(params.get("beginApproveDate") != null && params.get("endApproveDate") != null, + BaseMaterialInfo::getApproveDate ,params.get("beginApproveDate"), params.get("endApproveDate")) + .eq(bo.getErpModifyDate() != null, BaseMaterialInfo::getErpModifyDate, bo.getErpModifyDate()) + .eq(bo.getMaxStockAmount() != null, BaseMaterialInfo::getMaxStockAmount, bo.getMaxStockAmount()) + .eq(bo.getMinStockAmount() != null, BaseMaterialInfo::getMinStockAmount, bo.getMinStockAmount()) + .eq(bo.getSafeStockAmount() != null, BaseMaterialInfo::getSafeStockAmount, bo.getSafeStockAmount()) + .eq(StringUtils.isNotBlank(bo.getApplyFlag()), BaseMaterialInfo::getApplyFlag, bo.getApplyFlag()) + .eq(StringUtils.isNotBlank(bo.getMaterialClassfication()), BaseMaterialInfo::getMaterialClassfication, bo.getMaterialClassfication()) + .eq(StringUtils.isNotBlank(bo.getAutoOutstockFlag()), BaseMaterialInfo::getAutoOutstockFlag, bo.getAutoOutstockFlag()) + .eq(StringUtils.isNotBlank(bo.getAccessoriesFlag()), BaseMaterialInfo::getAccessoriesFlag, bo.getAccessoriesFlag()) + .eq(StringUtils.isNotBlank(bo.getLowValueConsumableFlag()), BaseMaterialInfo::getLowValueConsumableFlag, bo.getLowValueConsumableFlag()) + .eq(StringUtils.isNotBlank(bo.getBrand()), BaseMaterialInfo::getBrand, bo.getBrand()) + .eq(StringUtils.isNotBlank(bo.getPlyrating()), BaseMaterialInfo::getPlyrating, bo.getPlyrating()) + .eq(StringUtils.isNotBlank(bo.getPattern()), BaseMaterialInfo::getPattern, bo.getPattern()) + .eq(StringUtils.isNotBlank(bo.getSpeedLevel()), BaseMaterialInfo::getSpeedLevel, bo.getSpeedLevel()) + .eq(StringUtils.isNotBlank(bo.getLoad()), BaseMaterialInfo::getLoad, bo.getLoad()) + .eq(StringUtils.isNotBlank(bo.getTireMarkings()), BaseMaterialInfo::getTireMarkings, bo.getTireMarkings()) + .eq(bo.getMinParkingTime() != null, BaseMaterialInfo::getMinParkingTime, bo.getMinParkingTime()) + .eq(bo.getMaxParkingTime() != null, BaseMaterialInfo::getMaxParkingTime, bo.getMaxParkingTime()) + .eq(bo.getStandardWeight() != null, BaseMaterialInfo::getStandardWeight, bo.getStandardWeight()) + .eq(bo.getWeightUpperLimit() != null, BaseMaterialInfo::getWeightUpperLimit, bo.getWeightUpperLimit()) + .eq(bo.getWeightLowerLimit() != null, BaseMaterialInfo::getWeightLowerLimit, bo.getWeightLowerLimit()) + .eq(StringUtils.isNotBlank(bo.getInnerTubeFlag()), BaseMaterialInfo::getInnerTubeFlag, bo.getInnerTubeFlag()) + .eq(StringUtils.isNotBlank(bo.getSaleType()), BaseMaterialInfo::getSaleType, bo.getSaleType()) + .orderByDesc(BaseMaterialInfo::getCreateTime); + return lqw; + } + + /** + * 新增物料信息 + * + * @param bo 物料信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BaseMaterialInfoBo bo) { + BaseMaterialInfo add = MapstructUtils.convert(bo, BaseMaterialInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMaterialId(add.getMaterialId()); + } + return flag; + } + + /** + * 修改物料信息 + * + * @param bo 物料信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BaseMaterialInfoBo bo) { + BaseMaterialInfo update = MapstructUtils.convert(bo, BaseMaterialInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseMaterialInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除物料信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java new file mode 100644 index 0000000..7a3ec4e --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.mes.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.ProdBaseProcessInfo; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.BaseMaterialTypeBo; +import org.dromara.mes.domain.vo.BaseMaterialTypeVo; +import org.dromara.mes.domain.BaseMaterialType; +import org.dromara.mes.mapper.BaseMaterialTypeMapper; +import org.dromara.mes.service.IBaseMaterialTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 物料类型信息Service业务层处理 + * + * @author zangch + * @date 2025-01-07 + */ +@RequiredArgsConstructor +@Service +public class BaseMaterialTypeServiceImpl implements IBaseMaterialTypeService { + + private final BaseMaterialTypeMapper baseMapper; + + /** + * 查询物料类型信息 + * + * @param matrialTypeId 主键 + * @return 物料类型信息 + */ + @Override + public BaseMaterialTypeVo queryById(Long matrialTypeId){ + return baseMapper.selectVoById(matrialTypeId); + } + + + /** + * 查询符合条件的物料类型信息列表 + * + * @param bo 查询条件 + * @return 物料类型信息列表 + */ + @Override + public List queryList(BaseMaterialTypeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseMaterialTypeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseMaterialType.class) + + // 关联查询工序名称 + .select(ProdBaseProcessInfo::getProcessName) + .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, BaseMaterialType::getProcessId) + + .selectAll(BaseMaterialType.class) + .eq(bo.getMatrialTypeId() != null, BaseMaterialType::getMatrialTypeId, bo.getMatrialTypeId()) + .eq(bo.getParentId() != null, BaseMaterialType::getParentId, bo.getParentId()) + .eq(StringUtils.isNotBlank(bo.getMatrialTypeCode()), BaseMaterialType::getMatrialTypeCode, bo.getMatrialTypeCode()) + .like(StringUtils.isNotBlank(bo.getMatrialTypeName()), BaseMaterialType::getMatrialTypeName, bo.getMatrialTypeName()) + .eq(StringUtils.isNotBlank(bo.getAncestors()), BaseMaterialType::getAncestors, bo.getAncestors()) + .eq(StringUtils.isNotBlank(bo.getMaterialCategories()), BaseMaterialType::getMaterialCategories, bo.getMaterialCategories()) + .eq(StringUtils.isNotBlank(bo.getMaterialSubclass()), BaseMaterialType::getMaterialSubclass, bo.getMaterialSubclass()) + .eq(bo.getProcessId() != null, BaseMaterialType::getProcessId, bo.getProcessId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseMaterialType::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(BaseMaterialType::getCreateTime); + return lqw; + } + + /** + * 新增物料类型信息 + * + * @param bo 物料类型信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BaseMaterialTypeBo bo) { + BaseMaterialType add = MapstructUtils.convert(bo, BaseMaterialType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMatrialTypeId(add.getMatrialTypeId()); + } + return flag; + } + + /** + * 修改物料类型信息 + * + * @param bo 物料类型信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BaseMaterialTypeBo bo) { + BaseMaterialType update = MapstructUtils.convert(bo, BaseMaterialType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseMaterialType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除物料类型信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMeasurementUnitInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMeasurementUnitInfoServiceImpl.java new file mode 100644 index 0000000..6494260 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMeasurementUnitInfoServiceImpl.java @@ -0,0 +1,123 @@ +package org.dromara.mes.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.BaseMeasurementUnitInfoBo; +import org.dromara.mes.domain.vo.BaseMeasurementUnitInfoVo; +import org.dromara.mes.domain.BaseMeasurementUnitInfo; +import org.dromara.mes.mapper.BaseMeasurementUnitInfoMapper; +import org.dromara.mes.service.IBaseMeasurementUnitInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 计量单位信息Service业务层处理 + * + * @author zangch + * @date 2025-01-08 + */ +@RequiredArgsConstructor +@Service +public class BaseMeasurementUnitInfoServiceImpl implements IBaseMeasurementUnitInfoService { + + private final BaseMeasurementUnitInfoMapper baseMapper; + + /** + * 查询计量单位信息 + * + * @param unitId 主键 + * @return 计量单位信息 + */ + @Override + public BaseMeasurementUnitInfoVo queryById(Long unitId){ + return baseMapper.selectVoById(unitId); + } + + + /** + * 查询符合条件的计量单位信息列表 + * + * @param bo 查询条件 + * @return 计量单位信息列表 + */ + @Override + public List queryList(BaseMeasurementUnitInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseMeasurementUnitInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseMeasurementUnitInfo.class) + .selectAll(BaseMeasurementUnitInfo.class) + .eq(bo.getUnitId() != null, BaseMeasurementUnitInfo::getUnitId, bo.getUnitId()) + .eq(bo.getParentId() != null, BaseMeasurementUnitInfo::getParentId, bo.getParentId()) + .eq(StringUtils.isNotBlank(bo.getUnitCode()), BaseMeasurementUnitInfo::getUnitCode, bo.getUnitCode()) + .like(StringUtils.isNotBlank(bo.getUnitName()), BaseMeasurementUnitInfo::getUnitName, bo.getUnitName()) + .eq(bo.getUnitConversion() != null, BaseMeasurementUnitInfo::getUnitConversion, bo.getUnitConversion()) + .eq(StringUtils.isNotBlank(bo.getAncestors()), BaseMeasurementUnitInfo::getAncestors, bo.getAncestors()) + .eq(StringUtils.isNotBlank(bo.getUnitType()), BaseMeasurementUnitInfo::getUnitType, bo.getUnitType()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseMeasurementUnitInfo::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(BaseMeasurementUnitInfo::getCreateTime); + return lqw; + } + + /** + * 新增计量单位信息 + * + * @param bo 计量单位信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BaseMeasurementUnitInfoBo bo) { + BaseMeasurementUnitInfo add = MapstructUtils.convert(bo, BaseMeasurementUnitInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setUnitId(add.getUnitId()); + } + return flag; + } + + /** + * 修改计量单位信息 + * + * @param bo 计量单位信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BaseMeasurementUnitInfoBo bo) { + BaseMeasurementUnitInfo update = MapstructUtils.convert(bo, BaseMeasurementUnitInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseMeasurementUnitInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除计量单位信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseSupplierInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseSupplierInfoServiceImpl.java new file mode 100644 index 0000000..9185a33 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseSupplierInfoServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.mes.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.BaseSupplierInfoBo; +import org.dromara.mes.domain.vo.BaseSupplierInfoVo; +import org.dromara.mes.domain.BaseSupplierInfo; +import org.dromara.mes.mapper.BaseSupplierInfoMapper; +import org.dromara.mes.service.IBaseSupplierInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 供应商信息Service业务层处理 + * + * @author ZangCH + * @date 2025-01-07 + */ +@RequiredArgsConstructor +@Service +public class BaseSupplierInfoServiceImpl implements IBaseSupplierInfoService { + + private final BaseSupplierInfoMapper baseMapper; + + /** + * 查询供应商信息 + * + * @param supplierId 主键 + * @return 供应商信息 + */ + @Override + public BaseSupplierInfoVo queryById(Long supplierId){ + return baseMapper.selectVoById(supplierId); + } + + /** + * 分页查询供应商信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 供应商信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BaseSupplierInfoBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的供应商信息列表 + * + * @param bo 查询条件 + * @return 供应商信息列表 + */ + @Override + public List queryList(BaseSupplierInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseSupplierInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseSupplierInfo.class) + .selectAll(BaseSupplierInfo.class) + .eq(bo.getSupplierId() != null, BaseSupplierInfo::getSupplierId, bo.getSupplierId()) + .eq(StringUtils.isNotBlank(bo.getSupplierCode()), BaseSupplierInfo::getSupplierCode, bo.getSupplierCode()) + .like(StringUtils.isNotBlank(bo.getSupplierName()), BaseSupplierInfo::getSupplierName, bo.getSupplierName()) + .eq(bo.getErpId() != null, BaseSupplierInfo::getErpId, bo.getErpId()) + .eq(StringUtils.isNotBlank(bo.getSupplierStatus()), BaseSupplierInfo::getSupplierStatus, bo.getSupplierStatus()) + .between(params.get("beginAuditDate") != null && params.get("endAuditDate") != null, + BaseSupplierInfo::getAuditDate ,params.get("beginAuditDate"), params.get("endAuditDate")) + .between(params.get("beginErpModifyDate") != null && params.get("endErpModifyDate") != null, + BaseSupplierInfo::getErpModifyDate ,params.get("beginErpModifyDate"), params.get("endErpModifyDate")) + .orderByDesc(BaseSupplierInfo::getCreateTime); + return lqw; + } + + /** + * 新增供应商信息 + * + * @param bo 供应商信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BaseSupplierInfoBo bo) { + BaseSupplierInfo add = MapstructUtils.convert(bo, BaseSupplierInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSupplierId(add.getSupplierId()); + } + return flag; + } + + /** + * 修改供应商信息 + * + * @param bo 供应商信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BaseSupplierInfoBo bo) { + BaseSupplierInfo update = MapstructUtils.convert(bo, BaseSupplierInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseSupplierInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除供应商信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseEqualMaterialInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseEqualMaterialInfoMapper.xml new file mode 100644 index 0000000..73278da --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseEqualMaterialInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMaterialInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMaterialInfoMapper.xml new file mode 100644 index 0000000..29a3a4e --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMaterialInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMaterialTypeMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMaterialTypeMapper.xml new file mode 100644 index 0000000..1146706 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMaterialTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMeasurementUnitInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMeasurementUnitInfoMapper.xml new file mode 100644 index 0000000..688cde7 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseMeasurementUnitInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseSupplierInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseSupplierInfoMapper.xml new file mode 100644 index 0000000..25a3841 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseSupplierInfoMapper.xml @@ -0,0 +1,7 @@ + + + + +