#

lsh

2025-01-08 b49d8dbb2ec6a2326b74bf2f8dace1688eb417cd

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

@@ -230,10 +230,20 @@
                        if (locMast2.getCrnNo()==1 || locMast2.getCrnNo()==6){
                            continue;
                        }
                        if (sourceStaNo == 118 || sourceStaNo == 122){
                            if (locMast2.getCrnNo()>3){
                                continue;
                            }
                        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
                            if (locMast2.getCrnNo()<4){
                                continue;
                            }
                        }
                    }
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
                    if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
                        locMast = locMast1;
                        crnNo = locMast.getCrnNo();
                        break;
                    }
                }
@@ -252,6 +262,15 @@
                        if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){
                            continue;
                        }
                        if (sourceStaNo == 118 || sourceStaNo == 122){
                            if (shallowLoc.getCrnNo()>3){
                                continue;
                            }
                        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
                            if (shallowLoc.getCrnNo()<4){
                                continue;
                            }
                        }
                    }
                    if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {