diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java index 7a755e54..7b2b8283 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java @@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; +import com.klp.common.core.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; import java.util.List; @@ -17,7 +18,7 @@ import java.util.List; */ @Data @ExcelIgnoreUnannotated -public class WmsMaterialCoilVo { +public class WmsMaterialCoilVo extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java index b27feef0..10963a5c 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java @@ -101,10 +101,10 @@ public class WmsProductServiceImpl implements IWmsProductService { bomBo.setBomName("产品BOM" + System.currentTimeMillis()); bomBo.setIsEnabled(1); bomBo.setRemark("产品创建时自动生成的BOM"); - + WmsBomBo savedBom = wmsBomService.insertByBo(bomBo); Long bomId = savedBom.getBomId(); - + // 2. 创建产品并关联BOM WmsProduct add = BeanUtil.toBean(bo, WmsProduct.class); add.setBomId(bomId); @@ -112,37 +112,35 @@ public class WmsProductServiceImpl implements IWmsProductService { boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setProductId(add.getProductId()); - + // 3. 创建默认的BOM明细项(根据截图的默认属性) createDefaultBomItems(bomId, "产品"); } return flag; } - + /** * 创建默认的BOM明细项 */ private void createDefaultBomItems(Long bomId, String type) { List defaultAttrs; - + if ("产品".equals(type)) { // 产品默认属性(根据截图) defaultAttrs = Arrays.asList( - new String[]{"厚度", "0.6"}, - new String[]{"宽度", "1250"}, + new String[]{"规格", "1250 * 0.6"}, new String[]{"材质", "SPCC"}, new String[]{"表面处理", "涂油"} ); } else { // 原料默认属性(根据截图) defaultAttrs = Arrays.asList( - new String[]{"宽度", "1265"}, - new String[]{"厚度", "4"}, + new String[]{"规格", "1265 * 4"}, new String[]{"材质", "Q195L"}, new String[]{"厂家", "天铁"} ); } - + for (String[] attr : defaultAttrs) { WmsBomItemBo itemBo = new WmsBomItemBo(); itemBo.setBomId(bomId); diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java index 4c5d320c..f34239ed 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java @@ -211,10 +211,10 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService { bomBo.setBomName("原材料BOM" + System.currentTimeMillis()); bomBo.setIsEnabled(1); bomBo.setRemark("原材料创建时自动生成的BOM"); - + WmsBomBo savedBom = wmsBomService.insertByBo(bomBo); Long bomId = savedBom.getBomId(); - + // 2. 创建原材料并关联BOM WmsRawMaterial add = BeanUtil.toBean(bo, WmsRawMaterial.class); add.setBomId(bomId); @@ -222,37 +222,35 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService { boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setRawMaterialId(add.getRawMaterialId()); - + // 3. 创建默认的BOM明细项(根据截图的默认属性) createDefaultBomItems(bomId, "原料"); } return bo; } - + /** * 创建默认的BOM明细项 */ private void createDefaultBomItems(Long bomId, String type) { List defaultAttrs; - + if ("产品".equals(type)) { // 产品默认属性(根据截图) defaultAttrs = Arrays.asList( - new String[]{"厚度", "0.6"}, - new String[]{"宽度", "1250"}, + new String[]{"规格", "1250 * 0.6"}, new String[]{"材质", "SPCC"}, new String[]{"表面处理", "涂油"} ); } else { // 原料默认属性(根据截图) defaultAttrs = Arrays.asList( - new String[]{"宽度", "1265"}, - new String[]{"厚度", "4"}, + new String[]{"规格", "1265 * 4"}, new String[]{"材质", "Q195L"}, new String[]{"厂家", "天铁"} ); } - + for (String[] attr : defaultAttrs) { WmsBomItemBo itemBo = new WmsBomItemBo(); itemBo.setBomId(bomId);