1

zhang

9 天以前 570300c26ff3c562c03ac24e4896f72d33fa4369

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

@@ -1,20 +1,31 @@
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.LocDetl;
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.math.RoundingMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -34,12 +45,21 @@
    @Autowired
    private OpenService openService;

    @Autowired
    private ConfigService configService;

    @Autowired
    private LocMastService locMastService;

    @Autowired
    private LocDetlService locDetlService;

    @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 +77,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 +93,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 +111,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 +225,65 @@
        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);
        // 在库率=(总数-空库位数)/总数
        BigDecimal quotient = BigDecimal.valueOf(1200 - i)
                .divide(BigDecimal.valueOf(1200), 4, RoundingMode.HALF_UP);
        return R.ok().add(quotient);
    }


    @Synchronized
    @PostMapping("/stock/used/v3")
    public R getRate2(@RequestHeader(required = false) String appkey,
                      @RequestBody(required = false) LocMast param,
                      HttpServletRequest request) {
        auth(appkey, param, request);
        if (param.getRow1() != null) {
            int i = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", "O").eq("row1", param.getRow1()));
            int i2 = locMastService.selectCount(new EntityWrapper<LocMast>().eq("row1", param.getRow1()));
            // 在库率=(总数-空库位数)/总数
            BigDecimal quotient = BigDecimal.valueOf(i2 - i)
                    .divide(BigDecimal.valueOf(i2), 4, RoundingMode.HALF_UP);
            return R.ok().add(quotient);
        } else {
            int i = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", "O"));
            int i2 = locMastService.selectCount(new EntityWrapper<LocMast>());
            // 在库率=(总数-空库位数)/总数
            BigDecimal quotient = BigDecimal.valueOf(i2 - i)
                    .divide(BigDecimal.valueOf(i2), 4, RoundingMode.HALF_UP);
            return R.ok().add(quotient);
        }
    }


    @PostMapping(value = "/loc/info")
    @Synchronized
    public R list(@RequestHeader(required = false) String appkey, @RequestBody(required = false) LocMast param) {
        auth(appkey, param, request);
        LocMast locMast = locMastService.selectById(param.getLocNo());
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
        HashMap<String, Object> map = new HashMap<>();
        map.put("status", locMast.getLocSts());
        map.put("data", locDetls);
        return R.ok(map);
    }


    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);
@@ -215,43 +298,5 @@
        }
    }

//    public static void main(String[] args) {
//        // 1
//        System.out.println("======================================");
//        OpenOrderPakinParam param = new OpenOrderPakinParam();
//        param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
//        param.setOrderType("打包上线单");
//        param.setOrderTime(DateUtils.convert(new Date()));
//        List<DetlDto> orderDetails = new ArrayList<>();
//        param.setOrderDetails(orderDetails);
//        for (int i = 0; i < 3; i++) {
//            DetlDto detlDto = new DetlDto(locDto);
//            switch (i) {
//                case 0:
//                    detlDto.setMatnr("MDH020030530");
//                    detlDto.setBatch("500");
//                    detlDto.setAnfme(18.0);
//                    break;
//                case 1:
//                    detlDto.setMatnr("MDH020016416");
//                    detlDto.setBatch("500");
//                    detlDto.setAnfme(32.0);
//                    break;
//                case 2:
//                    detlDto.setMatnr("LSH90152025");
//                    detlDto.setAnfme(50.0);
//                    break;
//                default:
//                    break;
//            }
//            orderDetails.add(detlDto);
//        }
//        System.out.println(JSON.toJSONString(param));
//        // 2
//        System.out.println("======================================");
//        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
//        param1.setOrderNo("963001846497017856");
//        System.out.println(JSON.toJSONString(param1));
//    }

}