字段添加完成，测试完成

wang..123

2022-02-15 7182f72ba4781c620eebdf501ca46b3f69f5585d

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

@@ -12,16 +12,19 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.OutLocDto;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.ints.entity.WaitMatchk;
import com.zy.ints.service.IoCompleteService;
import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +37,7 @@
/**
 * Created by vincent on 2020/6/11
 */
@Slf4j
@Service
public class WorkServiceImpl implements WorkService {
    static int i =1;
@@ -71,6 +75,8 @@
    private WaitMatchkLogService waitMatchkLogService;
    @Autowired
    private IoCompleteService ioCompleteService;
    @Autowired
    private SlaveProperties slaveProperties;

    @Override
    @Transactional
@@ -119,7 +125,7 @@
        // 生成工作档明细
        List<MatCodeCountDto> matDtos = new ArrayList<>();
        param.getList().forEach(elem -> {
            matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount()));
            matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getSupplier(), elem.getCount(),elem.getMemo(),elem.getSource(),elem.getVendor()));
        });
        wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);
        // 更新源站点信息
@@ -217,13 +223,29 @@
            }
            int workNo = commonService.getWorkNo(rok);

            boolean reduce = false;
            if(locMast.getCrnNo().equals(1) && dto.getLocNo().substring(0,2).equals("01")) {//1号货架才判断
                // 当深库位出库时，查找对应的浅库位是否也有出库任务,如果有，就增加其优先级
                if (Utils.isDeepLoc(slaveProperties, dto.getLocNo())) {
                    String shallowLoc = Utils.getShallowLoc(slaveProperties, dto.getLocNo());
                    if (locNos.contains(shallowLoc)) {
                        reduce = true;
                    }
                }

                // 深库位移库
                if (!reduce) {
                    moveLocForDeepLoc(locMast.getCrnNo(), dto.getLocNo());
                }
            }

            // 生成工作档
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);
            wrkMast.setIoTime(new Date());
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(ioType); // 入出库状态
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setIoPri(reduce?13D:15D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
@@ -254,6 +276,7 @@
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(new Date());
                wrkDetl.setModiUser(userId);
                wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
@@ -385,10 +408,27 @@
        for (String locNo : param.getLocNos()) {
            // 获取工作号
            int workNo = commonService.getWorkNo(1);

            // 获取库位
            LocMast locMast = locMastService.selectById(locNo);
            if (Cools.isEmpty(locMast)) {
                throw new CoolException(locNo+"库位不存在");
            }

            boolean reduce = false;
            if(locMast.getCrnNo().equals(1) && locNo.substring(0,2).equals("01")) {//1号货架才判断
                // 当深库位出库时，查找对应的浅库位是否也有出库任务,如果有，就增加其优先级
                if (Utils.isDeepLoc(slaveProperties, locNo)) {
                    String shallowLoc = Utils.getShallowLoc(slaveProperties, locNo);
                    if (param.getLocNos().contains(shallowLoc)) {
                        reduce = true;
                    }
                }

                // 深库位移库
                if (!reduce) {
                    moveLocForDeepLoc(locMast.getCrnNo(), locNo);
                }
            }

            // 获取源站
@@ -407,7 +447,7 @@
            wrkMast.setIoTime(new Date());
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
            wrkMast.setIoPri(10D);
            wrkMast.setIoPri(reduce?13D:15D);
            wrkMast.setSourceStaNo(sourceStaNo); // 源站
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());
@@ -465,6 +505,7 @@

    @Override
    @Transactional
    //移库
    public void locMove(String sourceLocNo, String locNo, Long userId) {
        LocMast sourceLoc = locMastService.selectById(sourceLocNo);
        if (Cools.isEmpty(sourceLoc)){
@@ -479,6 +520,18 @@
        }
        // 获取工作号
        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);

        if(loc.getCrnNo().equals(1) && sourceLocNo.substring(0,2).equals("01")) {//1号货架才判断
            // 当深库位出库时，查找对应的浅库位是否也有出库任务,如果有，就增加其优先级
            if (Utils.isDeepLoc(slaveProperties, sourceLocNo)) {
                String shallowLoc = Utils.getShallowLoc(slaveProperties, sourceLocNo);
                LocMast locShallow = locMastService.selectById(shallowLoc);
                if(!Cools.isEmpty(locShallow) && (locShallow.getLocSts().equals("F") || locShallow.getLocSts().equals("D"))){
                    moveLocForDeepLoc(loc.getCrnNo(), sourceLocNo);
                }
            }
        }

        // 保存工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
@@ -599,6 +652,7 @@
            LocDetl sqlParam = new LocDetl();
            sqlParam.setLocNo(locMast.getLocNo());
            sqlParam.setMatNo(adjust.getMatNo());
            sqlParam.setSupplier(adjust.getSupplier());
            LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
            // 保存新库存明细
            if (Cools.isEmpty(one)) {
@@ -610,6 +664,15 @@
                locDetl.setLocNo(locMast.getLocNo());
                locDetl.setQty(adjust.getCount()); // 数量
                VersionUtils.setLocDetl(locDetl, matCode); // 版本控制

                if (Cools.isEmpty(adjust.getSupplier())){
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
                    locDetl.setSupplier(sdf.format(new Date()));
                }else {
                    locDetl.setSupplier(adjust.getSupplier());
                }


                locDetl.setModiUser(userId); // 操作人员信息
                locDetl.setModiTime(new Date());
                locDetl.setAppeUser(userId);
@@ -637,11 +700,13 @@
                    } else {
                        LocDetl sqlParam1 = new LocDetl();
                        sqlParam1.setQty(adjust.getCount());
                        sqlParam1.setSupplier(adjust.getSupplier());
                        sqlParam1.setModiTime(new Date());
                        sqlParam1.setModiUser(userId);
                        if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
                                .eq("loc_no", locMast.getLocNo())
                                .eq("mat_no", adjust.getMatNo()))) {
                                .eq("mat_no", adjust.getMatNo())
                                .eq("supplier",adjust.getSupplier()))) {
                            throw new CoolException("修改库存明细失败");
                        }
                    }
@@ -812,4 +877,111 @@
        }
    }

    /**
     * 因双深库位阻塞，对浅库位进行移转
     */
    public void moveLocForDeepLoc(Integer crnNo, String locNo){
        // 双深库位且浅库位有货，则需先对浅库位进行库位移转
        if (Utils.isDeepLoc(slaveProperties, locNo)) {
            String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
            LocMast shallowLoc = locMastService.selectById(shallowLocNo);
            // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用 直接搬！
            if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
                WrkMast waitWrkMast = wrkMastService.selectByLocNo(shallowLocNo);
                if (null == waitWrkMast) {
                    log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
                    throw new CoolException(shallowLocNo + "库位异常，未检索到相应工作档！");
                } else {
                    waitWrkMast.setIoPri(15D);
                    waitWrkMast.setModiTime(new Date());
                    if (!wrkMastService.updateById(waitWrkMast)) {
                        log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                        throw new CoolException("调整工作档优先级失败！工作号=" + waitWrkMast.getWrkNo());
                    }
                }
            } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                // 生成工作档、改变浅库位的源库/目标库 库位状态、下发堆垛机命令（立马执行)
                List<Integer> rows = locMastService.queryDistinctRow(crnNo);
                LocMast loc = null;
                for (Integer row : rows) {
                    if (Utils.isDeepLoc(slaveProperties, row)) {
                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());
                        if (null != loc) { break; }
                    }
                }
                if (null == loc) {
                    for (Integer row : rows) {
                        if (Utils.isShallowLoc(slaveProperties, row)) {
                            loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());
                            if (null != loc) { break; }
                        }
                    }
                }
                if (null == loc) {
                    throw new CoolException("双深库位 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());
                }

                // 获取工作号
                int workNo = commonService.getWorkNo(0);
                // 保存工作档
                WrkMast wrkMast = new WrkMast();
                wrkMast.setWrkNo(workNo);
                wrkMast.setIoTime(new Date());
                wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
                wrkMast.setIoType(11); // 入出库状态： 11.库格移载
                wrkMast.setIoPri(13D);
                wrkMast.setCrnNo(crnNo);
                wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 源库位
                wrkMast.setLocNo(loc.getLocNo()); // 目标库位
                wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 满板
                wrkMast.setPicking("N"); // 拣料
                wrkMast.setExitMk("N"); // 退出
                wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D")?"Y":"N"); // 空板
                wrkMast.setBarcode(shallowLoc.getBarcode()); // 托盘码
                wrkMast.setLinkMis("N");
                wrkMast.setAppeTime(new Date());
                wrkMast.setModiTime(new Date());
                if (!wrkMastService.insert(wrkMast)) {
                    throw new CoolException("保存工作档失败");
                }
                // 工作档明细保存
                if (shallowLoc.getLocSts().equals("F")) {
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
                    for (LocDetl locDetl : locDetls) {
                        WrkDetl wrkDetl = new WrkDetl();
                        wrkDetl.setWrkNo(workNo);
                        wrkDetl.setIoTime(new Date());
                        wrkDetl.setQty(locDetl.getQty());
                        VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
                        wrkDetl.setAppeTime(new Date());
                        wrkDetl.setModiTime(new Date());
                        if (!wrkDetlService.insert(wrkDetl)) {
                            throw new CoolException("保存工作档明细失败");
                        }
                    }
                }
                // 修改源库位状态
                if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {
                    shallowLoc.setLocSts("R"); // R.出库预约
                    shallowLoc.setModiTime(new Date());
                    if (!locMastService.updateById(shallowLoc)){
                        throw new CoolException("更新源库位状态失败");
                    }
                } else {
                    throw new CoolException("源库位出库失败");
                }
                // 修改目标库位状态
                if (loc.getLocSts().equals("O")) {
                    loc.setLocSts("S"); // S.入库预约
                    loc.setModiTime(new Date());
                    if (!locMastService.updateById(loc)) {
                        throw new CoolException("更新目标库位状态失败");
                    }
                } else {
                    throw new CoolException("移转失败");
                }
            }
        }
    }

}