diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java index 0d9704e..54cb489 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java @@ -29,8 +29,11 @@ public class BaseGoodsSpuDto implements Dto { private String goodsPY;//拼音缩写 private String goodsShortName;//商品简称 private String goodsTypeSid;//商品分类sid + private String goodsTypeName;//商品分类sid private String brandSid;//品牌sid + private String brandName;//品牌sid private String manufacturerSid;//厂家sid + private String manufacturerName;//厂家sid private String goodsUnitSid;//商品单位sid private String goodsUnitName;//商品单位名称 private String taxRate;//税率 @@ -65,4 +68,5 @@ public class BaseGoodsSpuDto implements Dto { private BigDecimal packPrice;//包装单价 + } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java index 4fbe1fc..91d9cd6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java @@ -106,7 +106,7 @@ public class BaseGoodsSpuService extends MybatisBaseService a(List dtos) { - ResultBean rb=new ResultBean().fail(); + ResultBean rb = new ResultBean().fail(); List spus = new ArrayList<>();//spu list - int goodsCode =dtos.stream().filter(b->StringUtils.isEmpty(b.getGoodsCode())).collect(Collectors.toList()).size(); - if(goodsCode==0){ + int goodsCode = dtos.stream().filter(b -> StringUtils.isEmpty(b.getGoodsCode())).collect(Collectors.toList()).size(); + if (goodsCode == 0) { spus = dtos.stream().filter(distinctByKey(BaseGoodsSpuDto::getGoodsCode)).collect(Collectors.toList()); - }else{ + } else { spus = dtos.stream().filter(distinctByKey(BaseGoodsSpuDto::getGoodsName)).collect(Collectors.toList()); } for (BaseGoodsSpuDto baseGoodsSpuDto : spus) { @@ -324,10 +324,10 @@ public class BaseGoodsSpuService extends MybatisBaseService skus = new ArrayList<>(); String sid = UUID.randomUUID().toString(); baseGoodsSpuDto.setSid(sid); - List dtos1=new ArrayList<>(); - if(goodsCode==0){ + List dtos1 = new ArrayList<>(); + if (goodsCode == 0) { dtos1 = dtos.stream().filter(d -> d.getGoodsCode().equals(baseGoodsSpuDto.getGoodsCode())).collect(Collectors.toList()); - }else{ + } else { dtos1 = dtos.stream().filter(d -> d.getGoodsName().equals(baseGoodsSpuDto.getGoodsName())).collect(Collectors.toList()); } spuDetail.setGoodsExplain(dtos1.get(0).getBaseGoodsSpuDetail().getGoodsExplain()); @@ -376,7 +376,7 @@ public class BaseGoodsSpuService extends MybatisBaseService seen.add(keyExtractor.apply(t)); } - private BaseGoodsSpuDto packaging(String[] arr, BaseGoodsSpuDto baseGoodsSpuDto) { + private BaseGoodsSpuDto packaging(String[] arr, BaseGoodsSpuDto baseGoodsSpuDto) { Map result = new HashMap<>(); //0四电名称1四电类别2规格3数量4单价5总价6单位7备注 // BaseGoodsSpuDto baseGoodsSpuDto =null; @@ -385,47 +385,43 @@ public class BaseGoodsSpuService extends MybatisBaseService dtos=new ArrayList<>(); - BaseGoodsSkuDto dto1=new BaseGoodsSkuDto(); + List dtos = new ArrayList<>(); + BaseGoodsSkuDto dto1 = new BaseGoodsSkuDto(); dto1.setGoodsSkuCode(goodsSkuCode); dto1.setTitle(title); - dto1.setExternalCode(skuExternalCode); - BaseGoodsSkuExtendDto dto2=new BaseGoodsSkuExtendDto(); + dto1.setOwnSpec(ownSpec); + BaseGoodsSkuExtendDto dto2 = new BaseGoodsSkuExtendDto(); dto2.setSortNo("1"); dto2.setFinalPurchasePrice(finalPurchasePrice); dto2.setSafetyStockDays(safetyStockDays); diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java index 5b5fd49..8b38e04 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java @@ -12,6 +12,7 @@ import java.math.BigDecimal; @Data public class GoodsSkuPurSelectList { + //sid private String sid; //商品编码 @@ -24,12 +25,6 @@ public class GoodsSkuPurSelectList { private String goodsSkuOwnSpec; //单位 private String unit; - //数量 - private BigDecimal count; - //数量1 - private BigDecimal count1; - //数量 - private BigDecimal pcsNum; //吊牌价 private BigDecimal tagPrice; //单价 @@ -42,4 +37,31 @@ public class GoodsSkuPurSelectList { private BigDecimal taxRate; //货号 private String itemNumber; + + + + private String goodsSkuSid; + //spusid + private String goodsSpuSid; + //商品编码 + private String goodsCode; + //规格型号 + private String title; + //具体规格 + private String ownSpec; + //分类 + private String typeName; + private String typeSid; + //品牌 + private String brandName; + private String brandSid; + //厂家名 + private String manufacturerSid; + private String manufacturerName; + //厂家货号 + private String factoryCode; + + private String unitSid; + //销售单价 + private BigDecimal salesPrice=new BigDecimal(0); }