Merge branch 'dev_lzh_wms_20260120' into wms_dev

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java

@@ -131,4 +131,12 @@ public class HandoverTaskOrderDTO extends BaseVOEntity {
 
     @ApiModelProperty("交接作业单id")
     private List<Long> handoverTaskOrderIds;
+
+    @ApiModelProperty("作业人用户ID")
+    @Excel(name = "作业人用户ID")
+    private Long operatorsBy;
+
+    @ApiModelProperty("作业人姓名")
+    @Excel(name = "作业人姓名")
+    private String operatorsName;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java

@@ -6,8 +6,10 @@ import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.wms.application.service.handoverTaskOrder.HandoverTaskOrderApplicationService;
 import com.mhd.wms.domain.handoverTaskOrder.repository.po.HandoverTaskOrderPO;
 import com.mhd.wms.domain.handoverTaskOrder.repository.todo.HandoverTaskOrderDO;
+import com.mhd.wms.domain.shiftManage.repository.todo.ShiftManageDO;
 import com.mhd.wms.interfaces.assember.handoverTaskOrder.HandoverTaskOrderAssembler;
 import com.mhd.wms.interfaces.dto.handoverTaskOrder.HandoverTaskOrderDTO;
+import com.mhd.wms.interfaces.dto.shiftManage.ShiftManageDTO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +72,16 @@ public class HandoverTaskOrderApi extends BaseController {
         return toAjax(handoverTaskOrderApplicationService.delete(outTaskOrderIds));
     }
 
+    /**
+     * 任务下发
+     */
+    @ApiOperation("任务下发")
+    @PostMapping(value = "/taskDistribution")
+    public AjaxResult taskDistribution(@RequestBody HandoverTaskOrderDTO handoverTaskOrderDTO) {
+        HandoverTaskOrderDO handoverTaskOrderDO = handoverTaskOrderAssembler.toDO(handoverTaskOrderDTO);
+        return AjaxResult.success(handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO));
+    }
+
     /**
      * 获取交接作业单详细信息
      */

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/deliveTask/DeliveTaskAppApi.java

@@ -55,6 +55,17 @@ public class DeliveTaskAppApi extends BaseController {
         return AjaxResult.success(deliveTaskApplicationService.getInfo(deliverTaskId));
     }
 
+    /**
+     * 转交用户
+     */
+    @ApiOperation("转交用户")
+    @PostMapping(value = "/forward")
+    public AjaxResult forward(DeliveTaskDTO deliveTaskDTO)
+    {
+        DeliveTaskDO deliveTaskDO = deliveTaskAssembler.toDO(deliveTaskDTO);
+        return AjaxResult.success(deliveTaskApplicationService.forward(deliveTaskDO));
+    }
+
 
     /**
      * 工作台查询