Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -299,7 +299,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
         }
 
-        if (new BigDecimal(orderInfoFeign.getResidueWeight()).compareTo(orderGoodsParams.getExtractWeight()) < 0) {
+        if (new BigDecimal(orderInfoFeign.getResidueWeight()).compareTo(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getExtractWeight())) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单提取吨数已超订单可提取吨数");
         }