#

1

2 天以前 fe3b6f1f3163be94496e5d5e72654f22ae131245

#

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

@@ -210,7 +210,9 @@
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
                if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
                    // 启动出库开始 101.出库
                    stockOut(staNo, locDetlDtos, null, userId);
                    stockOut(staNo,param.getOutStaArea(), locDetlDtos, null, userId);

//                    stockOut(staNo, locDetlDtos, null, userId);
                }else {
                    throw new CoolException("所选库位存在状态不为F、D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
                }

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -1671,9 +1671,9 @@
                                orderDetl.setSupp(supp);
                                orderDetl.setSuppCode(suppCode);
                                orderDetl.setSku(matnr);
                                orderDetl.setStandby1(s1 != null? s1:"1");
                                orderDetl.setStandby2(s2 != null? s2:"1");
                                orderDetl.setStandby3(s3 != null? s3:"1");
                                orderDetl.setStandby1(Cools.isEmpty(s1) ? "1" : s1);
                                orderDetl.setStandby2(Cools.isEmpty(s2) ? "1" : s2);
                                orderDetl.setStandby3(Cools.isEmpty(s3) ? "1" : s3);
                                orderDetl.setBoxType1(owner);
                                orderDetl.setBoxType2(ownerUuid);
                                orderDetl.setBoxType3(pOrderNo);

 src/main/java/com/zy/common/service/CommonService.java

@@ -1046,20 +1046,35 @@

        // 开始查找库位 ==============================>>

        if (Cools.isEmpty(locMast) && sourceStaNo != 4006) {//si'lou'p四楼盘点选择区域
        if (Cools.isEmpty(locMast) && sourceStaNo != 4006 && sourceStaNo != 2033 ) {//si'lou'p四楼盘点选择区域
            for(int row = 21; row <= 25; row++){
                 List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                        .eq("row1", row)
                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                    .orderBy("lev1", true).orderBy("bay1", true)); // 最浅库位
            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;
                }
                if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
                    // 获取目标库位所在巷道最深空库位
                    LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                    if (!Cools.isEmpty(locMast2) && locMast2.getRow1() == curRow) {
                        locMast = locMast2;
                    if(locMast1!= null){
                        locMast = locMast1;
                        break;
                    }
                }
            }

        }else if(Cools.isEmpty(locMast) && sourceStaNo != 4006){
            for(int row = 28; row <= 31; row++){
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", row)
                        .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                        .orderBy("lev1", true).orderBy("bay1", true)); // 最浅库位
                for (LocMast locMast1 : locMasts) {
                    if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                        continue;
                    }
                    if(locMast1!= null){
                        locMast = locMast1;
                        break;
                    }
                }