Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -57,6 +57,7 @@ public class AuditProecessController extends BladeController {
 	public R<IPage<AuditProecess>> list(AuditProecess auditProecess, Query query) {
 		LambdaQueryWrapper<AuditProecess> lambdaQueryWrapper=new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(AuditProecess::getAuditUserId, String.valueOf(AuthUtil.getUserId()));
+		lambdaQueryWrapper.eq(AuditProecess::getAuditStatus, "S");
 		IPage<AuditProecess> pages = auditProecessService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -230,7 +230,7 @@ public class DeliveryController extends BladeController {
 		return R.status(deliveryService.removeByIds(Func.toLongList(ids)));
 	}
 
-	@PostMapping("comfire")
+	@PostMapping("")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "确认收货", notes = "确认收货")
 	public R comfire(@RequestBody Delivery delivery)

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

@@ -291,7 +291,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				R r = iOrderItemsClient.updateActualQuantity(e.getSrcId(), inventoryNumber, 1);
 				if(!r.isSuccess())
 				{
-					throw new SecurityException("更新采购明细失败->已发数量:"+r.getMsg());
+					throw new SecurityException("更新采购明细失败->已发数量");
 				}
 				if(delivery.getTradeType().equals("JK"))
 				{
@@ -299,7 +299,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					R weightR = iOrderItemsClient.updateActualWeight(e.getSrcId(), invoiceWeight, 1);
 					if(!weightR.isSuccess())
 					{
-						throw new SecurityException("更新采购明细失败->已发发票重量:"+r.getMsg());
+						throw new SecurityException("更新采购明细失败->已发发票重量");
 					}
 				}
 
@@ -332,7 +332,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			 R r = iOrderItemsClient.updateActualQuantity(e.getSrcId(), inventoryNumber, 2);
 			 if(!r.isSuccess())
 			 {
-				 throw new SecurityException("更新采购明细失败:"+r.getMsg());
+				 throw new SecurityException("更新采购明细失败");
 			 }
 			 //更新item 发票重量
 			 if(delivery.getTradeType().equals("JK"))
@@ -340,7 +340,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				 R weightR = iOrderItemsClient.updateActualWeight(e.getSrcId(), invoiceWeight, 2);
 				 if(!weightR.isSuccess())
 				 {
-					 throw new SecurityException("更新采购明细失败->已发发票重量:"+r.getMsg());
+					 throw new SecurityException("更新采购明细失败->已发发票重量");
 				 }
 			 }
 			 //查询stock,后续更新stock数量

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

@@ -67,6 +67,7 @@ public class OrderItemsClient implements IOrderItemsClient{
 			throw new RuntimeException("找不到订单明细");
 		}
 		OrderItems items = new OrderItems();
+		items.setId(orderItemsId);
 		if (deliveryType == DeliveryEnum.DELIVER.getType()){ //发货
 			log.info("发货-发票重量为:==>"+actualWeight);
 			log.info("原发票重量:==>"+orderItems.getInvoiceWeight());

blade-service/blade-stock/src/main/java/org/springblade/stock/feign/StockGoodsClient.java

@@ -135,8 +135,10 @@ public class StockGoodsClient implements IStockGoodsClient{
 		LambdaQueryWrapper<StockGoods> stockGoodsLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		stockGoodsLambdaQueryWrapper
 			.eq(stockGoods.getStorageId()!=null,StockGoods::getStorageId,stockGoods.getStorageId())
+			.eq(stockGoods.getGoodsId()!=null,StockGoods::getGoodsId,stockGoods.getGoodsId())
 			.eq(StringUtils.isNotBlank(stockGoods.getContractNumber()),StockGoods::getContractNumber,stockGoods.getContractNumber())
 			.eq(StringUtils.isNotBlank(stockGoods.getBillNo()),StockGoods::getBillNo,stockGoods.getBillNo())
+			.eq(StringUtils.isNotBlank(stockGoods.getCntrNo()),StockGoods::getCntrNo,stockGoods.getCntrNo())
 			.eq(StockGoods::getIsDeleted,0)
 			.eq(StockGoods::getTenantId,AuthUtil.getTenantId());
 		List<StockGoods> goodsList = stockGoodsService.list(stockGoodsLambdaQueryWrapper);