呼叫料盒接口从外部接口包中迁出

周峰
1 parent 82be1a6c
Showing 4 changed files with 35 additions and 37 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -32,23 +32,4 @@ public class ReceiptController extends HuahengBaseController {
     @Resource
     private IMobileService mobileService;
  
-    @AutoLog(value = "PDA入库-呼叫料盒")
-    @ApiOperation(value = "PDA入库-呼叫料盒", notes = "创建空的补充入库任务，并返回任务id")
-    @PostMapping("/callbox")
-    @ResponseBody
-    @ApiLogger(apiName = "PDA入库-呼叫料盒", from = "PDA")
-    public Result<?> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-
-        // 补充入库类型
-        bean.setType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
-
-        Result<?> result = handleMultiProcess("callBox", new MultiProcessListener() {
-            @Override
-            public Result<?> doProcess() {
-                return mobileService.callBox(bean, warehouseCode);
-            }
-        });
-        return result;
-    }
 }
@@ -32,23 +32,5 @@ public class ShipmentController extends HuahengBaseController {
     @Resource
     private IMobileService mobileService;
  
-    @AutoLog(value = "PDA出库-呼叫料盒")
-    @ApiOperation(value = "PDA出库-呼叫料盒", notes = "创建空的分拣出库任务，并返回任务id")
-    @PostMapping("/callbox")
-    @ResponseBody
-    @ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
-    public Result<TaskHeader> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
  
-        // 补充入库类型
-        bean.setType(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT);
-
-        Result result = handleMultiProcess("callBox", new MultiProcessListener() {
-            @Override
-            public Result doProcess() {
-                return mobileService.callBox(bean, warehouseCode);
-            }
-        });
-        return result;
-    }
 }
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
 import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean;
 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
@@ -365,4 +366,17 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
         return mobileService.quickReceipt(bean, warehouseCode);
  
     }
+
+    @AutoLog(value = "PDA入库-呼叫料盒")
+    @ApiOperation(value = "PDA入库-呼叫料盒", notes = "创建空的补充入库任务，并返回任务id")
+    @PostMapping("/callbox")
+    @ResponseBody
+    @ApiLogger(apiName = "PDA入库-呼叫料盒", from = "PDA")
+    public Result<?> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+
+        // 补充入库类型
+        bean.setType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
+        return mobileService.callBox(bean, warehouseCode);
+    }
 }
@@ -20,12 +20,17 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wms.api.erp.service.IErpService;
+import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
+import org.jeecg.modules.wms.api.mobile.service.IMobileService;
+import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
+import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -60,6 +65,9 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IShipmentHeaderService> {
  
+    @Resource
+    private IMobileService mobileService;
+
     @Autowired
     private IShipmentHeaderService shipmentHeaderService;
  
@@ -355,4 +363,17 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
         Result result = erpService.backShipment(shipmentHeader);
         return result;
     }
+
+    @AutoLog(value = "PDA出库-呼叫料盒")
+    @ApiOperation(value = "PDA出库-呼叫料盒", notes = "创建空的分拣出库任务，并返回任务id")
+    @PostMapping("/callbox")
+    @ResponseBody
+    @ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
+    public Result<TaskHeader> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+
+        // 补充入库类型
+        bean.setType(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT);
+        return mobileService.callBox(bean, warehouseCode);
+    }
 }