Commit ad79c7aa4d33dc161eb43670dba41acd43177fb8
1 parent
bfe834b8
快速入库修复
Showing
2 changed files
with
20 additions
and
18 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
... | ... | @@ -51,22 +51,4 @@ public class ReceiptController extends HuahengBaseController { |
51 | 51 | }); |
52 | 52 | return result; |
53 | 53 | } |
54 | - | |
55 | - @AutoLog(value = "PDA入库-快速入库") | |
56 | - @ApiOperation(value = "PDA入库-快速入库", notes = "快速入库") | |
57 | - @PostMapping("/quickReceipt") | |
58 | - @ResponseBody | |
59 | - @ApiLogger(apiName = "PDA入库-快速入库", from = "PDA") | |
60 | - public Result<?> quickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) { | |
61 | - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req); | |
62 | - bean.setWarehouseCode(warehouseCode); | |
63 | - | |
64 | - Result<?> result = handleMultiProcess("quickReceipt", new MultiProcessListener() { | |
65 | - @Override | |
66 | - public Result<?> doProcess() { | |
67 | - return mobileService.quickReceipt(bean, warehouseCode); | |
68 | - } | |
69 | - }); | |
70 | - return result; | |
71 | - } | |
72 | 54 | } |
... | ... |
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; |
9 | 9 | import lombok.extern.slf4j.Slf4j; |
10 | 10 | import org.jeecg.common.system.base.controller.JeecgController; |
11 | 11 | import org.jeecg.common.api.vo.Result; |
12 | +import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean; | |
13 | +import org.jeecg.modules.wms.api.mobile.service.IMobileService; | |
14 | +import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger; | |
15 | +import org.jeecg.modules.wms.framework.controller.HuahengBaseController; | |
12 | 16 | import org.jeecg.utils.HuahengJwtUtil; |
13 | 17 | import org.jeecg.modules.wms.api.erp.service.IErpService; |
14 | 18 | import org.jeecg.modules.wms.config.material.entity.Material; |
... | ... | @@ -64,6 +68,9 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec |
64 | 68 | @Autowired |
65 | 69 | private IReceiptHeaderService receiptHeaderService; |
66 | 70 | |
71 | + @Resource | |
72 | + private IMobileService mobileService; | |
73 | + | |
67 | 74 | @Autowired |
68 | 75 | private IReceiptDetailService receiptDetailService; |
69 | 76 | @Resource |
... | ... | @@ -345,4 +352,17 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec |
345 | 352 | Result result = erpService.backReceipt(receiptHeader); |
346 | 353 | return result; |
347 | 354 | } |
355 | + | |
356 | + @AutoLog(value = "PDA入库-快速入库") | |
357 | + @ApiOperation(value = "PDA入库-快速入库", notes = "快速入库") | |
358 | + @PostMapping("/quickReceipt") | |
359 | + @ResponseBody | |
360 | + @ApiLogger(apiName = "PDA入库-快速入库", from = "PDA") | |
361 | + public Result<?> quickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) { | |
362 | + String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req); | |
363 | + bean.setWarehouseCode(warehouseCode); | |
364 | + | |
365 | + return mobileService.quickReceipt(bean, warehouseCode); | |
366 | + | |
367 | + } | |
348 | 368 | } |
... | ... |