实现PDA灌桶入库呼叫新料功能，优化Web页面

lbq

13 小时以前 3cc9e4551c42c1eb40c09f181857f2e0b1aa8355

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

@@ -1,19 +1,22 @@
package com.vincent.rsf.server.api.controller.pda;

import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.erp.params.InventoryQueryConditionParam;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.InBoundService;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;
import javax.annotation.Resource;

@Api(tags = "PDA入库操作接口")
@RequestMapping("/pda")
@@ -22,6 +25,8 @@

    @Autowired
    private InBoundService inBoundService;
    @Resource
    private ReceiveMsgService receiveMsgService;

    @PostMapping("/in/emptyContainer/warehousing")
    @ApiOperation("空容器入库")
@@ -35,4 +40,34 @@
        return inBoundService.checkAgvStation(param, getLoginUserId());
    }

    @PostMapping("/check/non/order")
    @ApiOperation("非订单出库")
    public R checkNonOrder(@RequestBody PdaGeneralParam param) {
        if (Cools.isEmpty(param.getTransferStationNo())) {
            return R.error("目标站点为空！！！");
        }
        if (Cools.isEmpty(param.getLocNo())) {
            return R.error("请选择起点库位！！！");
        }
        return inBoundService.checkNonOrder(param, getLoginUserId());
    }

    /**
     * 库存查询明细
     *
     * @param condition 查询条件
     * @return 库存明细列表
     */
    @PostMapping("/inventory/details")
    @ApiOperation(value = "库存查询明细", hidden = true)
    @OperationLog("库存查询明细")
    public R queryInventoryDetails(@RequestBody InventoryQueryConditionParam condition) {
        // 参数验证
        if (condition == null) {
            return R.error("查询条件不能为空");
        }

        return receiveMsgService.erpQueryInventoryDetails(condition);
    }

}