新增PDA并板操作

lsh

2025-05-27 07dad0e9ef89346439cfcfb5978b0f1cb8f1b512

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

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
@@ -10,7 +9,6 @@
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;
@@ -22,8 +20,9 @@
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.Arrays;
import java.util.List;
import java.util.Map;

@@ -225,15 +224,20 @@
     * 返回库存利用率
     */
    @Synchronized
    @PostMapping("/stock/userd/v1")
    @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")));
        double div = NumberUtil.div(i1 - i, i, 2);
        return R.ok().add(div);
//        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);
    }