Commit 00e41a2cbd7542c18957ee85fb2c9b0ae49d8eeb

Authored by yeqianyong
2 parents 9b7fe037 4b27f6e4

Merge branch 'master_after20' into master_cj_zq

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