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

@@ -354,8 +354,11 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(detailList, 8);
             List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(detailList, 8);
             handleBatchData(batchList, planId);
             handleBatchData(batchList, planId);
         }
         }
-        // 更细发货计划状态
-        shipmentsPlanDetailService.completed(planId);
+        ShipmentsPlan plan = shipmentsPlanService.findById(planId);
+        if ("IN_PROGRESS".equals(plan.getStatus())) {
+            // 更新发货计划状态
+            shipmentsPlanDetailService.completed(planId);
+        }
     }
     }