2022年8月9日13点50分

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/feign/IDeliveryClient.java

@@ -25,6 +25,7 @@ public interface IDeliveryClient {
 	String SUBMIT_FEES = API_PREFIX + "submitFees";
 	String GET_ORDER_MESSAGE = API_PREFIX + "getOrderMessage";
 	String SUBMITPAY = API_PREFIX +"/submitPay";
+	String GET_ORDER_DATA = API_PREFIX +"/getOrderData";
 
 	/**
 	 * 生成发货单
@@ -54,4 +55,14 @@ public interface IDeliveryClient {
 	@GetMapping(SUBMITPAY)
 	R submitPay(@RequestParam("id") Long id);
 
+	/**
+	 * 根据采购订单号获取是否生成发货单
+	 * @param orderNo
+	 * @return
+	 */
+	@GetMapping(GET_ORDER_DATA)
+	List<Delivery> getOrderData(@RequestParam("orderNo") String orderNo,
+								   @RequestParam("billType") String billType,
+								   @RequestParam("tradeType") String tradeType);
+
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/feign/DeliveryClient.java

@@ -72,4 +72,15 @@ public class DeliveryClient implements IDeliveryClient{
 	public R submitPay(Long id) {
 		return R.status(deliveryItemsService.submitPay(id));
 	}
+
+	/**
+	 * 根据采购订单号获取是否生成发货单
+	 * @param orderNo
+	 * @return
+	 */
+	@Override
+	public List<Delivery> getOrderData(String orderNo, String billType, String tradeType) {
+		return deliveryService.list(new QueryWrapper<Delivery>().eq("order_no",orderNo).eq("is_deleted",0).eq("tenant_id", SecureUtil.getTenantId()).eq("trade_type",tradeType).eq("bill_type",billType));
+
+	}
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ImportReCeVingController.java

@@ -200,12 +200,13 @@ public class ImportReCeVingController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+
 		return R.status(deliveryService.removeByIds(Func.toLongList(ids)));
 	}
 
 
 	/**
-	 * 删除 进口收货通知单
+	 * 确认收货
 	 */
 	@PostMapping("/comfire")
 	@ApiOperationSupport(order = 8)

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -623,11 +623,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				if (financeAcc.isSuccess() && financeAcc.getData() != null && financeAcc.getData().compareTo(BigDecimal.ZERO) > 0) {
 					gathering = financeAcc.getData();
 				} else {
-					if (AuthUtil.getTenantId().equals("269129")){
-						gathering = new BigDecimal(0);
-					}else{
-						throw new RuntimeException("未找到收款记录");
-					}
+					throw new RuntimeException("未找到收款记录");
 				}
 				// 本次金额
 				List<DeliveryItems> itemsList = deliveryItemsList.stream().filter(e -> e.getSrcOrderNo().equals(srcOrderNo)).collect(Collectors.toList());
@@ -651,12 +647,8 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				gathering = gathering.add(usedProfit);
 
 				// 原来的判断 条件 : if (gathering.subtract(newDelivery.add(oldDelivery)).compareTo(BigDecimal.ZERO) <= 0){
-				if (gathering.subtract(newDelivery.add(oldDelivery)).compareTo(BigDecimal.ZERO) <= 0) {
-					if (AuthUtil.getTenantId().equals("269129")){
-
-					}else{
-						throw new RuntimeException("订单" + srcOrderNo + "发货金额超出 ,可发货金额为(CNY):" + (gathering.subtract(oldDelivery)).setScale(2, RoundingMode.UP));
-					}
+				if (gathering.subtract(newDelivery.add(oldDelivery)).compareTo(BigDecimal.ZERO) < 0) {
+					throw new RuntimeException("订单" + srcOrderNo + "发货金额超出 ,可发货金额为(CNY):" + (gathering.subtract(oldDelivery)).setScale(2, RoundingMode.UP));
 				}
 				/*if (gathering.compareTo((newDelivery.add(oldDelivery))) < 0){
 					throw new RuntimeException("订单"+srcOrderNo+"可发货金额为:"+gathering.subtract(oldDelivery.add(newDelivery)));

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderItemsController.java

@@ -35,6 +35,8 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.deliver.goods.entity.Delivery;
+import org.springblade.deliver.goods.feign.IDeliveryClient;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.excel.*;
@@ -74,6 +76,8 @@ public class OrderItemsController extends BladeController {
 	 */
 	private IGoodsDescClient goodsDescClient;
 
+	private final IDeliveryClient deliveryClient;
+
 	/**
 	 * 详情
 	 */
@@ -157,6 +161,14 @@ public class OrderItemsController extends BladeController {
 		if (orderItems.getId() == null) {
 			return R.fail(500, "请选择要删除的数据");
 		}
+		/*OrderItems orderItems1 = orderItemsService.getById(orderItems.getId());
+		if (ObjectUtils.isNotNull(orderItems1)){
+			List<Delivery> deliveryList = deliveryClient.getOrderData(orderItems1.getBillNo(),"SH","JK");
+			if (ObjectUtils.isNotNull(deliveryList)){
+				return R.fail(500, "请选择要删除的数据");
+			}
+		}*/
+
 		orderItems.setIsDeleted(1);
 		return R.status(orderItemsService.updateById(orderItems));
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderItemsClient.java

@@ -54,9 +54,9 @@ public class OrderItemsClient implements IOrderItemsClient {
 			log.info("订货数量-已收数量:==>" + orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity()));
 
 			//判断 已发货数量 或者 已收货数量 ,不能大于(订货数量-已收数量)
-			/*if (actualQuantity.compareTo(orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity())) >= 0) {
+			if (actualQuantity.compareTo(orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity())) > 0) {
 				throw new RuntimeException("操作数量大于件数,无法出入库");
-			}*/
+			}
 
 			items.setActualQuantity(orderItems.getActualQuantity().add(actualQuantity));
 		} else if (deliveryType == DeliveryEnum.REPEAL.getType()) {