增加已收货数量字段

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFOrderServiceImpl.java

@@ -435,8 +435,16 @@ public class InvoiceFOrderServiceImpl implements InvoiceFOrderService {
 			}
 			invoiceFOrder.setStatusReceived(useruu);
 			Set<InvoiceFOrderDetail> invoiceFOrderDetails = invoiceFOrder.getInvoiceFOrderDetails();
+			Set<OrderDetail> orderDetails = order.getOrderDetails();
 			for (InvoiceFOrderDetail fOrderDetail : invoiceFOrderDetails) {
 				fOrderDetail.setStatus(Status.RECEIVED.value());
+				for (OrderDetail orderDetail : orderDetails) {
+					if (fOrderDetail.getOrdetailid() != null && (fOrderDetail.getOrdetailid().longValue() == orderDetail.getId().longValue())) {
+						orderDetail.setSignReceiveQty(NumberUtil.add(fOrderDetail.getNumber(), orderDetail.getSignReceiveQty()));
+						order.setSignReceiveQty(NumberUtil.add(fOrderDetail.getNumber(), order.getSignReceiveQty()));
+						break;
+					}
+				}
 			}
 			// 采购入库
 			Set<InOutboundDetail> outboundDetails = inOutboundDetailService.produceInOutboundDetailByInvoiceFOrderDetail(invoiceFOrderDetails);

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFPurchaseServiceImpl.java

@@ -571,8 +571,16 @@ public class InvoiceFPurchaseServiceImpl implements InvoiceFPurchaseService {
 			}
 			fPurchase.setStatusReceived(useruu);
 			Set<InvoiceFPurchaseDetail> purchaseDetails = fPurchase.getInvoiceFPurchaseDetails();
+			Set<OrderDetail> orderDetails = order.getOrderDetails();
 			for (InvoiceFPurchaseDetail detail : purchaseDetails) {
 				detail.setStatus(Status.RECEIVED.value());
+				for (OrderDetail orderDetail : orderDetails) {
+					if (detail.getOrdetailid() != null && (detail.getOrdetailid().longValue() == orderDetail.getId().longValue())) {
+						orderDetail.setSignReceiveQty(NumberUtil.add(detail.getNumber(), orderDetail.getSignReceiveQty()));
+						order.setSignReceiveQty(NumberUtil.add(detail.getNumber(), order.getSignReceiveQty()));
+						break;
+					}
+				}
 			}
 
 			// 采购入库

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -449,6 +449,12 @@ public class Order extends Document implements Serializable {
 	@Column(name = "or_inids", length = 1000)
 	private String inIds = "";
 
+	/**
+	 * 已收货数
+	 */
+	@Column(name = "or_sign_receive_qty")
+	private Double signReceiveQty = 0.0d;
+
 	@Transient
 	private Boolean signReceive;
 
@@ -2938,4 +2944,13 @@ public class Order extends Document implements Serializable {
 		this.signReceive = signReceive;
 		return this;
 	}
+
+	public Double getSignReceiveQty() {
+		return signReceiveQty;
+	}
+
+	public Order setSignReceiveQty(Double signReceiveQty) {
+		this.signReceiveQty = signReceiveQty;
+		return this;
+	}
 }

src/main/java/com/uas/platform/b2c/trade/order/model/OrderDetail.java

@@ -480,6 +480,12 @@ public class OrderDetail extends Document implements Serializable{
 	@Column(name = "detail_shipqty")
 	private Double shipQty = 0.0d;
 
+	/**
+	 * 已收货数
+	 */
+	@Column(name = "detail_sign_receive_qty")
+	private Double signReceiveQty = 0.0d;
+
 
 
 	/**
@@ -2066,4 +2072,13 @@ public class OrderDetail extends Document implements Serializable{
 		this.productId = productId;
 		return this;
 	}
+
+	public Double getSignReceiveQty() {
+		return signReceiveQty;
+	}
+
+	public OrderDetail setSignReceiveQty(Double signReceiveQty) {
+		this.signReceiveQty = signReceiveQty;
+		return this;
+	}
 }