lsh#

1

2 天以前 786fccc26cb790d75be1d95077675163699abcf3

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java

@@ -8,6 +8,7 @@
import com.vincent.rsf.server.api.controller.erp.params.ManualShelvingParams;
import com.vincent.rsf.server.api.controller.erp.params.OpStockParams;
import com.vincent.rsf.server.api.controller.erp.params.OtherReceiptParams;
import com.vincent.rsf.server.api.service.AgvService;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
@@ -47,6 +48,8 @@
    private TaskService taskService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private AgvService agvService;
    /**
     * PDA用户登录
     * @param param
@@ -114,7 +117,7 @@
    @ApiOperation("获取收货区")
    @GetMapping("/areas/receipt")
    public R getReceiptAreas() {
        return mobileService.getReceiptAreas();
        return mobileService.getReceiptAreas(getLoginUser());
    }


@@ -188,8 +191,8 @@
    public void asyncProcessAfterValidation(WaitPakinParam waitPakinPda,Long userId) {
        try {
            Thread.sleep(500);
            WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakinPda.getBarcode()));
            taskService.generateFlatWarehouseTasks(waitPakin, waitPakinPda.getStaNo(), userId);
//            WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakinPda.getBarcode()));
            agvService.AGVBindAndInTaskStart(waitPakinPda, userId);
//            mobileService.mergeItemsWcs(waitPakin,userId);
        } catch (Exception e) {
//            log.error("异步处理AGV后续逻辑失败", e);