|
|
@@ -1,6 +1,7 @@
|
|
|
package org.springblade.purchase.sales.feign;
|
|
|
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springblade.core.tenant.annotation.NonDS;
|
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.deliver.goods.enums.DeliveryEnum;
|
|
|
@@ -11,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
import springfox.documentation.annotations.ApiIgnore;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-
|
|
|
+@Slf4j
|
|
|
@NonDS
|
|
|
@ApiIgnore()
|
|
|
@RestController
|
|
|
@@ -36,6 +37,9 @@ public class OrderItemsClient implements IOrderItemsClient{
|
|
|
OrderItems items = new OrderItems();
|
|
|
items.setId(orderItemsId);
|
|
|
if (deliveryType == DeliveryEnum.DELIVER.getType()){ //发货
|
|
|
+ log.info("已发货数量为:==>"+actualQuantity);
|
|
|
+ log.info("订货数量-已收数量:==>"+orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity()));
|
|
|
+
|
|
|
//判断 已发货数量 或者 已收货数量 ,不能大于(订货数量-已收数量)
|
|
|
if(actualQuantity.compareTo(orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity()))>0)
|
|
|
{
|