Merge branch 'dev' into dev_v3.0.5

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java

@@ -192,24 +192,28 @@ public class ReservationStockInOrderApi extends BaseController {
 
 
     /**
-     * 上传并解析Excel文件
+     * 上传并解析Excel文件（默认读取"出库导入"工作表）
      * @param file Excel文件
-     * @param sheetName 工作表名称（出库导入/参考数据）
      * @return 解析后的出库数据
      */
     @PostMapping("/parseExcel")
     public ResponseEntity<Map<String, Object>> parseExcel(
             @RequestParam("file") MultipartFile file) {
+        Map<String, Object> result = new HashMap<>();
         try {
             DeliveryDataDTO deliveryDataDTO = reservationStockInOrderService.parseExcelFile(file, "");
-            Map<String, Object> result = new HashMap<>();
             result.put("result", deliveryDataDTO);
-            result.put("code",200);
+            result.put("code", 200);
+            result.put("msg", "解析成功");
             return new ResponseEntity<>(result, HttpStatus.OK);
         } catch (IllegalArgumentException e) {
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            result.put("code", 400);
+            result.put("msg", e.getMessage());
+            return new ResponseEntity<>(result, HttpStatus.BAD_REQUEST);
         } catch (Exception e) {
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+            result.put("code", 500);
+            result.put("msg", e.getMessage());
+            return new ResponseEntity<>(result, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }