|
@@ -3,6 +3,7 @@ package com.uas.platform.b2b.openapi.model;
|
|
|
import com.uas.platform.b2b.model.PurchaseAcceptItem;
|
|
import com.uas.platform.b2b.model.PurchaseAcceptItem;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrder;
|
|
import com.uas.platform.b2b.model.PurchaseOrder;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrderItem;
|
|
import com.uas.platform.b2b.model.PurchaseOrderItem;
|
|
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
|
|
|
@@ -121,7 +122,11 @@ public class FxPurcAcceptItem {
|
|
|
this.acceptQty = acceptItem.getQty();
|
|
this.acceptQty = acceptItem.getQty();
|
|
|
this.acceptAmount = acceptItem.getTaxrate();
|
|
this.acceptAmount = acceptItem.getTaxrate();
|
|
|
this.detno = acceptItem.getNumber();
|
|
this.detno = acceptItem.getNumber();
|
|
|
- this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
|
|
|
|
|
|
|
+ if (!StringUtils.isEmpty(acceptItem.getCheckQty())) {
|
|
|
|
|
+ this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.isCheck = "已收货";
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public FxPurcAcceptItem convert(PurchaseAcceptItem acceptItem, PurchaseOrderItem orderItem , PurchaseOrder order) {
|
|
public FxPurcAcceptItem convert(PurchaseAcceptItem acceptItem, PurchaseOrderItem orderItem , PurchaseOrder order) {
|
|
@@ -131,7 +136,12 @@ public class FxPurcAcceptItem {
|
|
|
this.acceptQty = acceptItem.getQty();
|
|
this.acceptQty = acceptItem.getQty();
|
|
|
this.acceptAmount = acceptItem.getTaxrate();
|
|
this.acceptAmount = acceptItem.getTaxrate();
|
|
|
this.detno = acceptItem.getNumber();
|
|
this.detno = acceptItem.getNumber();
|
|
|
- this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
|
|
|
|
|
|
|
+ if (!StringUtils.isEmpty(acceptItem.getCheckQty())) {
|
|
|
|
|
+ this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.isCheck = "已收货";
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
this.orderItem = new FxPurcOrderItem().convert(orderItem,order);
|
|
this.orderItem = new FxPurcOrderItem().convert(orderItem,order);
|
|
|
return this;
|
|
return this;
|
|
|
}
|
|
}
|