diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java index 918276a..57d2fa0 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java @@ -51,22 +51,4 @@ public class ReceiptController extends HuahengBaseController { }); return result; } - - @AutoLog(value = "PDA入库-快速入库") - @ApiOperation(value = "PDA入库-快速入库", notes = "快速入库") - @PostMapping("/quickReceipt") - @ResponseBody - @ApiLogger(apiName = "PDA入库-快速入库", from = "PDA") - public Result<?> quickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) { - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req); - bean.setWarehouseCode(warehouseCode); - - Result<?> result = handleMultiProcess("quickReceipt", new MultiProcessListener() { - @Override - public Result<?> doProcess() { - return mobileService.quickReceipt(bean, warehouseCode); - } - }); - return result; - } } diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java index a472730..9457203 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java @@ -9,6 +9,10 @@ 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.QuickReceiptBean; +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.utils.HuahengJwtUtil; import org.jeecg.modules.wms.api.erp.service.IErpService; import org.jeecg.modules.wms.config.material.entity.Material; @@ -64,6 +68,9 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec @Autowired private IReceiptHeaderService receiptHeaderService; + @Resource + private IMobileService mobileService; + @Autowired private IReceiptDetailService receiptDetailService; @Resource @@ -345,4 +352,17 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec Result result = erpService.backReceipt(receiptHeader); return result; } + + @AutoLog(value = "PDA入库-快速入库") + @ApiOperation(value = "PDA入库-快速入库", notes = "快速入库") + @PostMapping("/quickReceipt") + @ResponseBody + @ApiLogger(apiName = "PDA入库-快速入库", from = "PDA") + public Result<?> quickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) { + String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req); + bean.setWarehouseCode(warehouseCode); + + return mobileService.quickReceipt(bean, warehouseCode); + + } }