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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
  2. 53
      oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java

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

@ -131,27 +131,30 @@ public class PurchaseBillService {
}
ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>();
if(StringUtils.isBlank(record.getGoodsSpuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
if(StringUtils.isNotBlank(record.getGoodsSkuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
}
}else{
initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
}
if(StringUtils.isBlank(record.getTitle())){
// record.setTitle();
}
if(StringUtils.isBlank(record.getBrandName())){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName());
if(initialization1.getData()!=null){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName());
}
}
if(StringUtils.isBlank(record.getTypeName())){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid());
if(initialization1.getData()!=null){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid());
}
}
}
@ -167,24 +170,30 @@ public class PurchaseBillService {
}
ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>();
if(StringUtils.isBlank(record.getGoodsSpuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
if(StringUtils.isNotBlank(record.getGoodsSkuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
}
}else{
initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
}
if(StringUtils.isBlank(record.getBrandName())){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName());
if(initialization1.getData()!=null){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName());
}
}
if(StringUtils.isBlank(record.getTypeName())){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid());
if(initialization1.getData()!=null){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid());
}
}
}

53
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<>();
if(StringUtils.isBlank(record.getGoodsSpuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
if(StringUtils.isNotBlank(record.getGoodsSkuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
}
}else{
initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
@ -267,15 +269,20 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
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());
if(StringUtils.isBlank(record.getBrandName())){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName());
if(initialization1.getData()!=null){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName());
}
}
if(StringUtils.isBlank(record.getTypeName())){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid());
if(initialization1.getData()!=null){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid());
}
}
}
return pagerVoResultBean;
}
@ -340,10 +347,12 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
ResultBean<BaseGoodsSpuVo> initialization1=new ResultBean<>();
if(StringUtils.isBlank(record.getGoodsSpuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
if(StringUtils.isNotBlank(record.getGoodsSkuSid())){
ResultBean<BaseGoodsSkuVo> initialization = baseGoodsSkuFeign.initialization(record.getGoodsSkuSid());
initialization1 = baseGoodsSpuFeign.initialization(initialization.getData().getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
record.setGoodsCode(initialization1.getData().getGoodsCode());
}
}else{
initialization1 = baseGoodsSpuFeign.initialization(record.getGoodsSpuSid());
record.setBarCode(initialization1.getData().getBarCode());
@ -355,14 +364,18 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
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());
if(StringUtils.isBlank(record.getBrandName())){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName());
if(initialization1.getData()!=null){
ResultBean<BaseBrandInfoVo> initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid());
record.setBrandSid(initialization3.getData().getSid());
record.setBrandName(initialization3.getData().getBrandName());
}
}
if(StringUtils.isBlank(record.getTypeName())){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid());
if(initialization1.getData()!=null){
ResultBean<BaseGoodsTypeVo> initialization2 = baseGoodsTypeFeign.initialization(initialization1.getData().getGoodsTypeSid());
record.setTypeName(initialization2.getData().getGoodsTypeName());
record.setTypeSid(initialization2.getData().getSid());
}
}
}
//定义导出的excel名字

Write Preview
Loading…
Cancel
Save