OMS执行单开发

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

@@ -67,4 +67,36 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{
 
     @ApiModelProperty(name = "权限菜单ID")
     private Long permissionMenuId;
+
+    @ApiModelProperty("货物名称")
+    private String cargoName;
+
+    @ApiModelProperty("货物单位ID")
+    private String cargoUnitId;
+
+    @ApiModelProperty("货物单位名字")
+    private String cargoUnitName;
+
+    @ApiModelProperty(value = "货物数量")
+    private BigDecimal cargoNum;
+
+    private BigDecimal weight;
+    @ApiModelProperty(value = "重量单位ID")
+    private String weightUnitId;
+    @ApiModelProperty(value = "重量单位名称")
+    private String weightUnit;
+
+
+    @ApiModelProperty(value = "数量单位ID")
+    private String quantityUnitId;
+    @ApiModelProperty(value = "数量单位名称")
+    private String quantityUnit;
+
+
+    @ApiModelProperty("整机表编号")
+    private String machineCode;
+
+    @ApiModelProperty("")
+    private String materialCode;
+
 }

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

@@ -1,6 +1,10 @@
 package com.mhd.oms.interfaces.dto.businessDocumentOrder;
 
 import com.mhd.common.core.annotation.Excel;
+import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAddressMulti;
+import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO;
+import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
+import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
 import lombok.Data;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -702,4 +706,15 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty("预约单号")
     private String  reservationOrderNumber;
 
+    @ApiModelProperty("业务单地址集合")
+    private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
+
+    @ApiModelProperty("业务单货物集合")
+    private List<BusinessDocumentCargoMulti>  businessDocumentCargoMultiList;
+
+    @ApiModelProperty(value = "装货地址集合")
+    private List<BusinessDocumentAddressMultiDTO> loadingAddressList;
+    @ApiModelProperty(value = "卸货地址集合")
+    private List<BusinessDocumentAddressMultiDTO> unloadAddressList;
+
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java

@@ -4,13 +4,7 @@ import java.util.List;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.mhd.oms.interfaces.dto.executeOrder.ExecuteOrderDTO;
 import com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO;
 import com.mhd.oms.domain.executeOrder.repository.po.ExecuteOrderPO;
@@ -22,7 +16,7 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
 
 /**
- * 【请填写功能名称】Api
+ * 【执行单】Api
  *
  * @author gen
  * @date 2026-01-27
@@ -37,9 +31,9 @@ public class ExecuteOrderApi extends BaseController{
     private ExecuteOrderAssembler executeOrderAssembler;
 
     /**
-     * 分页查询【请填写功能名称】列表
+     * 分页查询【执行单】列表
      */
-    @ApiOperation("查询【请填写功能名称】列表")
+    @ApiOperation("查询【执行单】列表")
     @GetMapping("/list")
     public TableDataInfo list(ExecuteOrderDTO executeOrderDTO)
     {
@@ -51,9 +45,9 @@ public class ExecuteOrderApi extends BaseController{
     }
 
     /**
-     * 编辑【请填写功能名称】
+     * 编辑【执行单】
      */
-    @ApiOperation("编辑【请填写功能名称】")
+    @ApiOperation("编辑【执行单】")
     @PostMapping("/edit")
     public AjaxResult edit(@RequestBody ExecuteOrderDTO executeOrderDTO)
     {
@@ -67,9 +61,9 @@ public class ExecuteOrderApi extends BaseController{
     }
 
     /**
-     * 批量删除【请填写功能名称】
+     * 批量删除【执行单】
      */
-    @ApiOperation("批量删除【请填写功能名称】")
+    @ApiOperation("批量删除【执行单】")
     @DeleteMapping("/deleteByIds/{ids}")
     public AjaxResult delete(@PathVariable Long[] ids)
     {
@@ -77,9 +71,9 @@ public class ExecuteOrderApi extends BaseController{
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取【执行单】详细信息
      */
-    @ApiOperation("获取【请填写功能名称】")
+    @ApiOperation("获取【执行单】")
     @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -88,6 +82,15 @@ public class ExecuteOrderApi extends BaseController{
 
 
 
+    /**
+     * 批量下发【执行单】
+     */
+    @ApiOperation("批量下发【执行单】")
+    @PostMapping("/issueDocuments")
+    public AjaxResult issueDocuments(@RequestParam("ids") Long[] ids)
+    {
+        return toAjax(executeOrderApplicationService.issueDocuments(ids));
+    }