1021934019@qq.com пре 4 година
родитељ
комит
6a54b35c14

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

@@ -293,12 +293,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				{
 					throw new SecurityException("更新采购明细失败->已发数量:"+r.getMsg());
 				}
-				//更新item已收发票重量
-				R weightR = iOrderItemsClient.updateActualWeight(e.getSrcId(), invoiceWeight, 1);
-				if(!weightR.isSuccess())
+				if(delivery.getTradeType().equals("JK"))
 				{
-					throw new SecurityException("更新采购明细失败->已发发票重量:"+r.getMsg());
+					//更新item已收发票重量
+					R weightR = iOrderItemsClient.updateActualWeight(e.getSrcId(), invoiceWeight, 1);
+					if(!weightR.isSuccess())
+					{
+						throw new SecurityException("更新采购明细失败->已发发票重量:"+r.getMsg());
+					}
 				}
+
 				//更新库存内容
 				iDeliveryItemsService.updateById(e);
 
@@ -331,10 +335,13 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				 throw new SecurityException("更新采购明细失败:"+r.getMsg());
 			 }
 			 //更新item 发票重量
-			 R weightR = iOrderItemsClient.updateActualWeight(e.getSrcId(), invoiceWeight, 2);
-			 if(!weightR.isSuccess())
+			 if(delivery.getTradeType().equals("JK"))
 			 {
-				 throw new SecurityException("更新采购明细失败->已发发票重量:"+r.getMsg());
+				 R weightR = iOrderItemsClient.updateActualWeight(e.getSrcId(), invoiceWeight, 2);
+				 if(!weightR.isSuccess())
+				 {
+					 throw new SecurityException("更新采购明细失败->已发发票重量:"+r.getMsg());
+				 }
 			 }
 			 //查询stock,后续更新stock数量
 			 StockGoods model=new StockGoods();