From ce72f5917a60e2bf4a78f8ed4b5e051cc57db919 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 9 May 2024 15:05:28 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=9B=A0?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=87=BA=E7=8E=B0=E7=A9=BA=E8=A1=8C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=BC=82=E5=B8=B8=20fix=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=A2=84=E7=AE=97=E5=AF=BC=E5=85=A5=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/goods/controller/GoodsSkuController.java | 8 +++++++- .../serve/modules/goods/entity/bo/GoodsSkuImportBo.java | 6 ++++++ .../com/qs/serve/modules/tbs/entity/TbsBudgetChange.java | 9 --------- .../modules/tbs/entity/TbsBudgetChangeScheduleItem.java | 9 +++++++++ .../tbs/service/impl/TbsBudgetBatchServiceImpl.java | 4 ++++ 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index 9d0bbae1..3053a2c1 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -260,7 +260,8 @@ public class GoodsSkuController { final String DELETE = "3"; final String SAVE = "1"; boolean throwEx = false; - Map> skuItemList = param.getSkuList().stream().collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt)); + Map> skuItemList = param.getSkuList().stream() + .filter(a->a.getOpt()!=null).collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt)); //处理删除 List delList = skuItemList.get(DELETE); if(delList!=null){ @@ -315,6 +316,9 @@ public class GoodsSkuController { List spuList = goodsSpuService.getByCodes(spuCodes); for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { String opt = skuItem.getOpt(); + if(opt==null){ + continue; + } if(opt.equals(DELETE)){ continue; } @@ -392,6 +396,8 @@ public class GoodsSkuController { udpSku.setTasteVal(skuItem.getTasteVal()); udpSku.setSpecInfos(skuItem.getBelong()+";"+skuItem.getTasteVal()+";"+skuItem.getWrapVal()); udpSku.setRemark(skuItem.getRemark()); + udpSku.setEnable(skuItem.getEnable()); + udpSku.setInvUnitWeight(skuItem.getInvUnitWeight()); return udpSku; } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java index 96cef8c2..707a341d 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java @@ -77,6 +77,12 @@ public class GoodsSkuImportBo { /** 备注 */ private String remark; + /** 是否开启 1、是；0否 */ + private Integer enable; + + /** 净重 */ + private BigDecimal invUnitWeight; + private String errMsg; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java index 6982c726..2d8805ac 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java @@ -195,9 +195,7 @@ public class TbsBudgetChange implements Serializable { public static TbsBudgetChange toNewObject(TbsBudget source){ TbsBudgetChange budgetChange = new TbsBudgetChange(); - //budgetChange.setId(source.getId()); budgetChange.setBudgetId(source.getId()); - //budgetChange.setChangeCode(source.getChangeCode()); budgetChange.setBudgetTitle(source.getBudgetCode()); budgetChange.setBudgetNumber(source.getBudgetNumber()); budgetChange.setBudgetCheckState(source.getBudgetCheckState()); @@ -211,14 +209,7 @@ public class TbsBudgetChange implements Serializable { budgetChange.setScheduleId(source.getScheduleId()); budgetChange.setScheduleCode(source.getScheduleCode()); budgetChange.setScheduleName(source.getScheduleName()); - budgetChange.setSubmitTime(source.getSubmitTime()); budgetChange.setRemark(source.getRemark()); -// budgetChange.setCreateTime(source.getCreateTime()); -// budgetChange.setUpdateTime(source.getUpdateTime()); -// budgetChange.setTenantId(source.getTenantId()); -// budgetChange.setCreateBy(source.getCreateBy()); -// budgetChange.setUpdateBy(source.getUpdateBy()); -// budgetChange.setDelFlag(source.getDelFlag()); return budgetChange; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChangeScheduleItem.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChangeScheduleItem.java index 88e78c74..1174dd4d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChangeScheduleItem.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChangeScheduleItem.java @@ -81,6 +81,15 @@ public class TbsBudgetChangeScheduleItem implements Serializable { /** 新的预估发货金额 */ private BigDecimal newPreDispatchAmount; + /** 品牌名称 */ + private String brandNames; + + /** 类目名称 */ + private String categoryNames; + + /** 系列名称 */ + private String seriesNames; + /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") private String remark; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java index f3f36a4a..9cbf73e4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java @@ -413,6 +413,10 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl