led总数显示

pang.jiabao

2024-06-25 e8727dc1615ab749a6bfbe54633f5f0fc28f370b

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

@@ -247,6 +247,7 @@
            wrkMast.setIoType(ioType); // 入出库状态
            wrkMast.setIoPri(reduce?13D:15D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setBarcode(locMast.getBarcode());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
@@ -280,7 +281,8 @@
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(new Date());
                wrkDetl.setModiUser(userId);
                wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
//                wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
                wrkDetl.setMemo(String.valueOf(detlDto.getLocDetl().getQty())); // 总数量，led显示用
                wrkDetl.setQtyBox(matCode.getStr6()!=null ? matCode.getStr6() : 0);
                wrkDetl.setWeight(matCode.getWeight()!=null ? matCode.getWeight() : 0);
                wrkDetl.setAllWeight(matCode.getWeight()!=null ? qty*matCode.getWeight()+30 : 0);
@@ -422,6 +424,15 @@
        for (String locNo : param.getLocNos()) {
            // 获取工作号
            int workNo = commonService.getWorkNo(1);

            //2022-06-16 ADD, 出库库位如果是深库位1号货架，且对应浅库位也为D时，先出浅库位
            if(Utils.isDeepLoc(slaveProperties, locNo)){
                String shallow = Utils.getShallowLoc(slaveProperties,locNo);
                LocMast shallowLoc = locMastService.selectById(shallow);
                if(!Cools.isEmpty(shallowLoc) && shallowLoc.getLocSts().equals("D")){
                    locNo = shallowLoc.getLocNo();
                }
            }

            // 获取库位
            LocMast locMast = locMastService.selectById(locNo);
@@ -806,7 +817,11 @@
                locSts = "D";
            // 库位转移 ===>> D.空桶/空栈板
            } else if (wrkMast.getIoType() == 11) {
                locSts = "F";
                if(wrkMast.getEmptyMk().equals("Y")){
                    locSts = "D";
                }else {
                    locSts = "F";
                }
                // 库位转移：目标库位
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                if (Cools.isEmpty(locMast)) {
@@ -836,7 +851,7 @@

        if (wrkMast.getIoType() != 10 && wrkMast.getIoType() != 110) {
            // 保存工作明细档历史档
            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
            if (!wrkMast.getEmptyMk().equals("Y") && !wrkDetlLogService.save(wrkMast.getWrkNo())) {
                throw new CoolException("保存工作明细历史档失败, workNo = " + wrkMast.getWrkNo());
            }
            // 删除工作档明细
@@ -879,10 +894,33 @@
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException("保存工作主档历史档失败");
        }
        // 拣、盘、并 作业站转换
        int stnNo = 0;
        if (wrkMast.getIoType() == 103) { // 拣料出库
            if(wrkMast.getCrnNo() == 1) {
                stnNo = 104;
            }else if(wrkMast.getCrnNo() == 2) {
                stnNo =204;
            }else if(wrkMast.getCrnNo() == 3) {
                stnNo = 304;
            }
        } else if(wrkMast.getIoType() == 107){ //盘点出库
            if(wrkMast.getCrnNo() == 1) {
                stnNo = 101;
            }else if(wrkMast.getCrnNo() == 2) {
                stnNo =201;
            }else if(wrkMast.getCrnNo() == 3) {
                stnNo = 301;
            }
        }
        if (stnNo == 0) {
            log.error("{}号任务数据异常！", wrkMast.getWrkNo());
            throw new CoolException("再入库站点有误");
        }
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", wrkMast.getIoType() - 50)
                .eq("stn_no", wrkMast.getStaNo()) // 作业站点 = 拣料出库的目标站
                .eq("stn_no", stnNo) // 作业站点 = 拣料出库的目标站
                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)) {