0213oms

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/resevationOrder/OmsCargoInfoDTO.java

@@ -63,7 +63,7 @@ public class OmsCargoInfoDTO implements Serializable {
     private BigDecimal materialVolume;
 
     @ApiModelProperty("内容")
-    private String materialContent;
+    private String cargoContent;
 
     @ApiModelProperty("是否为库存")
     private boolean stockFlag;

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/resevationOrder/OmsOrderAddDTO.java

@@ -470,6 +470,11 @@ public class OmsOrderAddDTO implements Serializable {
     @ApiModelProperty("业务员编码nc")
     private String salesmanCodeNc;
 
+    @ApiModelProperty("起运时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date departureTime;
+
     @ApiModelProperty(value = "单据日期")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/resevationOrder/ResevationOrderApi.java

@@ -82,7 +82,7 @@ public class ResevationOrderApi extends BaseController{
     }
 
     /**
-     * 分页查询【业务单】列表
+     * 分页查询【预约单】列表
      */
     @ApiOperation("查询【预约单】列表")
     @GetMapping("/list")
@@ -118,5 +118,26 @@ public class ResevationOrderApi extends BaseController{
         return result;
     }
 
+    /**
+     * 批量驳回预约单
+     */
+    @ApiOperation("批量驳回预约单")
+    @PostMapping("/batchReject")
+    public Result<?> batchReject(@RequestBody List<String> goodsNumbers) {
+        Result<?> result = new Result<>();
+        try {
+            if (goodsNumbers == null || goodsNumbers.isEmpty()) {
+                result.error500("预约单号列表不能为空");
+                return result;
+            }
+            return omsAddressMultiService.batchRejectReservationOrder(goodsNumbers);
+        } catch (ServiceException e) {
+            result.error500("批量驳回失败: " + e.getErrorMessage());
+        } catch (Exception e) {
+            result.error500("批量驳回失败: " + e.getMessage());
+        }
+        return result;
+    }
+
 
 }