From 2f4b09c5b7229116b30869fe2d8b90e679410512 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 16 Aug 2024 10:02:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E4=BF=A1=E7=9A=84=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/gt/entity/GtMaterialPurchaseDemandPlanning.java | 4 ++-- .../gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) 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);