add(hwmom-mes): 添加等同物料信息和物料信息相关功能,添加供应商相关功能,添加计量单位信息相关功能

master
zch 6 months ago
parent 9de0c66d40
commit f7e072e180

@ -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<BaseEqualMaterialInfoVo> 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<BaseEqualMaterialInfoVo> list = baseEqualMaterialInfoService.queryList(bo);
ExcelUtil.exportExcel(list, "等同物料信息", BaseEqualMaterialInfoVo.class, response);
}
/**
*
*
* @param equalMaterialInfoId
*/
@SaCheckPermission("mes:baseEqualMaterialInfo:query")
@GetMapping("/{equalMaterialInfoId}")
public R<BaseEqualMaterialInfoVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] equalMaterialInfoIds) {
return toAjax(baseEqualMaterialInfoService.deleteWithValidByIds(List.of(equalMaterialInfoIds), true));
}
/**
*
*/
@GetMapping("getBaseEqualMaterialInfoList")
public R<List<BaseEqualMaterialInfoVo>> getBaseEqualMaterialInfolist(BaseEqualMaterialInfoBo bo) {
List<BaseEqualMaterialInfoVo> list = baseEqualMaterialInfoService.queryList(bo);
return R.ok(list);
}
}

@ -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<BaseMaterialInfoVo> 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<BaseMaterialInfoVo> list = baseMaterialInfoService.queryList(bo);
ExcelUtil.exportExcel(list, "物料信息", BaseMaterialInfoVo.class, response);
}
/**
*
*
* @param materialId
*/
@SaCheckPermission("mes:baseMaterialInfo:query")
@GetMapping("/{materialId}")
public R<BaseMaterialInfoVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] materialIds) {
return toAjax(baseMaterialInfoService.deleteWithValidByIds(List.of(materialIds), true));
}
/**
*
*/
@GetMapping("getBaseMaterialInfoList")
public R<List<BaseMaterialInfoVo>> getBaseMaterialInfolist(BaseMaterialInfoBo bo) {
List<BaseMaterialInfoVo> list = baseMaterialInfoService.queryList(bo);
return R.ok(list);
}
}

@ -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<BaseMaterialTypeVo>> list(BaseMaterialTypeBo bo) {
List<BaseMaterialTypeVo> 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<BaseMaterialTypeVo> list = baseMaterialTypeService.queryList(bo);
ExcelUtil.exportExcel(list, "物料类型信息", BaseMaterialTypeVo.class, response);
}
/**
*
*
* @param matrialTypeId
*/
@SaCheckPermission("mes:baseMaterialType:query")
@GetMapping("/{matrialTypeId}")
public R<BaseMaterialTypeVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] matrialTypeIds) {
return toAjax(baseMaterialTypeService.deleteWithValidByIds(List.of(matrialTypeIds), true));
}
/**
*
*/
@GetMapping("getBaseMaterialTypeList")
public R<List<BaseMaterialTypeVo>> getBaseMaterialTypelist(BaseMaterialTypeBo bo) {
List<BaseMaterialTypeVo> list = baseMaterialTypeService.queryList(bo);
return R.ok(list);
}
}

@ -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<BaseMeasurementUnitInfoVo>> list(BaseMeasurementUnitInfoBo bo) {
List<BaseMeasurementUnitInfoVo> 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<BaseMeasurementUnitInfoVo> list = baseMeasurementUnitInfoService.queryList(bo);
ExcelUtil.exportExcel(list, "计量单位信息", BaseMeasurementUnitInfoVo.class, response);
}
/**
*
*
* @param unitId
*/
@SaCheckPermission("mes:baseMeasurementUnitInfo:query")
@GetMapping("/{unitId}")
public R<BaseMeasurementUnitInfoVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] unitIds) {
return toAjax(baseMeasurementUnitInfoService.deleteWithValidByIds(List.of(unitIds), true));
}
/**
*
*/
@GetMapping("getBaseMeasurementUnitInfoList")
public R<List<BaseMeasurementUnitInfoVo>> getBaseMeasurementUnitInfolist(BaseMeasurementUnitInfoBo bo) {
List<BaseMeasurementUnitInfoVo> list = baseMeasurementUnitInfoService.queryList(bo);
return R.ok(list);
}
}

@ -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<BaseSupplierInfoVo> 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<BaseSupplierInfoVo> list = baseSupplierInfoService.queryList(bo);
ExcelUtil.exportExcel(list, "供应商信息", BaseSupplierInfoVo.class, response);
}
/**
*
*
* @param supplierId
*/
@SaCheckPermission("mes:baseSupplierInfo:query")
@GetMapping("/{supplierId}")
public R<BaseSupplierInfoVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] supplierIds) {
return toAjax(baseSupplierInfoService.deleteWithValidByIds(List.of(supplierIds), true));
}
/**
*
*/
@GetMapping("getBaseSupplierInfoList")
public R<List<BaseSupplierInfoVo>> getBaseSupplierInfolist(BaseSupplierInfoBo bo) {
List<BaseSupplierInfoVo> list = baseSupplierInfoService.queryList(bo);
return R.ok(list);
}
}

@ -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;//映射字段
}

@ -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; //映射字段
}

@ -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;//映射字段
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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<BaseEqualMaterialInfo, BaseEqualMaterialInfoVo> {
}

@ -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<BaseMaterialInfo, BaseMaterialInfoVo> {
}

@ -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<BaseMaterialType, BaseMaterialTypeVo> {
}

@ -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<BaseMeasurementUnitInfo, BaseMeasurementUnitInfoVo> {
}

@ -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<BaseSupplierInfo, BaseSupplierInfoVo> {
}

@ -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<BaseEqualMaterialInfoVo> queryPageList(BaseEqualMaterialInfoBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<BaseEqualMaterialInfoVo> 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<Long> ids, Boolean isValid);
}

@ -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<BaseMaterialInfoVo> queryPageList(BaseMaterialInfoBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<BaseMaterialInfoVo> 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<Long> ids, Boolean isValid);
}

@ -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<BaseMaterialTypeVo> 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<Long> ids, Boolean isValid);
}

@ -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<BaseMeasurementUnitInfoVo> 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<Long> ids, Boolean isValid);
}

@ -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<BaseSupplierInfoVo> queryPageList(BaseSupplierInfoBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<BaseSupplierInfoVo> 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<Long> ids, Boolean isValid);
}

@ -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<BaseEqualMaterialInfoVo> queryPageList(BaseEqualMaterialInfoBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<BaseEqualMaterialInfo> lqw = buildQueryWrapper(bo);
Page<BaseEqualMaterialInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<BaseEqualMaterialInfoVo> queryList(BaseEqualMaterialInfoBo bo) {
MPJLambdaWrapper<BaseEqualMaterialInfo> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<BaseEqualMaterialInfo> buildQueryWrapper(BaseEqualMaterialInfoBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseEqualMaterialInfo> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -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<BaseMaterialInfoVo> queryPageList(BaseMaterialInfoBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<BaseMaterialInfo> lqw = buildQueryWrapper(bo);
Page<BaseMaterialInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<BaseMaterialInfoVo> queryList(BaseMaterialInfoBo bo) {
MPJLambdaWrapper<BaseMaterialInfo> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<BaseMaterialInfo> buildQueryWrapper(BaseMaterialInfoBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseMaterialInfo> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -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<BaseMaterialTypeVo> queryList(BaseMaterialTypeBo bo) {
MPJLambdaWrapper<BaseMaterialType> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<BaseMaterialType> buildQueryWrapper(BaseMaterialTypeBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseMaterialType> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -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<BaseMeasurementUnitInfoVo> queryList(BaseMeasurementUnitInfoBo bo) {
MPJLambdaWrapper<BaseMeasurementUnitInfo> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<BaseMeasurementUnitInfo> buildQueryWrapper(BaseMeasurementUnitInfoBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseMeasurementUnitInfo> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -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<BaseSupplierInfoVo> queryPageList(BaseSupplierInfoBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<BaseSupplierInfo> lqw = buildQueryWrapper(bo);
Page<BaseSupplierInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<BaseSupplierInfoVo> queryList(BaseSupplierInfoBo bo) {
MPJLambdaWrapper<BaseSupplierInfo> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<BaseSupplierInfo> buildQueryWrapper(BaseSupplierInfoBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseSupplierInfo> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.mes.mapper.BaseEqualMaterialInfoMapper">
</mapper>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.mes.mapper.BaseMaterialInfoMapper">
</mapper>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.mes.mapper.BaseMaterialTypeMapper">
</mapper>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.mes.mapper.BaseMeasurementUnitInfoMapper">
</mapper>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.mes.mapper.BaseSupplierInfoMapper">
</mapper>
Loading…
Cancel
Save