feat(wms): 继承BaseEntity并优化BOM默认属性创建逻辑
- WmsMaterialCoilVo类继承BaseEntity以支持基础字段 - 合并产品和原料的厚度、宽度为规格字段 - 调整默认BOM属性创建方法中的字段组合方式 - 清理冗余空行,优化代码结构可读性
This commit is contained in:
@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
|||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import com.klp.common.annotation.ExcelDictFormat;
|
import com.klp.common.annotation.ExcelDictFormat;
|
||||||
import com.klp.common.convert.ExcelDictConvert;
|
import com.klp.common.convert.ExcelDictConvert;
|
||||||
|
import com.klp.common.core.domain.BaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -17,7 +18,7 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@ExcelIgnoreUnannotated
|
@ExcelIgnoreUnannotated
|
||||||
public class WmsMaterialCoilVo {
|
public class WmsMaterialCoilVo extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
|||||||
@@ -128,16 +128,14 @@ public class WmsProductServiceImpl implements IWmsProductService {
|
|||||||
if ("产品".equals(type)) {
|
if ("产品".equals(type)) {
|
||||||
// 产品默认属性(根据截图)
|
// 产品默认属性(根据截图)
|
||||||
defaultAttrs = Arrays.asList(
|
defaultAttrs = Arrays.asList(
|
||||||
new String[]{"厚度", "0.6"},
|
new String[]{"规格", "1250 * 0.6"},
|
||||||
new String[]{"宽度", "1250"},
|
|
||||||
new String[]{"材质", "SPCC"},
|
new String[]{"材质", "SPCC"},
|
||||||
new String[]{"表面处理", "涂油"}
|
new String[]{"表面处理", "涂油"}
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
// 原料默认属性(根据截图)
|
// 原料默认属性(根据截图)
|
||||||
defaultAttrs = Arrays.asList(
|
defaultAttrs = Arrays.asList(
|
||||||
new String[]{"宽度", "1265"},
|
new String[]{"规格", "1265 * 4"},
|
||||||
new String[]{"厚度", "4"},
|
|
||||||
new String[]{"材质", "Q195L"},
|
new String[]{"材质", "Q195L"},
|
||||||
new String[]{"厂家", "天铁"}
|
new String[]{"厂家", "天铁"}
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -238,16 +238,14 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
|
|||||||
if ("产品".equals(type)) {
|
if ("产品".equals(type)) {
|
||||||
// 产品默认属性(根据截图)
|
// 产品默认属性(根据截图)
|
||||||
defaultAttrs = Arrays.asList(
|
defaultAttrs = Arrays.asList(
|
||||||
new String[]{"厚度", "0.6"},
|
new String[]{"规格", "1250 * 0.6"},
|
||||||
new String[]{"宽度", "1250"},
|
|
||||||
new String[]{"材质", "SPCC"},
|
new String[]{"材质", "SPCC"},
|
||||||
new String[]{"表面处理", "涂油"}
|
new String[]{"表面处理", "涂油"}
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
// 原料默认属性(根据截图)
|
// 原料默认属性(根据截图)
|
||||||
defaultAttrs = Arrays.asList(
|
defaultAttrs = Arrays.asList(
|
||||||
new String[]{"宽度", "1265"},
|
new String[]{"规格", "1265 * 4"},
|
||||||
new String[]{"厚度", "4"},
|
|
||||||
new String[]{"材质", "Q195L"},
|
new String[]{"材质", "Q195L"},
|
||||||
new String[]{"厂家", "天铁"}
|
new String[]{"厂家", "天铁"}
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user