Merge branch 'dev' into dev_WMS20260401

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java

@@ -102,4 +102,7 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{
     @ApiModelProperty("体积")
     private BigDecimal materialVolume;
 
+    @ApiModelProperty("货物内容")
+    private String materialContent;
+
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java

@@ -765,6 +765,9 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty(value = "出入库单号")
     private String entryNumber;
 
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java

@@ -128,4 +128,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("备注")
     private String  shippingNote;
+
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java

@@ -110,6 +110,17 @@ public class BusinessDocumentOrderApi extends BaseController{
     {
         return toAjax(businessDocumentOrderApplicationService.execute(ids));
     }
+
+    /**
+     * 批量执行并下发【业务单】
+     */
+    @ApiOperation("批量执行并下发【业务单】")
+    @PostMapping("/executeAndIssue")
+    public AjaxResult executeAndIssue(@RequestParam("ids") Long[] ids)
+    {
+        return toAjax(businessDocumentOrderApplicationService.executeAndIssue(ids));
+    }
+
     @ApiOperation("获取业务单的货物内容")
     @GetMapping("/getCargoContent/{id}")
     public AjaxResult getCargoContent(@PathVariable("id") Long id)