#

yxFwq

5 天以前 d60e84cbedb554555578f071de95c4a8049183db

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

@@ -1138,7 +1138,16 @@
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点料箱码异常状态；料箱码==》为空"+basDevp.getBarcode());
        }
        if (!basDevp.getInEnable().equals("Y")){
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点，请等待翻转完成；料箱码==》"+basDevp.getBarcode());
            try{
                Thread.sleep(500);
            } catch (Exception e){

            }
            BasDevp basDevp1111 = basDevpService.selectById(param.getStaNo());
            if (!basDevp1111.getInEnable().equals("Y")){
                throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点，请等待翻转完成；料箱码==》"+basDevp.getBarcode());
            }

        }
        if (!CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点料箱码异常状态；料箱码："+basDevp.getBarcode());
@@ -1236,7 +1245,10 @@
        }

        ArrayList<LocDetl> locDetlArrayList = new ArrayList<>();
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight());
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
                .eq("matnr", param.getMatnr())
                .eq("weight", param.getWeight())
                .orderBy("batch", true);
        if (param.getDevNo() == 536) {
            wrapper.eq("model", param.getModel())
                    .eq("specs", param.getOrderNo());
@@ -1263,6 +1275,7 @@
                    .lt("weight", param.getWeight() + mat.getUnits())
                    .and()
                    .gt("weight", param.getWeight())
                    .orderBy("batch", true)
                    .orderBy("weight", true);
            if (param.getDevNo() == 536){
                locDetlWrapper.eq("model", param.getModel())
@@ -1288,6 +1301,7 @@
                    .gt("weight", param.getWeight() - mat.getUnits())
                    .and()
                    .lt("weight", param.getWeight())
                    .orderBy("batch", true)
                    .orderBy("weight", false);
            if (param.getDevNo() == 536){
                locDetlWrapper.eq("model", param.getModel())
@@ -1331,6 +1345,9 @@
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", singleLoc));
                    if (locMast.getLocSts().equals("F")){
                        LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", singleLoc));
                        if (Cools.isEmpty(locDetl1)){
                            throw new CoolException("库位"+locMast.getLocNo()+"异常，在库但是无库存！！！");
                        }
                        if (!locS.contains(locDetl1.getLocNo())){
                            if (locDetl1.getMatnr().equals(locDetl.getMatnr())){
                                locDetlArrayAnd.add(locDetl1);