Selaa lähdekoodia

处理发货的不会修改发货数量的问题

yujia 7 vuotta sitten
vanhempi
commit
64a60c33c7

+ 4 - 1
src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFPurchaseServiceImpl.java

@@ -280,7 +280,7 @@ public class InvoiceFPurchaseServiceImpl implements InvoiceFPurchaseService {
 					qty = Double.valueOf(qty1.toString());
 				}
 			}
-			if (Status.TOBESHIPPED.value() != puDetail.getStatus() || NumberUtil.compare(qty, DoubleConstant.zero) < 1) {
+			if ((Status.TOBESHIPPED.value() != puDetail.getStatus() && Status.CONFIRMED.value() != puDetail.getStatus()) || NumberUtil.compare(qty, DoubleConstant.zero) < 1) {
 				continue;
 			}
 			product = productService.findProductByProdNum(puDetail.getGoodsnumber());
@@ -322,6 +322,9 @@ public class InvoiceFPurchaseServiceImpl implements InvoiceFPurchaseService {
 			ensurePrice = NumberUtil.add(ensurePrice, price);
 			taxes = NumberUtil.add(taxes, NumberUtil.sub(NumberUtil.mul(qty, puDetail.getTaxUnitPrice()), NumberUtil.mul(qty, puDetail.getUnitprice())));
 		}
+		if (CollectionUtils.isNotEmpty(IpDetails)) {
+			throw new IllegalOperatorException("没有需要发货的信息");
+		}
 		Enterprise enterprise = enterpriseDao.findByUu(purchase.getSellerenuu());
 		if (enterprise == null) {
 			throw new IllegalOperatorException("该供应商不存在");