去掉原材料数据校验

This commit is contained in:
JR
2025-07-18 15:36:05 +08:00
parent c2d4e09955
commit ff8c174b8e
3 changed files with 9 additions and 28 deletions

View File

@@ -28,133 +28,111 @@ public class WmsRawMaterialBo extends BaseEntity {
/** /**
* 原材料编号 * 原材料编号
*/ */
@NotBlank(message = "原材料编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String rawMaterialCode; private String rawMaterialCode;
/** /**
* 原材料名称 * 原材料名称
*/ */
@NotBlank(message = "原材料名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String rawMaterialName; private String rawMaterialName;
/** /**
* 钢种/牌号如SPHC、SPHE、S350GD等 * 钢种/牌号如SPHC、SPHE、S350GD等
*/ */
@NotBlank(message = "钢种/牌号如SPHC、SPHE、S350GD等不能为空", groups = { AddGroup.class, EditGroup.class })
private String steelGrade; private String steelGrade;
/** /**
* 目标冷轧牌号如SPCC、DC06、SGCC等 * 目标冷轧牌号如SPCC、DC06、SGCC等
*/ */
@NotBlank(message = "目标冷轧牌号如SPCC、DC06、SGCC等不能为空", groups = { AddGroup.class, EditGroup.class })
private String targetColdGrade; private String targetColdGrade;
/** /**
* 基础材质分类ID * 基础材质分类ID
*/ */
@NotNull(message = "基础材质分类ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long baseMaterialId; private Long baseMaterialId;
/** /**
* 表面处理分类ID * 表面处理分类ID
*/ */
@NotNull(message = "表面处理分类ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long surfaceTreatmentId; private Long surfaceTreatmentId;
/** /**
* 厚度mm * 厚度mm
*/ */
@NotNull(message = "厚度mm不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal thickness; private BigDecimal thickness;
/** /**
* 厚度偏差mm * 厚度偏差mm
*/ */
@NotNull(message = "厚度偏差mm不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal thicknessDeviation; private BigDecimal thicknessDeviation;
/** /**
* 宽度mm * 宽度mm
*/ */
@NotNull(message = "宽度mm不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal width; private BigDecimal width;
/** /**
* 目标冷轧宽度mm * 目标冷轧宽度mm
*/ */
@NotNull(message = "目标冷轧宽度mm不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal targetColdWidth; private BigDecimal targetColdWidth;
/** /**
* 目标冷轧厚度mm * 目标冷轧厚度mm
*/ */
@NotNull(message = "目标冷轧厚度mm不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal targetColdThickness; private BigDecimal targetColdThickness;
/** /**
* 凸度mm * 凸度mm
*/ */
@NotNull(message = "凸度mm不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal crown; private BigDecimal crown;
/** /**
* 卷重kg * 卷重kg
*/ */
@NotNull(message = "卷重kg不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal coilWeight; private BigDecimal coilWeight;
/** /**
* 表面质量 * 表面质量
*/ */
@NotBlank(message = "表面质量不能为空", groups = { AddGroup.class, EditGroup.class })
private String surfaceQuality; private String surfaceQuality;
/** /**
* 硬度HV5 * 硬度HV5
*/ */
@NotNull(message = "硬度HV5不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal hardnessHv5; private BigDecimal hardnessHv5;
/** /**
* 硬度差值HV5差值≤15为合格 * 硬度差值HV5差值≤15为合格
*/ */
@NotNull(message = "硬度差值HV5差值≤15为合格不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal hardnessDiff; private BigDecimal hardnessDiff;
/** /**
* 锰含量Mn% * 锰含量Mn%
*/ */
@NotNull(message = "锰含量Mn%)不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal compositionMn; private BigDecimal compositionMn;
/** /**
* 磷含量P% * 磷含量P%
*/ */
@NotNull(message = "磷含量P%)不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal compositionP; private BigDecimal compositionP;
/** /**
* 晶粒级别如ASTM 6-8级仅电工钢 * 晶粒级别如ASTM 6-8级仅电工钢
*/ */
@NotBlank(message = "晶粒级别如ASTM 6-8级仅电工钢不能为空", groups = { AddGroup.class, EditGroup.class })
private String grainSize; private String grainSize;
/** /**
* 头尾切除标记0=否1=是,汽车板专用) * 头尾切除标记0=否1=是,汽车板专用)
*/ */
@NotNull(message = "头尾切除标记0=否1=是,汽车板专用)不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer headTailCutFlag; private Integer headTailCutFlag;
/** /**
* 检测结论(如合格/条纹/微裂纹/成分偏析等) * 检测结论(如合格/条纹/微裂纹/成分偏析等)
*/ */
@NotBlank(message = "检测结论(如合格/条纹/微裂纹/成分偏析等)不能为空", groups = { AddGroup.class, EditGroup.class })
private String inspectionResult; private String inspectionResult;
/** /**
* 是否启用0=否1=是) * 是否启用0=否1=是)
*/ */
@NotNull(message = "是否启用0=否1=是)不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer isEnabled; private Integer isEnabled;
/** /**

View File

@@ -3,7 +3,6 @@ package com.klp.mapper;
import com.klp.domain.WmsOrderDetail; import com.klp.domain.WmsOrderDetail;
import com.klp.domain.vo.WmsOrderDetailVo; import com.klp.domain.vo.WmsOrderDetailVo;
import com.klp.common.core.mapper.BaseMapperPlus; import com.klp.common.core.mapper.BaseMapperPlus;
import java.util.List; import java.util.List;
/** /**
@@ -18,4 +17,5 @@ public interface WmsOrderDetailMapper extends BaseMapperPlus<WmsOrderDetailMappe
* 根据订单ID查询订单明细VO列表 * 根据订单ID查询订单明细VO列表
*/ */
List<WmsOrderDetailVo> selectVoListByOrderId(Long orderId); List<WmsOrderDetailVo> selectVoListByOrderId(Long orderId);
} }

View File

@@ -58,11 +58,6 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService {
return baseMapper.selectVoList(lqw); return baseMapper.selectVoList(lqw);
} }
@Override
public List<WmsOrderDetailVo> queryListByOrderId(Long orderId) {
return baseMapper.selectVoListByOrderId(orderId);
}
private LambdaQueryWrapper<WmsOrderDetail> buildQueryWrapper(WmsOrderDetailBo bo) { private LambdaQueryWrapper<WmsOrderDetail> buildQueryWrapper(WmsOrderDetailBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsOrderDetail> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<WmsOrderDetail> lqw = Wrappers.lambdaQuery();
@@ -114,4 +109,12 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService {
} }
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
} }
/**
* 查询订单明细列表
*/
@Override
public List<WmsOrderDetailVo> queryListByOrderId(Long orderId) {
return baseMapper.selectVoListByOrderId(orderId);
}
} }