#

yxFwq

2025-01-03 bd96ecd68841a7115231131bce5ba874914b89b5

#

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

@@ -40,6 +40,19 @@
    @ApiModelProperty(value= "当前排号")
    @TableField("current_row")
    private Integer currentRow;
    /**
     * 当前排号
     */
    @ApiModelProperty(value= "当前排号")
    @TableField("current_row1")
    private Integer currentRow1;

    /**
     * 当前排号
     */
    @ApiModelProperty(value= "当前排号")
    @TableField("current_row2")
    private Integer currentRow2;

    /**
     * 起始排号
@@ -150,6 +163,22 @@
        return currentRow;
    }

    public Integer getCurrentRow1() {
        return currentRow1;
    }

    public void setCurrentRow1(Integer currentRow1) {
        this.currentRow1 = currentRow1;
    }

    public Integer getCurrentRow2() {
        return currentRow2;
    }

    public void setCurrentRow2(Integer currentRow2) {
        this.currentRow2 = currentRow2;
    }

    public void setCurrentRow(Integer currentRow) {
        this.currentRow = currentRow;
    }

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

@@ -160,7 +160,13 @@
            throw new CoolException("数据异常，请联系管理员");
        }
        // ===============>>>> 开始执行
        if (sourceStaNo == 118 || sourceStaNo == 122){
            curRow = rowLastno.getCurrentRow1();
        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
            curRow = rowLastno.getCurrentRow2();
        } else {
        curRow = rowLastno.getCurrentRow();
        }

        if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
            crnNumber = moveCrnNo;
@@ -330,7 +336,13 @@

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
            if (sourceStaNo == 118 || sourceStaNo == 122){
                rowLastno.setCurrentRow1(curRow);
            } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
                rowLastno.setCurrentRow2(curRow);
            } else {
            rowLastno.setCurrentRow(curRow);
            }
            rowLastnoService.updateById(rowLastno);
        }

@@ -427,7 +439,13 @@
            throw new CoolException("数据异常，请联系管理员");
        }
        // ===============>>>> 开始执行
        if (sourceStaNo == 118 || sourceStaNo == 122){
            curRow = rowLastno.getCurrentRow1();
        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
            curRow = rowLastno.getCurrentRow2();
        } else {
        curRow = rowLastno.getCurrentRow();
        }

        if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
            crnNumber = moveCrnNo;
@@ -601,7 +619,13 @@

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
            if (sourceStaNo == 118 || sourceStaNo == 122){
                rowLastno.setCurrentRow1(curRow);
            } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
                rowLastno.setCurrentRow2(curRow);
            } else {
            rowLastno.setCurrentRow(curRow);
            }
            rowLastnoService.updateById(rowLastno);
        }


 src/main/resources/mapper/RowLastnoMapper.xml

@@ -16,6 +16,8 @@
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="limint_loc" property="limintLoc" />
        <result column="current_row1" property="currentRow1" />
        <result column="current_row2" property="currentRow2" />

    </resultMap>