no message

skyouc

3 天以前 f3e116dd3bbdd132cd5cb49c99cbf9ba59f112d8

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

@@ -17,6 +17,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.constant.HIKApiConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -25,6 +26,7 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -86,6 +88,9 @@
    private ManLocDetlService manLocDetlService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;

    @Autowired
    private SlaveProperties slaveProperties;

    @Autowired
    private AdjDetlService adjDetlService;
@@ -1316,6 +1321,7 @@
            throw new CoolException("数据错误：单据不存在！！");
        }
        List<OrderDetlPakin> detlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
                .eq(!Cools.isEmpty(params.getThreeCode()), "three_code", params.getThreeCode())
                .eq(!Cools.isEmpty(params.getMatnr()), "matnr", params.getMatnr())
                .eq("order_id", orderPakin.getId()));
        if (Objects.isNull(detlPakins) || detlPakins.isEmpty()) {
@@ -1768,7 +1774,7 @@
            throw new CoolException("站点不能为空!!");
        }
        if (Objects.isNull(param.getLocType1())) {
            param.setLocType1((short)1);
            param.setLocType1((short) 1);
        }


@@ -1783,7 +1789,7 @@

        List<WaitPakin> waitPakins = waitPakinService
                .selectList(new EntityWrapper<WaitPakin>()
                        .eq("io_status" , "N")
                        .eq("io_status", "N")
                        .eq("zpallet", param.getBarcode()));
        if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
            throw new CoolException("数据错误,组拖档已不存在!!");
@@ -2003,7 +2009,7 @@
            wrkMast.setIoType(1); // 入出库状态：1.入库
            wrkMast.setCrnNo(dto.getCrnNo());
            wrkMast.setSourceStaNo(dto.getSourceStaNo() + "");
            wrkMast.setStaNo(dto.getStaNo() + "");
            wrkMast.setStaNo(!Objects.isNull(dto.getStaNo()) ? dto.getStaNo() + "" : null);
            wrkMast.setLocNo(dto.getLocNo());
            wrkMast.setIoPri(13D); // 优先级
            wrkMast.setBarcode(pakin.getZpallet()); // 托盘码
@@ -2580,6 +2586,7 @@

    /**
     * 移库任务申请
     *
     * @param combParam
     * @param userId
     * @return
@@ -2642,6 +2649,97 @@
    }

    /**
     * 6.15WCS申请在库库位更换库位
     * @param combParam
     * @param l
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R changeLoc(CompleteParam combParam, long l) {
        if (Objects.isNull(combParam)) {
            return R.error("参数不能为空！");
        }
        if (Objects.isNull(combParam.getLocNo())) {
            return R.error("库位号不能为空!!");
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", combParam.getLocNo()));
        if (Objects.isNull(locMast)) {
            return R.error("库位信息不存在或库位状态非 F.在库 状态");
        }

        List<Integer> doubleLocs = slaveProperties.getDoubleLocs();
        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                .in("row1", doubleLocs)
                .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type));
        Map<String, Object> result = new HashMap<>();
        LocMast selected = new LocMast();
        for (LocMast loc : locMasts) {
            LocMast temLoc = locMastService.selectById(loc.getLocNo());
            if (Objects.isNull(temLoc)) {
                throw new CoolException("数据错误， 原库位信息不存在！！");
            }
            String shallowLoc = Utils.getShallowLoc(slaveProperties, temLoc.getLocNo());

            LocMast locMast1 = locMastService.selectById(shallowLoc);
            if (Objects.isNull(locMast1)) {
                throw new CoolException("数据错误， 新库位信息不存在！！");
            }
            if (!locMast1.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
                continue;
            }
            selected = loc;

            break;
        }

        WrkMast moveTask = generateMoveTask(selected, locMast);
        result.put("locNo", selected.getLocNo());
        result.put("taskNo", moveTask.getWrkNo());

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

    }

    /**
     * 生成移库任务
     *
     * @param result
     * @param sourceLoc
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public WrkMast generateMoveTask(LocMast result, LocMast sourceLoc) {
        WrkMast wrkMast = new WrkMast();
        int workNo = commonService.getWorkNo(0);

        wrkMast.setWrkNo(workNo);
        wrkMast.setLocNo(result.getLocNo());
        wrkMast.setSourceLocNo(sourceLoc.getLocNo());
        wrkMast.setWrkSts(11L);
        wrkMast.setIoType(11);
        wrkMast.setCrnNo(sourceLoc.getCrnNo());
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
        wrkMast.setIoPri(13D);
        wrkMast.setWrkDate(new Date());

        if (!wrkMastService.insert(wrkMast)) {
            throw new CoolException("任务保存失败！！");
        }

        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLoc.getLocNo()));
        locDetls.forEach(detl -> {
            detl.setLocNo(result.getLocNo());
            if (!locDetlService.updateById(detl)) {
                throw new CoolException("明细更新失败！！");
            }
        });

        return wrkMast;
    }

    /**
     * 按优先级查找可用库位
     * 顺序：入库缓存区 -> SO区 -> EO区
     */