From 6153e3296d57105e534efb03a1fa1842c5cb8ae8 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 13 Jan 2025 08:48:51 +0800
Subject: [PATCH] 01/13

---
 .../purchasebill/PurchaseBillService.java     | 55 +++++++++++--------
 .../smssalesbill/SmsSalesBillService.java     | 53 +++++++++++-------
 2 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
index d57d355..f2c2dee 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
@@ -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());
+                }
             }
 
         }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
index 30ca642..6205fb3 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
@@ -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名字