diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java index e131f5dc..e3e37374 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java @@ -28,133 +28,111 @@ public class WmsRawMaterialBo extends BaseEntity { /** * 原材料编号 */ - @NotBlank(message = "原材料编号不能为空", groups = { AddGroup.class, EditGroup.class }) private String rawMaterialCode; /** * 原材料名称 */ - @NotBlank(message = "原材料名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String rawMaterialName; /** * 钢种/牌号(如SPHC、SPHE、S350GD等) */ - @NotBlank(message = "钢种/牌号(如SPHC、SPHE、S350GD等)不能为空", groups = { AddGroup.class, EditGroup.class }) private String steelGrade; /** * 目标冷轧牌号(如SPCC、DC06、SGCC等) */ - @NotBlank(message = "目标冷轧牌号(如SPCC、DC06、SGCC等)不能为空", groups = { AddGroup.class, EditGroup.class }) private String targetColdGrade; /** * 基础材质分类ID */ - @NotNull(message = "基础材质分类ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long baseMaterialId; /** * 表面处理分类ID */ - @NotNull(message = "表面处理分类ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long surfaceTreatmentId; /** * 厚度(mm) */ - @NotNull(message = "厚度(mm)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal thickness; /** * 厚度偏差(mm) */ - @NotNull(message = "厚度偏差(mm)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal thicknessDeviation; /** * 宽度(mm) */ - @NotNull(message = "宽度(mm)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal width; /** * 目标冷轧宽度(mm) */ - @NotNull(message = "目标冷轧宽度(mm)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetColdWidth; /** * 目标冷轧厚度(mm) */ - @NotNull(message = "目标冷轧厚度(mm)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetColdThickness; /** * 凸度(mm) */ - @NotNull(message = "凸度(mm)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal crown; /** * 卷重(kg) */ - @NotNull(message = "卷重(kg)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal coilWeight; /** * 表面质量 */ - @NotBlank(message = "表面质量不能为空", groups = { AddGroup.class, EditGroup.class }) private String surfaceQuality; /** * 硬度(HV5) */ - @NotNull(message = "硬度(HV5)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal hardnessHv5; /** * 硬度差值(HV5差值≤15为合格) */ - @NotNull(message = "硬度差值(HV5差值≤15为合格)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal hardnessDiff; /** * 锰含量Mn(%) */ - @NotNull(message = "锰含量Mn(%)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal compositionMn; /** * 磷含量P(%) */ - @NotNull(message = "磷含量P(%)不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal compositionP; /** * 晶粒级别(如ASTM 6-8级,仅电工钢) */ - @NotBlank(message = "晶粒级别(如ASTM 6-8级,仅电工钢)不能为空", groups = { AddGroup.class, EditGroup.class }) private String grainSize; /** * 头尾切除标记(0=否,1=是,汽车板专用) */ - @NotNull(message = "头尾切除标记(0=否,1=是,汽车板专用)不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer headTailCutFlag; /** * 检测结论(如合格/条纹/微裂纹/成分偏析等) */ - @NotBlank(message = "检测结论(如合格/条纹/微裂纹/成分偏析等)不能为空", groups = { AddGroup.class, EditGroup.class }) private String inspectionResult; /** * 是否启用(0=否,1=是) */ - @NotNull(message = "是否启用(0=否,1=是)不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer isEnabled; /** diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java index 7c36b4f4..5ba8310b 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java @@ -3,7 +3,6 @@ package com.klp.mapper; import com.klp.domain.WmsOrderDetail; import com.klp.domain.vo.WmsOrderDetailVo; import com.klp.common.core.mapper.BaseMapperPlus; - import java.util.List; /** @@ -18,4 +17,5 @@ public interface WmsOrderDetailMapper extends BaseMapperPlus selectVoListByOrderId(Long orderId); + } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java index 05124102..94449833 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java @@ -58,11 +58,6 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService { return baseMapper.selectVoList(lqw); } - @Override - public List queryListByOrderId(Long orderId) { - return baseMapper.selectVoListByOrderId(orderId); - } - private LambdaQueryWrapper buildQueryWrapper(WmsOrderDetailBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); @@ -114,4 +109,12 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService { } return baseMapper.deleteBatchIds(ids) > 0; } + + /** + * 查询订单明细列表 + */ + @Override + public List queryListByOrderId(Long orderId) { + return baseMapper.selectVoListByOrderId(orderId); + } }