添加编号;

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/deliveryDetailsLinkItems/DeliveryDetailsLinkItemsApi.java

@@ -4,6 +4,8 @@ import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.wms.application.service.deliveryDetailsLinkItems.DeliveryDetailsLinkItemsApplicationService;
+import com.mhd.wms.domain.deliveryDetailsLink.entity.DeliveryDetailsLink;
+import com.mhd.wms.domain.deliveryDetailsLink.repository.mapper.DeliveryDetailsLinkMapper;
 import com.mhd.wms.domain.deliveryDetailsLink.repository.todo.DeliveryDetailsLinkDO;
 import com.mhd.wms.domain.deliveryDetailsLinkItems.repository.po.DeliveryDetailsLinkItemsPO;
 import com.mhd.wms.domain.deliveryDetailsLinkItems.repository.todo.DeliveryDetailsLinkItemsDO;
@@ -15,7 +17,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 配送明细关联子项Api
@@ -31,19 +35,28 @@ public class DeliveryDetailsLinkItemsApi extends BaseController {
 
     @Resource
     private DeliveryDetailsLinkItemsAssembler deliveryDetailsLinkItemsAssembler;
+    @Autowired
+    private DeliveryDetailsLinkMapper deliveryDetailsLinkMapper;
 
     /**
      * 分页查询配送明细关联子项列表
      */
     @ApiOperation("查询配送明细关联子项列表")
     @GetMapping("/list")
-    public TableDataInfo list(DeliveryDetailsLinkItemsDTO deliveryDetailsLinkItemsDTO)
+    public AjaxResult list(DeliveryDetailsLinkItemsDTO deliveryDetailsLinkItemsDTO)
     {
+        Map<String,Object> map=new HashMap<String,Object>();
         //转换实体
         DeliveryDetailsLinkItemsDO deliveryDetailsLinkItemsDO = deliveryDetailsLinkItemsAssembler.toDO(deliveryDetailsLinkItemsDTO);
         startPage();
         List<DeliveryDetailsLinkItemsPO> list = deliveryDetailsLinkItemsApplicationService.queryList(deliveryDetailsLinkItemsDO);
-        return getDataTable(list);
+        Long deliveryId = deliveryDetailsLinkItemsDTO.getDeliveryId();
+        DeliveryDetailsLink deliveryDetailsLink = deliveryDetailsLinkMapper.selectById(deliveryId);
+        if (deliveryDetailsLink != null) {
+            map.put("deliveryDetailsLink", deliveryDetailsLink);
+        }
+        map.put("list",getDataTable(list));
+        return AjaxResult.success(map);
     }
 
     /**