#

luxiaotao1123

2022-03-12 cf72f14140e41ac9532e8e1d4956131f1e07de38

#

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

@@ -74,6 +74,13 @@
    @TableField("ste_no")
    private Integer steNo;

    /**
     * 边缘库位
     */
    @ApiModelProperty(value= "边缘库位")
    @TableField("out_most")
    private Integer outMost;

    @ApiModelProperty(value= "")
    @TableField("sheet_no")
    private String sheetNo;
@@ -491,4 +498,16 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
    }

    public String getOutMost$() {
        if (null == this.outMost){ return null; }
        switch (this.outMost){
            case 1:
                return "边缘库位";
            case 0:
                return "内联库位";
            default:
                return String.valueOf(this.outMost);
        }
    }

}

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

@@ -8,7 +8,6 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -16,7 +15,6 @@
import com.zy.common.model.MatDto;
import com.zy.common.model.SearchLocParam;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.CollectionUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.core.CrnThread;
@@ -58,18 +56,14 @@
@Transactional
public class MainServiceImpl {

    public static final long COMMAND_TIMEOUT = 5 * 1000;

    @Autowired
    private CommonService commonService;
    @Value("${wms.url}")
    private String wmsUrl;
    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private WrkMastMapper wrkMastMapper;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WaitPakinMapper waitPakinMapper;
    @Autowired
    private LocMastService locMastService;
    @Autowired
@@ -79,15 +73,11 @@
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private BasErrLogService basErrLogService;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private BasSteService basSteService;
    @Value("${wms.url}")
    private String wmsUrl;

    /**
     * 组托

 src/main/resources/mapper/WrkMastMapper.xml

@@ -13,6 +13,7 @@
        <result column="io_type" property="ioType" />
        <result column="crn_no" property="crnNo" />
        <result column="ste_no" property="steNo" />
        <result column="out_most" property="outMost" />
        <result column="sheet_no" property="sheetNo" />
        <result column="io_pri" property="ioPri" />
        <result column="wrk_date" property="wrkDate" />