#

zjj

2024-10-20 d1b031c864041c0c75e433bcd839aa9493f506bb

#

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

@@ -61,6 +61,28 @@
    @Autowired
    private CommonService commonService;

    @RequestMapping("/select/workDetl/barcode")
    @ManagerAuth
    public R selectWorkDetlBarcode(@RequestBody Map<String,Object> map) {
        String barcode = map.get("barcode").toString();
        if (Cools.isEmpty(barcode)) {
            return R.error("条码为空");
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        if (Cools.isEmpty(wrkMast)) {
            return R.error("未找到任务");
        }
        if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 103) {
            return R.error("任务状态有误");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        if (Cools.isEmpty(wrkDetls)) {
            return R.error("工作明细有误");
        }
        return R.ok(wrkDetls);

    }

    @RequestMapping("/leftovers/out")
    @ManagerAuth
    public R leftoversOut(@RequestBody Map<String,Object> map) {

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

@@ -37,6 +37,7 @@
    @RequestMapping(value = "/staDesc/init/auth")
    @ManagerAuth(memo = "初始化站点路径")
    public R init(StaDescInitParam param) {
        SqlSession sqlSession = null;
        try{
            if (param.getTypeDesc()==1){
                staDescService.delete(new EntityWrapper<>());
@@ -44,7 +45,7 @@
            String[] startStaList = param.getStartStaList().split(";");
            String[] endStaList = param.getEndStaList().split(";");
            List<StaDesc> staDescList = new ArrayList<>();
            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
            sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
            StaDescMapper sqlSessionMapper = sqlSession.getMapper(StaDescMapper.class);
            for (String startSta : startStaList){
                for (String endSta : endStaList){
@@ -66,22 +67,19 @@
                        staDesc.setModiTime(new Date());
                        staDesc.setAppeUser(getUserId());
                        staDesc.setAppeTime(new Date());
//                        staDescList.add(staDesc);
                        sqlSessionMapper.insert(staDesc);

//                        staDescList.add(staDesc);
                    }
                }
            }
            try{
                sqlSession.commit();
                sqlSession.close();
            }catch (Exception e){
                log.error("初始化站点路径异常===>sql异常：{}",e.getMessage());
            }
            sqlSession.flushStatements();
            sqlSession.clearCache();

//            staDescService.insertBatch(staDescList);
        }catch (Exception e){
            log.error("初始化站点路径异常：{}",e.getMessage());
            return R.error("初始化站点路径异常："+e.getMessage());
            return R.error(e.getMessage());
        }finally {
            sqlSession.close();
        }

        return R.ok("ok1").add("ok2");

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

@@ -568,38 +568,44 @@
    @Override
//    @Transactional
    public void leftoversOut(Map<String, Object> map,Long userId) {

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", map.get("barcode")).eq("io_type", 103));
        String barcode = map.get("barcode").toString();
        String barcode2 = map.get("barcode2").toString();
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode).eq("io_type", 103));
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException("未查询到拣料任务");
        }
        Date now = new Date();
        int workNo = commonService.getWorkNo(1);
        WrkMast wrkMast1 = new WrkMast();
        wrkMast1.sync(wrkMast);
        wrkMast1.setWrkNo(workNo);
        wrkMast1.setWrkSts(2L);
        wrkMast1.setIoType(200);
        wrkMast1.setSourceStaNo(wrkMast.getStaNo() == 113 ? 111 : 117);
        wrkMast1.setStaNo(map.get("floor").hashCode() == 2 ? 204:304);
        wrkMast1.setIoTime(now);
        wrkMast1.setIoPri(13D); // 优先级：13
        wrkMast1.setCrnNo(wrkMast.getCrnNo());
        wrkMast1.setSourceLocNo(wrkMast.getLocNo()); // 源库位
        wrkMast1.setFullPlt("Y"); // 满板：Y
        wrkMast1.setPicking("N"); // 拣料
        wrkMast1.setExitMk("N"); // 退出
        wrkMast1.setEmptyMk("N"); // 空板
        wrkMast1.setLinkMis("N");
        wrkMast1.setAppeUser(userId); // 操作人员数据
        wrkMast1.setAppeTime(now);
        wrkMast1.setModiUser(userId);
        wrkMast1.setModiTime(now);
        wrkMast1.setBarcode(wrkMast.getBarcode());
        if (!wrkMastService.insert(wrkMast1)) {
            throw new CoolException("保存工作档失败");
        WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode2).eq("io_type", 200));
        if (Cools.isEmpty(wrkMast2)) {
            Date now = new Date();

            WrkMast wrkMast1 = new WrkMast();
            wrkMast1.sync(wrkMast);
            wrkMast1.setWrkNo(workNo);
            wrkMast1.setWrkSts(2L);
            wrkMast1.setIoType(200);
            wrkMast1.setSourceStaNo(wrkMast.getStaNo() == 113 ? 111 : 117);
            wrkMast1.setStaNo(wrkMast.getStaNo() == 113 ? 204 : 304);
            wrkMast1.setIoTime(now);
            wrkMast1.setIoPri(13D); // 优先级：13
            wrkMast1.setCrnNo(wrkMast.getCrnNo());
            wrkMast1.setSourceLocNo(wrkMast.getLocNo()); // 源库位
            wrkMast1.setFullPlt("Y"); // 满板：Y
            wrkMast1.setPicking("N"); // 拣料
            wrkMast1.setExitMk("N"); // 退出
            wrkMast1.setEmptyMk("N"); // 空板
            wrkMast1.setLinkMis("N");
            wrkMast1.setAppeUser(userId); // 操作人员数据
            wrkMast1.setAppeTime(now);
            wrkMast1.setModiUser(userId);
            wrkMast1.setModiTime(now);
            wrkMast1.setBarcode(barcode2);
            if (!wrkMastService.insert(wrkMast1)) {
                throw new CoolException("保存工作档失败");
            }
        }


        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", map.get("barcode")));
        if (Cools.isEmpty(wrkDetls)) {
            throw new CoolException("未查询到拣料任务明细");