#wrkmast==>sheetNo:徐工汉云拆垛标记 0: 未拆 1: 已拆 2:已处理可下一步（转历史档）

LSH

2023-07-21 d8d107072cde858bdc4d23318c56d52e91f28c93

#wrkmast==>sheetNo:徐工汉云拆垛标记  0: 未拆  1: 已拆  2:已处理可下一步（转历史档）

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

@@ -225,7 +225,7 @@

    /**
     * 要求检验 1: 是  0: 否
     * 徐工汉云拆垛标记  0: 未拆  1: 已拆
     * 徐工汉云拆垛标记  0: 未拆（默认）  1: 已拆
     */
    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer inspect;

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

@@ -67,7 +67,7 @@


    /**
     * 徐工汉云拆垛标记  0: 未拆  1: 已拆
     * 徐工汉云拆垛标记  0: 未拆  1: 已拆  2:已处理可下一步（转历史档）
     */
    @ApiModelProperty(value= "")
    @TableField("sheet_no")

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

@@ -595,6 +595,7 @@
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("N");
        wrkMast.setAppeUser(userId); // 操作人员数据
        wrkMast.setSheetNo("0");  //徐工汉云拆垛标记：0: 未拆  1: 已拆  2:已处理可下一步（转历史档）
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);

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

@@ -1,5 +1,6 @@
package com.zy.asrs.task;

import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
@@ -33,6 +34,11 @@
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
            if (wrkMast.getIoType().equals(101)){
                if (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
                    continue;
                }
            }
            ReturnT<String> returnT = workMastHandler.start(wrkMast);
            if (!returnT.isSuccess()) {
                wrkMast.setUpdMk("X");

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

@@ -136,6 +136,7 @@
                    if (locMast.getLocSts().equals("S")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setSheetNo("0");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -187,6 +188,7 @@
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setSheetNo("0");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -234,6 +236,7 @@
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setSheetNo("0");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -256,6 +259,7 @@
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setSheetNo("0");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -284,6 +288,7 @@
                    if (null != sourceLoc) {
                        sourceLoc.setBarcode("");
                        sourceLoc.setLocSts("O");
                        sourceLoc.setSheetNo("0");
                        sourceLoc.setModiTime(now);
                        sourceLoc.setIoTime(now);
                        if (!locMastService.updateById(sourceLoc)) {
@@ -295,6 +300,7 @@
                    // 修改目标库位状态 ==> .locSts
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
                    locMast.setSheetNo("0");
                    locMast.setIoTime(now);
                    locMast.setModiTime(now);
                    if (!locMastService.updateById(locMast)) {
@@ -375,6 +381,7 @@
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setSheetNo("0");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {