#

lsh

2024-12-25 0149b1e8a3eadee6050bfe46cf3705834a8abb8f

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

@@ -728,9 +728,10 @@
                throw new CoolException("规格："+matList.getMatnr()+"、参数：毛重 roughWeight");
            }else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：卷长度 rollExtent");
            }else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：接头数 joint");
            }
//            else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
//                throw new CoolException("规格："+matList.getMatnr()+"、参数：接头数 joint");
//            }

            if (matList.getPosition().equals("1")){//1、左  2、右
                if (!matnrOne.equals("")){
@@ -875,6 +876,17 @@
            throw new CoolException("参数：物料明细 matLists为空");
        }

        if (Cools.isEmpty(param.getBarcode())){
            throw new CoolException("参数：托盘码 barcode为空");
        }
        WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
        if (Cools.isEmpty(wrkMastMatrix)){
            throw new CoolException("参数：托盘码查询工作档失败："+param.getBarcode());
        }
        if (!wrkMastMatrix.getSheetNo().equals("1")){
            throw new CoolException("参数：此任务未上报禁止完成："+param.getBarcode());
        }

        ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
        ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
        //判断matLists参数
@@ -957,6 +969,9 @@
        if (Cools.isEmpty(wrkMastMatrix)){
            throw new CoolException("参数：托盘码查询工作档失败："+param.getBarcode());
        }
        if (!wrkMastMatrix.getSheetNo().equals("1")){
            throw new CoolException("参数：此任务未上报禁止完成："+param.getBarcode());
        }

        wrkMastMatrix.setSheetNo("2");
        if (!wrkMastService.updateById(wrkMastMatrix)){