兼容四期

zhangc

2025-02-18 985c427122c8aa1e421bdec8c13e8947117f967d

兼容四期

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

@@ -288,7 +288,7 @@
        List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
        String devNo = map.get("devNo").toString();
        String barcode = map.get("barcode").toString();
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts", 205L));
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("loc_no", devNo).eq("wrk_sts", 205L));
        if (agvWrkMast != null) {
            if (agvWrkMast.getIoType() == 101) {
                throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型为101.出库，无法执行拣料入库任务，请重新选择站点。");

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

@@ -401,9 +401,19 @@

        if (!Cools.isEmpty(locNo)) {
            listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
            if (listByLocNo != null) {
                for (AgvLocDetl agvLocDetl : listByLocNo) {
                    agvLocDetl.setCount(agvLocDetl.getAnfme());
                }
            }
        }
        if (!Cools.isEmpty(containerCode)) {
            listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
            if (listByContainerCode != null) {
                for (AgvLocDetl agvLocDetl : listByContainerCode) {
                    agvLocDetl.setCount(agvLocDetl.getAnfme());
                }
            }
        }

        Map<String, Object> result = new HashMap<String, Object>();
@@ -627,7 +637,7 @@
            if (Cools.isEmpty(locMastS)) {
                throw new CoolException("当前库位非在库状态！库位号=" + locNo);
            }
            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), Integer.parseInt(barcode.substring(0,2)), floor);
            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), Integer.parseInt(barcode.substring(0, 2)), floor);
            // 同步调拨单
            long flowId = snowflakeIdWorker.nextId();
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));

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

@@ -228,7 +228,8 @@
        excludeTrash(param);
        Object o = param.get("orderType");
        if (o != null) {
            wrapper.in("source", o);
            String[] split = o.toString().split(",");
            wrapper.in("source", split);
            param.remove("orderType");
        }
        convert(param, wrapper);
@@ -243,6 +244,7 @@
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }


    @RequestMapping(value = "/order/detls/pakin")
    @ManagerAuth
    public R orderDetlsIn(@RequestParam(defaultValue = "1") Integer curr,

 src/main/java/com/zy/asrs/entity/AgvLocDetl.java

@@ -189,6 +189,9 @@
    @TableField("process_sts")
    private Integer processSts;

    @TableField(exist = false)
    private Double count;


    public String getProcessSts$(){
        if (null == this.processSts){ return null; }

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

@@ -106,7 +106,8 @@
                wrapper.notLike("loc_no", "F1");
            }
        }
        wapperSetCondition(wrapper, "batch", batch);
        //一致有PE带批次字段导致，无法出库，就注释掉
        //wapperSetCondition(wrapper, "batch", batch);
        wapperSetCondition(wrapper, "three_code", csocode);
        //wapperSetCondition(wrapper, "dead_time", isoseq);