#1

dubin

4 天以前 864c18c46c2db1ae92220181e40b291b3b0d9446

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -1,20 +1,29 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

@@ -34,12 +43,18 @@
    @Autowired
    private OpenService openService;

    @Autowired
    private ConfigService configService;

    @Autowired
    private LocMastService locMastService;

    @Deprecated
    @PostMapping("/grouping")
    @AppAuth(memo = "AGV组托调用")
    public synchronized R grouping(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) AgvGroupingParam param,
                                      HttpServletRequest request){
                                   @RequestBody(required = false) AgvGroupingParam param,
                                   HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param.getOrderNo())) {
            param.setOrderNo(param.getBillNo());
@@ -57,14 +72,14 @@
    @PostMapping("/barcodeVerificatio")
    @AppAuth(memo = "AGV调用校验条码")
    public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) Map<String,String> param,
                                   HttpServletRequest request){
                                             @RequestBody(required = false) Map<String, String> param,
                                             HttpServletRequest request) {
        auth(appkey, param, request);

        // 托盘条码
        String barcode = param.get("barcode");
        if (Cools.isEmpty(barcode)) {
           return R.parse("条码不能为空");
            return R.parse("条码不能为空");
        }

        return openService.barcodeVerificatio(barcode);
@@ -73,10 +88,14 @@
    @PostMapping("/outbound")
    @AppAuth(memo = "MES调用出库")
    public synchronized R outbound(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) OutBoundParam param,
                                      HttpServletRequest request) {
                                   @RequestBody(required = false) OutBoundParam param,
                                   HttpServletRequest request) {
        Config mesAuto = configService.selectConfigByCode("CLOSE_OUTBOUND");
        if (mesAuto != null && mesAuto.getValue().equals("0")) {
            return R.parse("关闭自动出库");
        }
        auth(appkey, param, request);
        if (Cools.isEmpty(param.getEndLocation(),param.getBarcode(),param.getOrderNo())) {
        if (Cools.isEmpty(param.getEndLocation(), param.getBarcode(), param.getOrderNo())) {
            return R.parse(BaseRes.PARAM);
        }

@@ -87,7 +106,7 @@
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
                                      HttpServletRequest request){
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -201,6 +220,25 @@
        return R.ok().add(openService.queryStock());
    }


    /**
     * 返回库存利用率
     */
    @Synchronized
    @PostMapping("/stock/used/v1")
    public R getRate(@RequestHeader(required = false) String appkey,
                     @RequestBody(required = false) OpenOrderCompleteParam param,
                     HttpServletRequest request) {
        auth(appkey, param, request);
        int i = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", "O"));
        int i1 = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", Arrays.asList("D", "F", "P", "Q", "R", "S")));
        BigDecimal dividend = new BigDecimal(i1 - i);
        BigDecimal divisor = new BigDecimal(i1);
        BigDecimal quotient = dividend.divide(divisor,4, BigDecimal.ROUND_HALF_UP);
        return R.ok().add(quotient);
    }


    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);