yxt_product
/
oms-biz
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

01/13

master
wangpengfei 4 months ago
parent
07753a95c2
commit
6153e3296d
2 changed files with 65 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
  2. 13
      oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java

15
oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
View File

@ -131,28 +131,31 @@ public class PurchaseBillService {
} }
ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>(); ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>();
if(StringUtils.isBlank(record.getGoodsSpuSid())){ if(StringUtils.isBlank(record.getGoodsSpuSid())){
if(StringUtils.isNotBlank(record.getGoodsSkuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid()); ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid()); initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode()); record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode()); record.setGoodsCode(initialization1.getData().getGoodsCode());
}
}else{ }else{
initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()); initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode()); record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode()); record.setGoodsCode(initialization1.getData().getGoodsCode());
} }
if(StringUtils.isBlank(record.getTitle())){
// record.setTitle();
}
if(StringUtils.isBlank(record.getBrandName())){ if(StringUtils.isBlank(record.getBrandName())){
if(initialization1.getData()!=null){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid()); ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid()); record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName()); record.setBrandName(initialization3.getData().getBrandName());
} }
}
if(StringUtils.isBlank(record.getTypeName())){ if(StringUtils.isBlank(record.getTypeName())){
if(initialization1.getData()!=null){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid()); ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName()); record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid()); record.setTypeSid(initialization2.getData().getSid());
} }
}
} }
return pagerVoResultBean; return pagerVoResultBean;
@ -167,25 +170,31 @@ public class PurchaseBillService {
} }
ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>(); ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>();
if(StringUtils.isBlank(record.getGoodsSpuSid())){ if(StringUtils.isBlank(record.getGoodsSpuSid())){
if(StringUtils.isNotBlank(record.getGoodsSkuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid()); ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid()); initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode()); record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode()); record.setGoodsCode(initialization1.getData().getGoodsCode());
}
}else{ }else{
initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()); initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode()); record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode()); record.setGoodsCode(initialization1.getData().getGoodsCode());
} }
if(StringUtils.isBlank(record.getBrandName())){ if(StringUtils.isBlank(record.getBrandName())){
if(initialization1.getData()!=null){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid()); ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid()); record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName()); record.setBrandName(initialization3.getData().getBrandName());
} }
}
if(StringUtils.isBlank(record.getTypeName())){ if(StringUtils.isBlank(record.getTypeName())){
if(initialization1.getData()!=null){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid()); ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName()); record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid()); record.setTypeSid(initialization2.getData().getSid());
} }
}
} }
//定义导出的excel名字 //定义导出的excel名字

13
oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
View File

@ -252,10 +252,12 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
} }
ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>(); ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>();
if(StringUtils.isBlank(record.getGoodsSpuSid())){ if(StringUtils.isBlank(record.getGoodsSpuSid())){
if(StringUtils.isNotBlank(record.getGoodsSkuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid()); ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid()); initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode()); record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode()); record.setGoodsCode(initialization1.getData().getGoodsCode());
}
}else{ }else{
initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()); initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode()); record.setBarCode(initialization1.getData().getBarCode());
@ -267,16 +269,21 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
record.setMl(new BigDecimal(record.getAmount()).subtract(new BigDecimal(record.getCbPrice())).toString()); record.setMl(new BigDecimal(record.getAmount()).subtract(new BigDecimal(record.getCbPrice())).toString());
record.setMll(new BigDecimal(record.getAmount()).subtract(new BigDecimal(record.getCbPrice())).divide(new BigDecimal(record.getCbPrice()),2, RoundingMode.HALF_UP).toString()); record.setMll(new BigDecimal(record.getAmount()).subtract(new BigDecimal(record.getCbPrice())).divide(new BigDecimal(record.getCbPrice()),2, RoundingMode.HALF_UP).toString());
if(StringUtils.isBlank(record.getBrandName())){ if(StringUtils.isBlank(record.getBrandName())){
if(initialization1.getData()!=null){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid()); ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid()); record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName()); record.setBrandName(initialization3.getData().getBrandName());
} }
}
if(StringUtils.isBlank(record.getTypeName())){ if(StringUtils.isBlank(record.getTypeName())){
if(initialization1.getData()!=null){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid()); ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName()); record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid()); record.setTypeSid(initialization2.getData().getSid());
} }
} }
}
return pagerVoResultBean; return pagerVoResultBean;
} }
@ -340,10 +347,12 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
} }
ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>(); ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>();
if(StringUtils.isBlank(record.getGoodsSpuSid())){ if(StringUtils.isBlank(record.getGoodsSpuSid())){
if(StringUtils.isNotBlank(record.getGoodsSkuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid()); ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid()); initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode()); record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode()); record.setGoodsCode(initialization1.getData().getGoodsCode());
}
}else{ }else{
initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()); initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode()); record.setBarCode(initialization1.getData().getBarCode());
@ -355,16 +364,20 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
record.setMl(new BigDecimal(record.getAmount()).subtract(new BigDecimal(record.getCbPrice())).toString()); record.setMl(new BigDecimal(record.getAmount()).subtract(new BigDecimal(record.getCbPrice())).toString());
record.setMll(new BigDecimal(record.getAmount()).subtract(new BigDecimal(record.getCbPrice())).divide(new BigDecimal(record.getCbPrice()),2, RoundingMode.HALF_UP).toString()); record.setMll(new BigDecimal(record.getAmount()).subtract(new BigDecimal(record.getCbPrice())).divide(new BigDecimal(record.getCbPrice()),2, RoundingMode.HALF_UP).toString());
if(StringUtils.isBlank(record.getBrandName())){ if(StringUtils.isBlank(record.getBrandName())){
if(initialization1.getData()!=null){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid()); ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid()); record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName()); record.setBrandName(initialization3.getData().getBrandName());
} }
}
if(StringUtils.isBlank(record.getTypeName())){ if(StringUtils.isBlank(record.getTypeName())){
if(initialization1.getData()!=null){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid()); ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName()); record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid()); record.setTypeSid(initialization2.getData().getSid());
} }
} }
}
//定义导出的excel名字 //定义导出的excel名字
String excelName = "商品销售列表"; String excelName = "商品销售列表";
String fileNameURL = ""; String fileNameURL = "";

Write Preview
Loading…
Cancel
Save