批量导入更改工艺路线

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java

@@ -131,6 +131,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
         //工单List
         List<shopOrderReleaseDto> shopOrderList;
         List<ShopOrderRelease> shopOrderReleaseList = new ArrayList<ShopOrderRelease>();
+        StringBuffer message = new StringBuffer();
         try {
             CommonsMultipartFile multipartFile = new CommonsMultipartFile(fileItem);
             shopOrderList = ExcelUtils.readExcel(fileType, shopOrderReleaseDto.class, multipartFile, null);
@@ -154,12 +155,18 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
                         return R.failed("此工单编号不存在:" + orderReleaseDto.getShopOrder());
                     }
                 }
-                Boolean result = this.changerouterRevision(shopOrderReleaseList, new StringBuffer(), "A");
+                Boolean result = this.changerouterRevision(shopOrderReleaseList, message, "A");
-                return R.ok(result);
+                if (result){
+                    message.insert(0, "更新成功");
+                    return R.ok(message.toString());
+                }else {
+                    message.insert(0, "已是最新版本：");
+                    return R.failed(message.toString());
+                }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            message.append(e.getMessage());
-            return R.failed(e.getMessage());
+            return R.failed(message.toString());
         }
     }