diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java index 51c84335..83d166aa 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java @@ -137,7 +137,7 @@ public class WmsMaterialCoil extends BaseEntity { //新增长度字段 - private BigDecimal length; + private Long length; //发货人 private String exportBy; @@ -167,7 +167,7 @@ public class WmsMaterialCoil extends BaseEntity { /** * 实测长度 */ - private BigDecimal actualLength; + private Long actualLength; /** * 实测宽度 diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index 4f4f15d5..6e0832b1 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -238,7 +238,7 @@ public class WmsMaterialCoilBo extends BaseEntity { //新增长度字段 - private BigDecimal length; + private Long length; // 新增的在钢卷表中的表面处理 private String coilSurfaceTreatment; @@ -295,7 +295,7 @@ public class WmsMaterialCoilBo extends BaseEntity { /** * 实测长度 */ - private BigDecimal actualLength; + private Long actualLength; /** * 实测宽度 diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java index 34fa6401..550405fb 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java @@ -130,7 +130,7 @@ public class WmsMaterialCoilAllExportVo { @ExcelProperty(value = "长度") - private BigDecimal length; + private Long length; /** * 规格 diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java index ec96486a..2cb7d63b 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java @@ -125,7 +125,7 @@ public class WmsMaterialCoilExportVo { @ExcelProperty(value = "长度") - private BigDecimal length; + private Long length; /** * 实测厚度 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 778b965e..bd8810f6 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 @@ -236,7 +236,7 @@ public class WmsMaterialCoilVo extends BaseEntity { private String saleName; //新增长度字段 - private BigDecimal length; + private Long length; //发货人 private String exportBy; @@ -277,7 +277,7 @@ public class WmsMaterialCoilVo extends BaseEntity { * 实测长度 */ @ExcelProperty(value = "实测长度") - private BigDecimal actualLength; + private Long actualLength; /** * 实测宽度 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java index 5a976247..3e46d644 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java @@ -303,7 +303,7 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer // 净重 > 毛重 plan.setInMatWeight(coil.getNetWeight() != null ? coil.getNetWeight() : coil.getGrossWeight()); // 长度 - plan.setInMatLength(coil.getLength()); + plan.setInMatLength(coil.getLength() != null ? BigDecimal.valueOf(coil.getLength()) : null); // ② 查原材料库(itemType='raw_material' 时通过 itemId 关联) if ("raw_material".equals(coil.getItemType()) && coil.getItemId() != null) { diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java index 659d7a6d..25df57a5 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import com.klp.domain.bo.WmsCoilWarehouseOperationLogBo; import com.klp.domain.vo.WmsCoilWarehouseOperationLogVo; import com.klp.domain.vo.WmsCoilWarehouseOperationLogExportVo; +import java.math.BigDecimal; import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.WmsCoilWarehouseOperationLog; import com.klp.mapper.WmsCoilWarehouseOperationLogMapper; @@ -295,7 +296,7 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous exportVo.setStatusDesc(getStatusDesc(coil.getStatus())); exportVo.setItemName(coil.getItemName()); exportVo.setSpecification(coil.getSpecification()); - exportVo.setLength(coil.getLength()); + exportVo.setLength(coil.getLength() != null ? BigDecimal.valueOf(coil.getLength()) : null); exportVo.setMaterial(coil.getMaterial()); exportVo.setManufacturer(coil.getManufacturer()); exportVo.setSurfaceTreatmentDesc(coil.getSurfaceTreatmentDesc());