修改订单收货延迟bug,增加打印日志

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

@@ -100,6 +100,7 @@ public class ImportReCeVingController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessEndDate());//收货日期结束
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
+		lambdaQueryWrapper.orderByDesc(Delivery::getCreateTime);
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		//解决回显字段问题
 		List<Delivery> records = pages.getRecords();
@@ -113,10 +114,13 @@ public class ImportReCeVingController extends BladeController {
 					e.setCorpsName(corps.getData().getCname());
 				}
 				//所属公司信息
-				R<CorpsDesc> company = corpsDescClient.getCorpMessage(e.getSalesCompany());
-				if(company.getData()!=null)
+				if(e.getSalesCompany()!=null)
 				{
-					e.setSalesCompanyName(company.getData().getCname());
+					R<CorpsDesc> company = corpsDescClient.getCorpMessage(e.getSalesCompany());
+					if(company.getData()!=null)
+					{
+						e.setSalesCompanyName(company.getData().getCname());
+					}
 				}
 				//仓库信息
 				StorageDesc storageDesc = iStorageClient.findById(e.getStorageId());
@@ -204,7 +208,7 @@ public class ImportReCeVingController extends BladeController {
 	@ApiOperation(value = "确认收货", notes = "传入Delivery及其子项")
 	public R comfire(@RequestBody Delivery delivery) {
 		deliveryService.comfire(delivery);
-	    return R.success("操作成功");
+	    return R.data(delivery);
 	}
 
 }

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

@@ -38,6 +38,8 @@ public class OrderItemsClient implements IOrderItemsClient{
 		items.setId(orderItemsId);
 		if (deliveryType == DeliveryEnum.DELIVER.getType()){ //发货
 			log.info("已发货数量为:==>"+actualQuantity);
+			log.info("订货数量:==>"+orderItems.getOrderQuantity());
+			log.info("已收数量:==>"+orderItems.getActualQuantity());
 			log.info("订货数量-已收数量:==>"+orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity()));
 
 			//判断 已发货数量 或者 已收货数量 ,不能大于(订货数量-已收数量)

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/component/impl/DefaultOrderSaveImpl.java

@@ -100,13 +100,13 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 			}
 			order.setSysNo((String) billNo.getData());
 			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
-			//生成订单号
+		/*	//生成订单号
 			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
 			if (!clientBillNo.isSuccess()){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new SecurityException("生成订单号失败");
 			}
-			order.setOrderNo((String) clientBillNo.getData());
+			order.setOrderNo((String) clientBillNo.getData());*/
 			//判断贸易类型
 			if(order.getTradeType().equals("JK"))
 			{