Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -455,8 +455,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             throw new ServiceException("未找到订单");
         }
 
-        delete(id);
-
         if (orderInfo.getStatus() <= OrderStatusEnum.STOCK_PREPARATION.getKey()) {
             return;
         }
@@ -514,7 +512,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         semiFinishedProductInOutStorageDto.setWarehouseId(WarehouseConstant.SEMI_FINISHED_PRODUCT);
         semiFinishedProductInOutStorageDto.setDepartmentId(orderInfo.getOutDepartmentId());
         semiFinishedProductInOutStorageDto.setApplicant(SecurityUtils.getLoginUser().getUser().getNickName());
-        semiFinishedProductInOutStorageDto.setRemark("删除订单：" + orderInfo.getCode() + " 主材退货入库");
+        semiFinishedProductInOutStorageDto.setRemark("删除订单：" + orderInfo.getCode() + " 主材退料入库");
         semiFinishedProductInOutStorageDto.setInOutStorageBomList(semiFinishedProductInOutStorageBomList);
         inOutStorageService.add(semiFinishedProductInOutStorageDto);
 
@@ -535,10 +533,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         packagingMaterialInOutStorageDto.setWarehouseId(WarehouseConstant.PACKAGING_MATERIAL);
         packagingMaterialInOutStorageDto.setDepartmentId(orderInfo.getOutDepartmentId());
         packagingMaterialInOutStorageDto.setApplicant(SecurityUtils.getLoginUser().getUser().getNickName());
-        packagingMaterialInOutStorageDto.setRemark("删除订单：" + orderInfo.getCode() + " 包材退货入库");
+        packagingMaterialInOutStorageDto.setRemark("删除订单：" + orderInfo.getCode() + " 包材退料入库");
         packagingMaterialInOutStorageDto.setInOutStorageBomList(packagingMaterialInOutStorageBomList);
         inOutStorageService.add(packagingMaterialInOutStorageDto);
 
+        delete(id);
     }
 
     @Override