Merge branch 'htasrs0' of https://gitee.com/luxiaotao1123/zy-asrs into htasrs0

luxiaotao1123

2021-06-12 2f9fd9af98fb985428de5f766811c4aeb1989069

Merge branch 'htasrs0' of https://gitee.com/luxiaotao1123/zy-asrs into htasrs0

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

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

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
@@ -18,9 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.*;

/**
 * Created by vincent on 2021/3/19
@@ -192,5 +191,103 @@
        return R.ok().add(result);
    }

    @PostMapping("/available/take/site")
    @Transactional
    public R availableTakeSite(){
        List<Map<String, Object>> result = new ArrayList<>();
        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        for (Integer siteId : outSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（全板出库口）");
            result.add(map);
        }
        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
        for (Integer siteId : pickOutSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（拣料出库口）");
            result.add(map);
        }
        return R.ok().add(result);
    }

    @PostMapping("/get/asrsLocDetl")
    @Transactional
    public R queryLocDetl(String matnr) {
        List<LocDetl> locDetls = locDetlService.getAsrsLocDetl(matnr);
        return R.ok().add(locDetls);
    }

    @PostMapping("/stockOut/locMode")
    @Transactional
    public R stockOutLocMode(@RequestBody List<OpenApiStockOutParam> params){
        List<PakoutVo> result = new ArrayList<>();
        if (!Cools.isEmpty(params)) {
            for (OpenApiStockOutParam param : params) {
                // 推荐货位补仓工作档防重
                if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("packed", param.getAllotNo()).le("wrk_sts", 14)) > 0) {
                    throw new CoolException("当前补仓任务正在执行，请耐心等待");
                }
                Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
                if (!Cools.isEmpty(param.getAllotNo()) && sumAnfme < param.getAnfme()) {
                    throw new CoolException("立库库存不足，缺货数量：" + (param.getAnfme() - sumAnfme));
                }
                double lack = 0.0D;
                if (sumAnfme < param.getAnfme()) {
                    lack = param.getAnfme() - sumAnfme;
                    PakoutVo pakoutVo = new PakoutVo();
                    pakoutVo.setLocNo("缺货");
                    pakoutVo.setAnfme(lack);
                    pakoutVo.setMatnr(param.getMatnr());
//                    pakoutVo.setZpallet("param.getZpallet()");
                    result.add(pakoutVo);

//                    throw new CoolException(param.getMatnr() + "物料数量不足，缺货数量：" + (param.getAnfme() - sumAnfme));
                }

                // 根据立库库位码去获取立库信息
                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", param.getLocNo()));
                if (locDetls.size() == 0) {
                    throw new CoolException("未查询到库位信息！");
                }
                double issued = Optional.of(param.getAnfme()-lack).orElse(0.0D) ;
                for (LocDetl locDetl : locDetls) {
                    // 生成出库工作档

                    Integer locNoNum = locDetlService.countLocNoNum(locDetl.getLocNo());
                    // 全板
                    if (locNoNum == 1) {
                        BasDevp staNo = basDevpService.checkSiteStatus(103);
                        List<LocDetlDto> detlDtos = new ArrayList<>();
                        LocDetlDto dto = new LocDetlDto();
                        dto.setLocDetl(locDetl);
                        dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
                        detlDtos.add(dto);
                        workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), null);
                    } else { // 拣料
                        BasDevp staNo = basDevpService.checkSiteStatus(107);
                        List<LocDetlDto> detlDtos = new ArrayList<>();
                        LocDetlDto dto = new LocDetlDto();
                        dto.setLocDetl(locDetl);
                        dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
                        detlDtos.add(dto);
                        workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), null);
                    }
                    PakoutVo pakoutVo = new PakoutVo();
                    pakoutVo.setLocNo(locDetl.getLocNo());
                    pakoutVo.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
                    pakoutVo.setMatnr(locDetl.getMatnr());
                    pakoutVo.setZpallet(locDetl.getZpallet());
                    result.add(pakoutVo);

                    // 剩余待出数量递减
                    issued = issued - locDetl.getAnfme();
                }

            }
        }

        return R.ok().add(result);
    }
}

 src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java

@@ -8,6 +8,8 @@
@Data
public class OpenApiStockOutParam {

    private String locNo;

    private String matnr;

    private Double anfme;

 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java

@@ -39,4 +39,7 @@

    List<LocDetl> selectPakoutByRule(String matnr);

    List<LocDetl> getAsrsLocDetl(String matnr);

    Integer countLocNoNum(String locNo);
}

 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -30,4 +30,7 @@

    List<LocDetl> selectPakoutByRule(String matnr);

    List<LocDetl> getAsrsLocDetl(String matnr);

    Integer countLocNoNum(String locNo);
}

 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java

@@ -58,4 +58,13 @@
        return this.baseMapper.selectPakoutByRule(matnr);
    }

    @Override
    public List<LocDetl> getAsrsLocDetl(String matnr) {
        return this.baseMapper.getAsrsLocDetl(matnr);
    }

    @Override
    public Integer countLocNoNum(String locNo) {
        return this.baseMapper.countLocNoNum(locNo);
    }
}

 src/main/resources/mapper/LocDetlMapper.xml

@@ -126,4 +126,11 @@
        desc
    </select>

    <select id="getAsrsLocDetl" resultMap="BaseResultMap">
        select a.* from asr_loc_detl a left join asr_loc_mast b on a.loc_no = b.loc_no where a.matnr = #{matnr} and b.loc_sts = 'F'
    </select>

    <select id="countLocNoNum" resultType="integer">
        select count(*) from asr_loc_detl where loc_no = #{loc_no}
    </select>
</mapper>