订单修改审批通过后处理如此异常的业务bug修复

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -1113,8 +1113,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         finishReqVO.setSendMsg(false);
         //不需要纪录操作日志
         finishReqVO.setIsAddOrderOperateLog(false);
-        // 不需要重订价格
-        finishReqVO.setIsResetPrice(false);
+        // 仅重置入仓异常信息
+        finishReqVO.setIsOnlyResetException(true);
         this.finishWarehouseIn(finishReqVO);
     }
 
@@ -1160,7 +1160,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         // 退场入仓不校验这些、拆单入仓不校验
         boolean isNotRollbackIn =
                 Boolean.FALSE.equals(finishReqVO.getIsRollbackIn());
-        if (isNotRollbackIn && !finishReqVO.getIsSplitIn()) {
+        if (isNotRollbackIn && !finishReqVO.getIsSplitIn() && !finishReqVO.getIsOnlyResetException()) {
             // 订单排单校验
             applicationContext.publishEvent(
                     new BoxCheckOrderSchedulingEvent(orderId));
@@ -1344,7 +1344,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
             // 重新调用计算订单价格, 订单信息和订单项信息需要重新查询，
             // 可能创建异常和修改订单已经对订单信息造成改变
             boolean firstRucang = orderDO.getRucangTime() == null;
-            if (finishReqVO.getIsResetPrice()) {
+            if (!finishReqVO.getIsOnlyResetException()) {
                 // 默认执行计价业务，可以手动确认不执行计价业务
                 if (firstRucang) {
                     //在下面的函数中完成费用计算

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderWarehouseIn/OrderWarehouseInFinishReqVO.java

@@ -107,8 +107,8 @@ public class OrderWarehouseInFinishReqVO {
     private Boolean isAddOrderOperateLog = true;
 
 
-    //是否需要重订价
+    //是否只单独重置异常
     @Transient
-    private Boolean isResetPrice = true;
+    private Boolean isOnlyResetException = false;
 
 }