diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java index 85b1b0f42..3d22df488 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java @@ -95,6 +95,6 @@ public class GtMaterialPurchaseDemandPlanning implements Serializable { @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; - @ApiModelProperty(value = "物料单位(1斤、2克、3千克、4吨)") - private Integer materialUnit; + @ApiModelProperty(value = "物料单位") + private String materialUnit; } diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java index 9d3da11ba..a6d2a5455 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java @@ -340,6 +340,9 @@ public class GtMaterialInOutWarehouseServiceImpl extends ServiceImpl { o.setGtMaterialInOutWarehouseId(gtMaterialInOutWarehouse.getId()); o.setProjectSn(gtMaterialInOutWarehouse.getProjectSn()); + o.setName(StringUtils.trim(o.getName())); + o.setSpecification(StringUtils.trim(o.getSpecification())); + o.setUnit(o.getUnit()); }); if (CollUtil.isNotEmpty(materialList)) { materialPointCheckIntoWarehouseDetailService.saveBatch(materialList);