|
|
@@ -782,7 +782,9 @@ public class Invoice extends Document implements Serializable {
|
|
|
this.jsonSpAddress = fPurchase.getJsonSpAddress();
|
|
|
this.jsonSdAddress = fPurchase.getJsonSdAddress();
|
|
|
this.logistics = fPurchase.getLogistics();
|
|
|
- this.logistics.setId(null);
|
|
|
+ if (this.logistics != null) {
|
|
|
+ this.logistics.setId(null);
|
|
|
+ }
|
|
|
this.createtime = fPurchase.getCreattime();
|
|
|
this.status = fPurchase.getStatus();
|
|
|
this.currency = fPurchase.getCurrencyName();
|
|
|
@@ -816,7 +818,9 @@ public class Invoice extends Document implements Serializable {
|
|
|
this.jsonSpAddress = iOrder.getJsonSpAddress();
|
|
|
this.jsonSdAddress = iOrder.getJsonSdAddress();
|
|
|
this.logistics = iOrder.getLogistics();
|
|
|
- this.logistics.setId(null);
|
|
|
+ if (this.logistics != null) {
|
|
|
+ this.logistics.setId(null);
|
|
|
+ }
|
|
|
this.createtime = iOrder.getCreattime();
|
|
|
this.status = iOrder.getStatus();
|
|
|
this.currency = iOrder.getCurrency();
|