#

Administrator

昨天 19a46dfb30832d312d39864873c333729dacfc7c

#

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

@@ -1145,12 +1145,12 @@
    public R kthl(KthlParam param) {

        // 获取模式为电脑模式，无任务的堆垛机列表:防止分配到堆垛机不可用
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3)
                .eq("wrk_no",0).eq("in_enable","Y").eq("out_enable","Y"));
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3)
                .eq("wrk_no", 0).eq("in_enable", "Y").eq("out_enable", "Y"));
        if (basCrnps.isEmpty()) {
            // 都有任务则获取电脑模式的堆垛机列表
            basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3).eq("in_enable","Y")
                    .eq("out_enable","Y"));
            basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("in_enable", "Y")
                    .eq("out_enable", "Y"));
        }
        WrkMast exist = wrkMastService.selectOne(
                new EntityWrapper<WrkMast>()
@@ -1194,7 +1194,7 @@
            throw new CoolException("保存工作档失败");
        }
        // 返回GWCS目标信息
        pushStaNoToGwcs(param.getPalletizingNo(),wrkMast.getSourceStaNo(),workNo,param.getBarcode(),"二楼空托回流推送gwcs");
        pushStaNoToGwcs(param.getPalletizingNo(), wrkMast.getSourceStaNo(), workNo, param.getBarcode(), "二楼空托回流推送gwcs");

        return R.ok("空托回流请求成功");
    }
@@ -1241,6 +1241,17 @@
            int barcodeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
            if (barcodeCount > 0) {
                throw new CoolException("工作档已存在该托盘码：" + param.getBarcode());
            }
            if (!Cools.isEmpty(param.getMatList())) {
                HashMap<String, Object> xx = new HashMap<>();
                List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
                for (GwmsGenerateInventoryDto.MatList obj : matList) {
                    if (xx.get(obj.getPackageGroupNo()) != null) {
                        throw new CoolException("明细中存在2条相同的包装组号：" + obj.getPackageGroupNo());
                    } else {
                        xx.put(obj.getPackageGroupNo(), obj);
                    }
                }
            }
        }
        LocTypeDto locTypeDto = new LocTypeDto();
@@ -1364,7 +1375,7 @@
        if (wrkMast == null) {
            throw new CoolException("不存在该工作号：" + param.getWorkNo());
        }
        if (wrkMast.getWrkSts() == 3||wrkMast.getWrkSts() == 4) {
        if (wrkMast.getWrkSts() == 3 || wrkMast.getWrkSts() == 4) {
            throw new CoolException("工作档状态不对：" + param.getWorkNo());
        }
        wrkMast.setWrkSts(2L);