#

luxiaotao1123

2020-06-11 830d4a2a90db1f173044531d7ddc0578cd507346

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

@@ -7,6 +7,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -76,12 +77,12 @@
     * @param sourceStaNo 源站
     * @return locNo 检索到的库位号
     */
    public String getLocNo(Integer whsType, String sourceStaNo) {
    public StartupDto getLocNo(Integer whsType, Integer sourceStaNo) {
        StartupDto startupDto = new StartupDto();
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        if (Cools.isEmpty(rowLastno)) {
            throw new CoolException("数据异常，请联系管理员");
        }
        String locNo = null;
        if (rowLastno.getWhsType() == 1){
            int curRow = rowLastno.getCurrentRow();
            int sRow = rowLastno.getsRow();
@@ -111,7 +112,7 @@
            // 获取目标站
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", 1)
                    .eq("stnNo", sourceStaNo)
                    .eq("stn_no", sourceStaNo)
                    .eq("crn_no", crnNo);
            StaDesc staDesc = staDescService.selectOne(wrapper);
            if (Cools.isEmpty(staDesc)) {
@@ -125,16 +126,23 @@
                if (Cools.isEmpty(locMast)) {
                    throw new CoolException("没有空库位");
                }
                locNo = locMast.getLocNo();
                String locNo = locMast.getLocNo();

                // 更新库位排号
                rowLastno.setCurrentRow(curRow);
                rowLastnoService.updateById(rowLastno);

                // 返回dto
                startupDto.setCrnNo(crnNo);
                startupDto.setShelves(shelves);
                startupDto.setSourceStaNo(sourceStaNo);
                startupDto.setStaNo(staNo.getDevNo());
                startupDto.setLocNo(locNo);
            } else {
                throw new CoolException("目标站不可用");
            }
        }
        return locNo;
        return startupDto;
    }

}