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

zhangc

2025-04-18 a144c412981c49658c951db098a701a58f8e1ee3

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

 src/main/java/com/zy/asrs/entity/Mat.java

@@ -59,8 +59,8 @@
    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    @ExcelProperty(value = "商品编码")
    @ApiModelProperty(value= "物料编码")
    @ExcelProperty(value = "物料编码")
    private String matnr;


@@ -68,7 +68,7 @@
     * 商品名称
     */
    @ApiModelProperty(value= "商品名称")
    @ExcelProperty(value = "商品名称")
    @ExcelProperty(value = "物料名称")
    private String maktx;

    /**

 src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java

@@ -89,31 +89,27 @@
                if (Cools.isEmpty(locMastStart)) {
                    continue;
                }
                if (!Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())) {
                if (Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())) {
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastStart.getLocNo());
                    LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
                    if (locNo != null && !locNo.getLocSts().equals("O")) {
                    if (locNo != null && locNo.getLocSts().equals("D")) {
                        locMastStart = locNo;
                    }
                }
                LocMast locMastEnd = locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_sts", "O")
                        .eq("crn_no", basCrnp.getCrnNo())
                        .eq("loc_type1", locMastStart.getLocType1())
                        //.eq("loc_type1", locMastStart.getLocType1())
                        .ne("modi_user", 77)
                        .orderBy("row1", true));//目标
                        .orderBy("lev1", true));//目标
                if (Cools.isEmpty(locMastEnd)) {
                    continue;
                }
                if (!Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())) {
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastEnd.getLocNo());
                if (Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())) {
                    String shallowLocNo = Utils.getDeepLoc(slaveProperties, locMastEnd.getLocNo());
                    LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
                    if (locNo != null && locNo.getLocSts().equals("O")) {

                    } else {
                        locMastEnd.setModiUser(77L);
                        locMastService.updateById(locMastEnd);
                        continue;
                    if (locNo != null && locNo.getModiUser() != 77L && locNo.getLocSts().equals("O")) {
                        locMastEnd = locNo;
                    }
                }
//                if (Cools.isEmpty(locMastStart) || Cools.isEmpty(locMastEnd)){

 src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java

@@ -33,7 +33,7 @@
            LocMast locMastEndNew = null;


            workService.locMove(locMastStart.getLocNo(), locMastEnd.getLocNo(), 66L);
            workService.locMove(locMastStart.getLocNo(), locMastEnd.getLocNo(), 77L);
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -528,16 +528,11 @@
        //满板正常入库
        switch (curRow){
            case 1:
                necessaryParameters[1] = 4;    //curRow   最深库位排
                necessaryParameters[1] = 6;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 3;    //nearRow  最浅库位排
                break;
            case 4:
                necessaryParameters[1] = 5;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 6;    //nearRow  最浅库位排
                break;
            case 5:
            case 6:
                necessaryParameters[1] = 8;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 8;    //nearRow  最浅库位排

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

@@ -870,7 +870,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 +878,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 +961,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));