mqtt

cl

4 天以前 83027cad5e5913f696343f18bc1d213de70f4ef9

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

@@ -378,7 +378,7 @@
            throw new CoolException("orderNo不能为空");
        }
        if (param.getExecute() == null) {
            throw new CoolException("reason不能为空");
            throw new CoolException("execute不能为空");
        }

        List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderId());
@@ -1258,7 +1258,12 @@

            if (param.getFull() == 1) {
                //满托盘
                mat = matService.selectByMatnr("emptyPallet");
                if(param.getBoxType1().equals("aws")){
                    mat = matService.selectByMatnr("amazon");
                }else {
                    mat = matService.selectByMatnr("cloudWarehouse");
                }

            } else if (param.getFull() == 0) {
                //空托盘
                mat = matService.selectByMatnr("emptyPallet");
@@ -1283,14 +1288,16 @@
        waitPakin.setManu(String.valueOf(param.getLocId()));//mes具体库位编号
        waitPakin.setThreeCode(param.getBizNo());
        waitPakin.setBeBatch(param.getPackage1());//是否散货，0 非散货；1 散货；为了管控出货速率，散货可以出慢点。
        // ERP 入口默认打 erp，MQTT 组托会在参数里显式传 aws。
        waitPakin.setBoxType1(Cools.isEmpty(param.getBoxType1()) ? "erp" : param.getBoxType1());
        if (!waitPakinService.insert(waitPakin)) {
            throw new CoolException("保存入库通知档失败");
        }
        return null;
        return R.ok().add(Cools.add("palletId", param.getPalletId()).add("orderId", param.getOrderId()));
    }

    @Override
    public R outOrder(OutTaskParam param) {
    public R outOrder(OutTaskParam param,int count) {
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
        if (locMast == null) {
            return R.error("没有找到托盘码=" + param.getPalletId() + "对应的库位");
@@ -1346,6 +1353,7 @@
            wrkDetl.setAppeUser(9995L);
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(9995L);
            wrkDetl.setSupp(param.getSeq()+"/"+count);

            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
@@ -1364,7 +1372,8 @@
            log.error(locMast.getLocNo() + "库位不是在库状态");
            throw new CoolException(locMast.getLocNo() + "库位不是在库状态");
        }
        return R.ok();
        return R.ok().add(Cools.add("wrkNo", workNo).add("orderId", param.getOrderId()));
    }
}