Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

2025-04-19 3599feef955e2dcf974ecefeaeb7b28cacb97a73

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

@@ -150,6 +150,7 @@
            }

        }catch (Exception e){
            e.printStackTrace();
            log.error("站点={} 未查询到对应的规则",sourceStaNo);
        }
        return null;
@@ -362,6 +363,7 @@
            }
            // 更新库位排号
            if (Cools.isEmpty(locMast)){
                rowLastno.setCurrentRow(curRow);
                rowLastnoService.updateById(rowLastno);
            }
        }
@@ -870,7 +872,7 @@


        // 相似工作档案 --- 同天同规格物料
        if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
        if (!Cools.isEmpty(matnr) && !Cools.isEmpty(batch) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
            //查询相似工作档案
            List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
            int nearbay = 0;    //相似工作档案 目标库位列
@@ -878,17 +880,19 @@
            for (WrkMast wrkMast:wrkMasts){
                LocMast locMastWrk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
                List<LocMast> locMasts = new ArrayList<>();
                if (locMastWrk.getBay1() >=5 && locMastWrk.getBay1()<=6){
                if (locMastWrk.getBay1() >=3 && locMastWrk.getBay1()<=6){
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMastWrk.getGro1())
                            .ge("bay1",3).le("bay1",6)
                            .eq("crn_no", 7)
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .eq("lev1",locMastWrk.getLev1())
                            .orderBy("bay1", true));
                }else {
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMastWrk.getGro1())
                            .eq("bay1", locMastWrk.getBay1())
                            .eq("crn_no", 7)
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .eq("lev1",locMastWrk.getLev1())
                            .orderBy("bay1", false));
                }
                if (Cools.isEmpty(locMasts)) {
@@ -959,15 +963,15 @@
                }
                if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
                    List<LocMast> locMasts1 = null;
                    if (nearRow == 6){
                    if (nearRow == 3 && curRow == 6){
                        locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("gro1", locMast1.getGro1())
                                .ge("bay1",3).le("bay1",6)
                                .eq("crn_no",7)
                                .eq("loc_type1",locTypeDto.getLocType1())
                                .orderBy("bay1",true));
                    }else {
                        locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("gro1", locMast1.getGro1())
                                .eq("bay1", nearRow)
                                .eq("crn_no",7)
                                .eq("loc_type1",locTypeDto.getLocType1())
                                .orderBy("bay1",false));