blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
luxiaotao1123
2020-08-28 5d2d9dbe286f6e079232e68d30bbd0530ccecaef 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java


@@ -4,6 +4,7 @@


import com.baomidou.mybatisplus.mapper.Wrapper;


import com.core.common.BaseRes;


import com.core.common.Cools;


import com.core.common.DateUtils;


import com.core.exception.CoolException;


import com.zy.asrs.entity.*;


import com.zy.asrs.entity.param.EmptyPlateOutParam;


@@ -21,6 +22,8 @@


import org.springframework.transaction.annotation.Transactional;




import java.util.*;


import java.util.concurrent.TimeUnit;


import java.util.stream.Collectors;




/**


 * Created by vincent on 2020/6/11


@@ -53,6 +56,8 @@


    private AdjDetlService adjDetlService;


    @Autowired


    private WrkMastLogService wrkMastLogService;


    @Autowired


    private WrkDetlLogService wrkDetlLogService;




    @Override


    @Transactional


@@ -62,11 +67,12 @@


            throw new CoolException(BaseRes.PARAM);


        }


        // 源站点状态检测


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo());


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);


        // 生成工作号


        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


        // 检索库位


        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo());


        List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());


        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos);


        // 生成工作档


        WrkMast wrkMast = new WrkMast();


        wrkMast.setWrkNo(workNo);


@@ -109,8 +115,8 @@


        }


        // 更新目标库位状态


        LocMast locMast = locMastService.selectById(dto.getLocNo());


        if (locMast.getLocType().equals("O")){


            locMast.setLocType("S"); // S.入库预约


        if (locMast.getLocSts().equals("O")){


            locMast.setLocSts("S"); // S.入库预约


            locMast.setModiUser(userId);


            locMast.setModiTime(new Date());


            if (!locMastService.updateById(locMast)){


@@ -227,8 +233,8 @@


            }


            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中


            locMast = locMastService.selectById(dto.getLocNo());


            if (locMast.getLocType().equals("F")) {


                locMast.setLocType(ioType==101?"R":"P");


            if (locMast.getLocSts().equals("F")) {


                locMast.setLocSts(ioType==101?"R":"P");


                locMast.setModiUser(userId);


                locMast.setModiTime(new Date());


                if (!locMastService.updateById(locMast)) {


@@ -244,23 +250,23 @@


    @Transactional


    public String emptyPlateIn(Integer devpNo, Long userId) {


        // 源站点状态检测


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo);


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);


        // 生成工作号


        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


        // 检索库位


        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo);


        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null);


        // 生成工作档


        WrkMast wrkMast = new WrkMast();


        wrkMast.setWrkNo(workNo);


        wrkMast.setIoTime(new Date());


        wrkMast.setWrkSts(1L); // 工作状态：生成入库ID


        wrkMast.setIoType(10); // 入出库状态：10.空板入库


        wrkMast.setIoPri(13D); // 优先级：10


        wrkMast.setIoPri(10D); // 优先级：10


        wrkMast.setCrnNo(dto.getCrnNo());


        wrkMast.setSourceStaNo(dto.getSourceStaNo());


        wrkMast.setStaNo(dto.getStaNo());


        wrkMast.setLocNo(dto.getLocNo());


        wrkMast.setFullPlt("N"); // 满板：Y


        wrkMast.setFullPlt("N"); // 满板


        wrkMast.setPicking("N"); // 拣料


        wrkMast.setExitMk("N"); // 退出


        wrkMast.setEmptyMk("Y"); // 空板


@@ -284,8 +290,8 @@


        }


        // 更新目标库位状态


        LocMast locMast = locMastService.selectById(dto.getLocNo());


        if (locMast.getLocType().equals("O")){


            locMast.setLocType("S"); // S.入库预约


        if (locMast.getLocSts().equals("O")){


            locMast.setLocSts("S"); // S.入库预约


            locMast.setModiUser(userId);


            locMast.setModiTime(new Date());


            if (!locMastService.updateById(locMast)){


@@ -346,8 +352,8 @@


                throw new CoolException("保存工作档失败");


            }


            // 更新库位状态 D.空板 -> R.出库预约


            if (locMast.getLocType().equals("D")){


                locMast.setLocType("R");


            if (locMast.getLocSts().equals("D")){


                locMast.setLocSts("R");


                locMast.setModiUser(userId);


                locMast.setModiTime(new Date());


                if (!locMastService.updateById(locMast)) {


@@ -411,7 +417,7 @@


        wrkMast.setFullPlt("N"); // 满板：Y


        wrkMast.setPicking("N"); // 拣料


        wrkMast.setExitMk("N"); // 退出


        wrkMast.setEmptyMk(sourceLoc.getLocType().equals("D")?"Y":"N"); // 空板


        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 空板


        wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码


        wrkMast.setLinkMis("N");


        wrkMast.setAppeUser(userId);


@@ -439,26 +445,26 @@


            }


        }


        // 修改源库位状态


        if (sourceLoc.getLocType().equals("D") || sourceLoc.getLocType().equals("F")) {


            sourceLoc.setLocType("R"); // R.出库预约


        if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {


            sourceLoc.setLocSts("R"); // R.出库预约


            sourceLoc.setModiUser(userId);


            sourceLoc.setModiTime(new Date());


            if (!locMastService.updateById(sourceLoc)){


                throw new CoolException("更新源库位状态失败");


            }


        } else {


            throw new CoolException("源库位出库失败，状态："+sourceLoc.getLocType$());


            throw new CoolException("源库位出库失败，状态："+sourceLoc.getLocSts$());


        }


        // 修改目标库位状态


        if (loc.getLocType().equals("O")) {


            loc.setLocType("S"); // S.入库预约


        if (loc.getLocSts().equals("O")) {


            loc.setLocSts("S"); // S.入库预约


            loc.setModiTime(new Date());


            loc.setModiUser(userId);


            if (!locMastService.updateById(loc)) {


                throw new CoolException("更新目标库位状态失败");


            }


        } else {


            throw new CoolException("移转失败，目标库位状态："+loc.getLocType$());


            throw new CoolException("移转失败，目标库位状态："+loc.getLocSts$());


        }


    }




@@ -479,7 +485,10 @@


        } else if (wrkMast.getWrkSts() > 10) {


            wrkMast.setWrkSts(14L);


        }


        wrkMast.setModiTime(new Date());


        Date now = new Date();


        wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));


        wrkMast.setCrnEndTime(now);


        wrkMast.setModiTime(now);


        wrkMast.setModiUser(userId);


        if (!wrkMastService.updateById(wrkMast)) {


            throw new CoolException("修改工作档失败");


@@ -555,6 +564,15 @@


                }


            }


        }


        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", param.getLocNo()));


        if (locDetls.isEmpty()) {


            locMast.setLocSts("D");


            locMast.setModiUser(userId);


            locMast.setModiTime(new Date());


            if (!locMastService.updateById(locMast)) {


                throw new CoolException("更新库位状态失败");


            }


        }


    }




    @Override


@@ -565,11 +583,11 @@


            throw new CoolException(workNo+"工作档不存在");


        }


        String locNo = ""; // 待修改目标库位


        String locType = ""; // 待修改目标库位状态


        String locSts = ""; // 待修改目标库位状态


        // 入库取消（修改目标库位）


        if (wrkMast.getWrkSts() < 4) {


            locNo = wrkMast.getLocNo();


            locType = "O";


            locSts = "O";


            /**


             * 库位转移


             * 取消后 源库位 ==>> F.在库


@@ -581,7 +599,7 @@


                if (Cools.isEmpty(locMast)) {


                    throw new CoolException("取消库位转移失败，源库位不存在:"+ wrkMast.getSourceLocNo());


                }


                locMast.setLocType("F");


                locMast.setLocSts("F");


                locMast.setModiTime(new Date());


                locMast.setModiUser(userId);


                locMastService.updateById(locMast);


@@ -591,19 +609,19 @@


            locNo = wrkMast.getSourceLocNo();


            // 出库 ===>> F.在库


            if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {


                locType = "F";


                locSts = "F";


            // 空板出库 ===>> D.空桶/空栈板


            } else if (wrkMast.getIoType() == 110) {


                locType = "D";


                locSts = "D";


            // 库位转移 ===>> D.空桶/空栈板


            } else if (wrkMast.getIoType() == 11) {


                locType = "F";


                locSts = "F";


                // 库位转移：目标库位


                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());


                if (Cools.isEmpty(locMast)) {


                    throw new CoolException("取消库位转移失败，目标库位不存在:"+ wrkMast.getSourceLocNo());


                }


                locMast.setLocType("O");


                locMast.setLocSts("O");


                locMast.setModiTime(new Date());


                locMast.setModiUser(userId);


                locMastService.updateById(locMast);


@@ -620,7 +638,7 @@


        if (Cools.isEmpty(locMast)) {


            throw new CoolException("取消工作档失败，库位不存在:"+ locNo);


        }


        locMast.setLocType(locType);


        locMast.setLocSts(locSts);


        locMast.setModiTime(new Date());


        locMast.setModiUser(userId);


        boolean locMastRes = locMastService.updateById(locMast);


@@ -645,9 +663,9 @@


            throw new CoolException("当前工作状态无法进行操作");


        }


        // 保存工作明细档历史档


//        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {


//            throw new CoolException("保存工作明细档历史档失败");


//        }


        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {


            throw new CoolException("保存工作明细档历史档失败");


        }


        // 保存工作主档历史档


        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {


            throw new CoolException("保存工作主档历史档失败");


@@ -677,7 +695,7 @@


        }


        // 修改库位状态 Q.拣料/盘点/并板再入库


        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());


        locMast.setLocType("Q");


        locMast.setLocSts("Q");


        locMast.setModiTime(new Date());


        locMast.setModiUser(userId);


        if (!locMastService.updateById(locMast)) {