Merge remote-tracking branch 'origin/feature-material-wangcz' into feature-material-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/model/CommodityInOutbound.java

@@ -20,6 +20,7 @@ public class CommodityInOutbound implements Serializable {
 
     @Id
     @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     /**

src/main/java/com/uas/platform/b2c/prod/commodity/model/InOutboundDetail.java

@@ -17,6 +17,7 @@ public class InOutboundDetail implements Serializable {
 
     @Id
     @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     /**

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -559,17 +559,22 @@ public class PurchaseServiceImpl implements PurchaseService {
 			throw new IllegalAccessError("出货单不为待收货状态，不能确认收货");
 		}
 		Long uu = SystemSession.getUser().getUserUU();
+		boolean allReceived = true;
 		Purchase purchase = purchaseDao.findOne(invoiceFp.getPuid());
 		Set<PurchaseDetail> purchaseDetails = purchase.getPurchaseDetails();
 		for (PurchaseDetail purchaseDetail : purchaseDetails) {
-			if (purchaseDetail.getStatus().intValue() == Status.INBOUND.value()) {
+			if (purchaseDetail.getStatus().intValue() == Status.INBOUND.value() && (NumberUtil.compare(purchaseDetail.getShipQty(), purchaseDetail.getNumber()) == 0)) {
 				purchaseDetail.setStatusReceived(uu);
 				OrderDetail ordetDetail = orderDetailDao.findByDetailid(purchaseDetail.getOrderdetailid());
 				ordetDetail.setStatusShipped(sysConf.getAdminUU());
 				orderDetailDao.save(ordetDetail);
+			} else {
+				allReceived = false;
 			}
 		}
-		purchase.setStatusReceived(uu);
+		if (allReceived) {
+			purchase.setStatusReceived(uu);
+		}
 		purchase = purchaseDao.save(purchase);
 		// 1、生成入库单
 		receiptService.createPreceipts(invoiceFp);
@@ -594,9 +599,6 @@ public class PurchaseServiceImpl implements PurchaseService {
 			invoiceF.setStatus(Status.RECEIVED.value());
 		}
 		InvoiceFPurchase thisinvoiceFp = invoiceFPurchaseDao.save(invoiceFp);
-		if (thisinvoiceFp.getProofingid() == null) {
-			return inFpuService.setToReceiveMoney(invoiceFp.getPuid());
-		}
 		return thisinvoiceFp;
 	}