出入库移交任务及移除任务项;

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java

@@ -442,4 +442,7 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty("任务下发用户ID")
     private String taskIssueUserId;
+
+    @ApiModelProperty("任务移除用户ID")
+    private String removeUserId;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -499,4 +499,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
     private Long queryUserId;
     @ApiModelProperty("状态列表")
     private List<Integer> statusList;
+
+    @ApiModelProperty("任务移除用户ID")
+    private String removeUserId;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java

@@ -181,6 +181,15 @@ public class StockInOrderApi extends BaseController {
         stockInOrderApplicationService.acceptTask(stockInOrder);
     }
 
+    /**
+     * oms下发单保存
+     */
+    @ApiOperation("pda取消接收任务")
+    @PostMapping(value = "/removeTask")
+    public void removeTask(@RequestBody StockInOrderDO stockInOrderDO) {
+        stockInOrderApplicationService.removeTask(stockInOrderDO);
+    }
+
     /**
      * oms下发单明细保存
      */

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java

@@ -18,6 +18,7 @@ import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
+import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
 import com.mhd.wms.domain.stockOutOrder.repository.listener.ExcelParseService;
@@ -464,6 +465,24 @@ public class StockOutOrderApi extends BaseController {
         stockOutOrderApplicationService.omsOrderAdd(stockOutOrder);
     }
 
+    /**
+     * oms下发单保存
+     */
+    @ApiOperation("pda接收任务")
+    @PostMapping(value = "/acceptTask")
+    public void acceptTask(@RequestBody StockOutOrder stockOutOrder) {
+        stockOutOrderApplicationService.acceptTask(stockOutOrder);
+    }
+
+    /**
+     * oms下发单保存
+     */
+    @ApiOperation("pda取消接收任务")
+    @PostMapping(value = "/removeTask")
+    public void removeTask(@RequestBody StockOutOrderDO stockOutOrderDO) {
+        stockOutOrderApplicationService.removeTask(stockOutOrderDO);
+    }
+
     /**
      * oms下发单明细保存
      */