#

Administrator

18 小时以前 c8d0aaf6a77a28d8d934d6ccbcae3560296b3c09

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

@@ -1254,6 +1254,43 @@
                    if (zpalletCount2 > 0) {
                        throw new CoolException("包装组号已存在：" + obj.getPackageGroupNo());
                    }

                    // 卷号
                    HashMap<String, Object> yy = new HashMap<>();
                    // 箱号
                    HashMap<String, Object> zz = new HashMap<>();
                    List<GwmsGenerateInventoryDto.Rolls> rolls = obj.getRolls();
                    for(GwmsGenerateInventoryDto.Rolls roll :rolls) {
                        barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("model", roll.getRollNo()));
                        if (barcodeCount2 > 0) {
                            throw new CoolException("卷号已存在工作档（输送线）：" + roll.getRollNo());
                        }
                        zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("model", roll.getRollNo()));
                        if (zpalletCount2 > 0) {
                            throw new CoolException("卷号已存在库存：" + roll.getRollNo());
                        }

                        barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("unit", roll.getBoxNo()));
                        if (barcodeCount2 > 0) {
                            throw new CoolException("箱号已存在工作档（输送线）：" + roll.getBoxNo());
                        }
                        zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("unit", roll.getBoxNo()));
                        if (zpalletCount2 > 0) {
                            throw new CoolException("箱号已存在库存：" + roll.getBoxNo());
                        }

                        if (yy.get(roll.getRollNo()) != null) {
                            throw new CoolException("明细中存在2条相同的卷号：" + roll.getRollNo());
                        } else {
                            yy.put(roll.getRollNo(), roll.getRollNo());
                        }

                        if (zz.get(roll.getBoxNo()) != null) {
                            throw new CoolException("明细中存在2条相同的箱号：" + roll.getBoxNo());
                        } else {
                            zz.put(roll.getBoxNo(), roll.getBoxNo());
                        }
                    }
                    if (xx.get(obj.getPackageGroupNo()) != null) {
                        throw new CoolException("明细中存在2条相同的包装组号：" + obj.getPackageGroupNo());
                    } else {
@@ -1535,7 +1572,7 @@
        return "出库结果上报成功";
    }

    private void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
    public void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
        GwmsGenerateInventoryDto gwmsGenerateInventoryDto = new GwmsGenerateInventoryDto();
        gwmsGenerateInventoryDto.setWarehouseType(4);
        gwmsGenerateInventoryDto.setBarcode(wrkMast.getBarcode());
@@ -1562,8 +1599,8 @@
                matList.setStockType(wrkMast.getStaNo() == 2041 ? "返修出库" : "成品出库");
                matList.setBoxType(wrkDetl.getColor());
                matList.setRollType(wrkDetl.getManu());
                matList.setWideInWidth(wrkDetl.getSku());
                matList.setThickness(wrkDetl.getItemNum());
                matList.setWideInWidth(wrkDetl.getItemNum());
                matList.setThickness(wrkDetl.getSku());
                List<GwmsGenerateInventoryDto.Rolls> rollsList = new ArrayList<>();
                GwmsGenerateInventoryDto.Rolls roll = new GwmsGenerateInventoryDto.Rolls(wrkDetl.getModel(),
                        wrkDetl.getUnit(), wrkDetl.getMaktx(), wrkDetl.getLength(),
@@ -1673,7 +1710,7 @@
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(110); // 入出库状态： 110.空板出库
        wrkMast.setIoPri(10D);
        wrkMast.setIoPri(14D);
        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setCrnNo(locMast.getCrnNo());