|
@@ -121,7 +121,7 @@ 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() ? "已对账" : "已验收";
|
|
|
|
|
|
|
+ this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public FxPurcAcceptItem convert(PurchaseAcceptItem acceptItem, PurchaseOrderItem orderItem , PurchaseOrder order) {
|
|
public FxPurcAcceptItem convert(PurchaseAcceptItem acceptItem, PurchaseOrderItem orderItem , PurchaseOrder order) {
|
|
@@ -131,7 +131,7 @@ 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() ? "已对账" : "已验收";
|
|
|
|
|
|
|
+ this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
|
|
|
this.orderItem = new FxPurcOrderItem().convert(orderItem,order);
|
|
this.orderItem = new FxPurcOrderItem().convert(orderItem,order);
|
|
|
return this;
|
|
return this;
|
|
|
}
|
|
}
|