出货单调整

src/main/java/com/uas/platform/b2c/logistics/model/InvoiceDetail.java

@@ -687,7 +687,37 @@ public class InvoiceDetail {
 	 * @param fPurchaseDetail
 	 */
 	public InvoiceDetail(InvoiceFPurchaseDetail fPurchaseDetail) {
-
+		this.detailid = fPurchaseDetail.getDetailid();
+		this.detno = fPurchaseDetail.getDetno();
+		this.orderDetailId = fPurchaseDetail.getOrdetailid();
+		this.purchaseDetailId = fPurchaseDetail.getPudetailid();
+		this.batchCode = fPurchaseDetail.getBatchCode();
+		this.remark = fPurchaseDetail.getRemark();
+		this.goodsnumber = fPurchaseDetail.getGoodsnumber();
+		this.productid = fPurchaseDetail.getProductid();
+		this.original = fPurchaseDetail.getOriginal();
+		this.uuid = fPurchaseDetail.getUuid();
+		this.cmpCode = fPurchaseDetail.getCmpCode();
+		this.kiName = fPurchaseDetail.getKiName();
+		this.kindUuid = fPurchaseDetail.getKindUuid();
+		this.brandNameCn = fPurchaseDetail.getBrandNameCn();
+		this.brandNameEn = fPurchaseDetail.getBrName();
+		this.brandid = fPurchaseDetail.getBrandid();
+		this.branduuid = fPurchaseDetail.getBranduuid();
+		this.img = fPurchaseDetail.getImg();
+		this.unitprice = fPurchaseDetail.getUnitprice();
+		this.qty = fPurchaseDetail.getNumber();
+		this.currency = fPurchaseDetail.getCurrencyName();
+		this.price = fPurchaseDetail.getPrice();
+		this.ensurePrice = fPurchaseDetail.getEnsurePrice();
+		this.transationPrice = fPurchaseDetail.getTransationPrice();
+		this.taxes = fPurchaseDetail.getTaxes();
+		this.tax = fPurchaseDetail.getTax();
+		this.taxunitprice = fPurchaseDetail.getTaxUnitPrice();
+		this.b2cMaxDelivery = fPurchaseDetail.getB2cMaxDelivery();
+		this.b2cMinDelivery = fPurchaseDetail.getB2cMinDelivery();
+		this.spec = fPurchaseDetail.getSpec();
+		this.status = fPurchaseDetail.getStatus();
 	}
 
 }

src/main/java/com/uas/platform/b2c/logistics/util/ModelConvertUtil.java

@@ -18,9 +18,13 @@ public class ModelConvertUtil {
     public Invoice invoiceFPurchaseConvertInvoice(InvoiceFPurchase fPurchase) {
         Invoice invoice =  new Invoice(fPurchase);
         Set<InvoiceDetail> set = new HashSet<>();
+        InvoiceDetail detail = null;
         for (InvoiceFPurchaseDetail fPurchaseDetail : fPurchase.getInvoiceFPurchaseDetails()) {
-
+            detail = new InvoiceDetail(fPurchaseDetail);
+            detail.setInvoice(invoice);
+            set.add(detail);
         }
+        invoice.setInvoiceDetails(set);
         return invoice;
     }
 }