zy-wcs.git - Gitblit

			@@ -4,50 +4,36 @@
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.core.common.Cools;
			import com.core.common.SpringUtils;
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.mapper.BasCrnErrorMapper;
			import com.zy.asrs.mapper.WrkChargeMapper;
			import com.zy.asrs.mapper.WrkMastMapper;
			import com.zy.asrs.mapper.*;
			import com.zy.asrs.service.*;
			import com.zy.asrs.utils.Utils;
			import com.zy.common.model.LocTypeDto;
			import com.zy.common.model.MatDto;
			import com.zy.common.model.SearchLocParam;
			import com.zy.common.model.StartupDto;
			import com.zy.common.model.*;
			import com.zy.common.model.enums.WrkChargeType;
			import com.zy.common.service.CommonService;
			import com.zy.common.utils.CollectionUtils;
			import com.zy.common.utils.HttpHandler;
			import com.zy.common.service.erp.ErpService;
			import com.zy.common.utils.*;
			import com.zy.core.CrnThread;
			import com.zy.core.DevpThread;
			import com.zy.core.News;
			import com.zy.core.cache.MessageQueue;
			import com.zy.core.cache.SlaveConnection;
			import com.zy.core.enums.*;
			import com.zy.core.model.*;
			import com.zy.core.model.command.CrnCommand;
			import com.zy.core.model.command.LedCommand;
			import com.zy.core.model.command.SteCommand;
			import com.zy.core.model.protocol.CrnProtocol;
			import com.zy.core.model.protocol.StaProtocol;
			import com.zy.core.model.protocol.SteProtocol;
			import com.zy.core.model.command.*;
			import com.zy.core.model.protocol.*;
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.thread.BarcodeThread;
			import com.zy.core.thread.LedThread;
			import com.zy.core.thread.SiemensDevpThread;
			import com.zy.core.thread.SteThread;
			import com.zy.core.thread.*;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.scheduling.annotation.Async;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.interceptor.TransactionAspectSupport;

			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Set;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			@@ -93,6 +79,14 @@
			private CommonService commonService;
			@Autowired
			private WrkChargeMapper wrkChargeMapper;
			@Autowired
			private ErpService erpService;
			@Autowired
			private OrderMapper orderMapper;
			@Autowired
			private OrderDetlMapper orderDetlMapper;
			@Autowired
			private RedisUtil redisUtil;

			/**
			* 组托
			@@ -112,6 +106,46 @@
			staProtocol = staProtocol.clone();
			}
			Short workNo = staProtocol.getWorkNo();
			// 尺寸检测异常
			boolean back = false;
			String errMsg = "异常：";
			if (staProtocol.isFrontErr()) {
			errMsg = errMsg+"前超限；";
			back = true;
			}
			if (staProtocol.isBackErr()) {
			errMsg = errMsg+"后超限";
			back = true;
			}
			if (staProtocol.isHighErr()) {
			errMsg = errMsg+"高超限";
			back = true;
			}
			if (staProtocol.isLeftErr()) {
			errMsg = errMsg+"左超限";
			back = true;
			}
			if (staProtocol.isRightErr()) {
			errMsg = errMsg+"右超限";
			back = true;
			}
			if (staProtocol.isWeightErr()) {
			errMsg = errMsg+"超重";
			back = true;
			}
			if (staProtocol.isBarcodeErr()) {
			errMsg = errMsg+"扫码失败";
			back = true;
			}
			// 退回
			if (back) {
			// led 异常显示
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			if (ledThread != null) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
			}
			continue;
			}
			// 判断是否满足入库条件
			if (staProtocol.isAutoing() && staProtocol.isLoading()
			&& staProtocol.isInEnable()
			@@ -125,9 +159,9 @@
			}
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "empty".equals(barcode)) {
			staProtocol.setWorkNo((short) 9995);
			// News.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "empty".equals(barcode)\|\| "00000000".equals(barcode)) {
			staProtocol.setWorkNo((short) 32002);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			@@ -141,7 +175,7 @@
			continue;
			}
			} else {
			staProtocol.setWorkNo((short) 9995);
			staProtocol.setWorkNo((short) 32002);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			@@ -156,16 +190,16 @@
			}

			// 过滤盘点/拣料/并板任务
			if (null != wrkMastMapper.selectPickStepByBarcode(barcode)) {
			continue;
			}
			// if (null != wrkMastMapper.selectPickStepByBarcode(barcode)) {
			// continue;
			// }

			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
			if (wrkMast != null) {
			log.error("工作档中已存在该站状态为（ 2.设备上走）的数据,工作号={}", wrkMast.getWrkNo());
			continue;
			}
			// WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
			// if (wrkMast != null) {
			// News.error("工作档中已存在该站状态为（ 2.设备上走）的数据,工作号={}", wrkMast.getWrkNo());
			// continue;
			// }

			try {
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			@@ -202,9 +236,9 @@
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
			}
			}
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			} else if (code == 700) {
			staProtocol.setWorkNo((short) 9995);
			staProtocol.setWorkNo((short) 32002);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			@@ -228,6 +262,7 @@
			* wms入库
			* 入库站，根据条码扫描生成入库工作档，工作状态 1 ==>> 2
			*/
			@Deprecated
			public void generateStoreWrkFile0() {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			@@ -247,6 +282,55 @@
			&& staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk() && (workNo == 0 \|\| (workNo >= 9990 && workNo <= 9999))
			&& staProtocol.isPakMk()) {

			// 尺寸检测异常
			boolean back = false;
			String errMsg = "";
			if (staProtocol.isFrontErr()) {
			errMsg = "前超限";
			back = true;
			}
			if (!back && staProtocol.isBackErr()) {
			errMsg = "后超限";
			back = true;
			}
			if (!back && staProtocol.isHighErr()) {
			errMsg = "高超限";
			back = true;
			}
			if (!back && staProtocol.isLeftErr()) {
			errMsg = "左超限";
			back = true;
			}
			if (!back && staProtocol.isRightErr()) {
			errMsg = "右超限";
			back = true;
			}
			if (!back && staProtocol.isWeightErr()) {
			errMsg = "超重";
			back = true;
			}
			if (!back && staProtocol.isBarcodeErr()) {
			errMsg = "扫码失败";
			back = true;
			}

			// 退回
			if (back) {
			News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
			staProtocol.setWorkNo((short) 32002);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

			// led 异常显示
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			if (ledThread != null) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
			}
			continue;
			}

			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep11(inSta.getStaNo());
			if (wrkMast == null) { continue; }
			@@ -263,10 +347,10 @@
			wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("更新工作档失败！！！ [工作号：{}]", wrkMast.getWrkNo());
			News.error("更新工作档失败！！！ [工作号：{}]", wrkMast.getWrkNo());
			}
			} else {
			log.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			}
			}
			}
			@@ -274,63 +358,9 @@
			}

			/**
			* 拣料、并板、盘点再入库【第1阶段】
			* 拣料、并板、盘点再入库
			*/
			public synchronized void stnToCrnStnPick0(){
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历拣料入库口
			for (DevpSlave.Sta pickSta : devp.getPickOutSta()) {

			// 获取拣料入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			if (staProtocol.isAutoing()
			&& staProtocol.isLoading()
			&& staProtocol.isInEnable()
			&& staProtocol.getWorkNo() > 0
			&& staProtocol.isPakMk()) {
			WrkMast wrkMast = wrkMastMapper.selectPickStep(staProtocol.getWorkNo());
			if (wrkMast == null) {
			// 无拣料数据
			continue;
			}
			short staNo;
			switch (wrkMast.getSourceStaNo()) {
			case 104:
			case 108:
			staNo = 103;
			break;
			case 204:
			case 208:
			staNo = 203;
			break;
			default:
			log.error("{}任务再入库失败，系统数据异常！", wrkMast.getWrkNo());
			continue;
			}
			// 更新站点信息且下发plc命令
			// staProtocol.setWorkNo((short) 9994);
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(staNo);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			log.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			}
			}
			}
			}
			}

			/**
			* 拣料、并板、盘点再入库【第2阶段】
			*/
			public synchronized void stnToCrnStnPick1(){
			public synchronized void stnToCrnStnPick(){
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历拣料入库口
			for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
			@@ -347,65 +377,62 @@
			&& staProtocol.isLoading()
			&& staProtocol.isInEnable()
			// 0 - 9990 或者 9996
			&& ((staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9990) \|\| staProtocol.getWorkNo() == 9996)
			&& (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9990)
			&& staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
			&& staProtocol.isPakMk()){

			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
			if (barcodeThread == null) {
			continue;
			}
			// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
			// if (barcodeThread == null) {
			// continue;
			// }

			WrkMast wrkMast = null;
			if (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9990) {
			wrkMast = wrkMastMapper.selectPickStep(staProtocol.getWorkNo());
			if (null == wrkMast) {
			log.error("{}任务号错误，暂无拣料任务！", staProtocol.getWorkNo());
			}
			}
			if (staProtocol.getWorkNo() == 9996) {
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode)) {
			log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "empty".equals(barcode)) {
			staProtocol.setWorkNo((short) 9995);
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

			// led 异常显示
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			if (ledThread != null) {
			String errorMsg = "扫码失败，请重试";
			MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
			}
			continue;
			}
			} else {
			staProtocol.setWorkNo((short) 9995);
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

			// led 异常显示
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			if (ledThread != null) {
			String errorMsg = "扫码失败，请重试";
			MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
			}
			continue;
			}
			wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode);
			if (null == wrkMast) {
			log.error("{}条码错误，暂无拣料任务！", barcode);
			}
			}

			if (wrkMast == null) {
			// 无拣料数据
			} else {
			continue;
			}
			// if (staProtocol.getWorkNo() == 9996) {
			// String barcode = barcodeThread.getBarcode();
			// if(!Cools.isEmpty(barcode)) {
			// News.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
			// if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "empty".equals(barcode)) {
			// staProtocol.setWorkNo((short) 32002);
			// staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			//
			// // led 异常显示
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			// if (ledThread != null) {
			// String errorMsg = "扫码失败，请重试";
			// MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
			// }
			// continue;
			// }
			// } else {
			// staProtocol.setWorkNo((short) 32002);
			// staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			//
			// // led 异常显示
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			// if (ledThread != null) {
			// String errorMsg = "扫码失败，请重试";
			// MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
			// }
			// continue;
			// }
			// wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode);
			// if (null == wrkMast) {
			// News.error("{}条码错误，暂无拣料任务！", barcode);
			// }
			// }
			if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
			\|\| Cools.isEmpty(wrkMast.getStaNo()) \|\| Cools.isEmpty(wrkMast.getSourceStaNo()) ) {
			continue;
			@@ -418,7 +445,7 @@
			param.setWrkNo(wrkMast.getWrkNo());
			param.setIoType(wrkMast.getIoType());
			param.setSourceStaNo(pickSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			// param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			@@ -438,7 +465,7 @@
			// .eq("crn_no", dto.getCrnNo()); // 堆垛机号
			// StaDesc staDesc = staDescService.selectOne(wrapper);
			// if (Cools.isEmpty(staDesc)) {
			// log.error("入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
			// News.error("入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
			// continue;
			// }
			// // 堆垛机站点(目标站)
			@@ -469,27 +496,6 @@
			if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
			throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			}
			// 修改源库位状态 O.空库位
			LocMast locMast = locMastService.selectById(sourceLocNo);
			locMast.setLocSts("O");
			locMast.setModiTime(new Date());
			if (!locMastService.updateById(locMast)) {
			throw new CoolException(wrkMast.getWrkNo() + "修改源库位状态 O.空库位");
			}
			// 修改目标库位状态 Q.拣料/盘点/并板再入库
			locMast = locMastService.selectById(wrkMast.getLocNo());
			locMast.setLocSts("Q");
			locMast.setModiTime(new Date());
			if (!locMastService.updateById(locMast)) {
			throw new CoolException(wrkMast.getWrkNo() + "修改目标库位状态 Q.拣料/盘点/并板再入库");
			}
			// 库存明细转移
			if (!locDetlService.updateLocNo(wrkMast.getLocNo(), sourceLocNo)) {
			throw new CoolException(wrkMast.getWrkNo() + "任务库存明细转移失败！！！");
			}

			// 条码设备处理
			barcodeThread.setBarcode("");

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			@@ -497,7 +503,7 @@
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			log.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			}

			} else if (code == 500){
			@@ -507,9 +513,9 @@
			MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
			}
			}
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			} else {
			staProtocol.setWorkNo((short) 9995);
			staProtocol.setWorkNo((short) 32002);
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			@@ -525,7 +531,6 @@
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			// continue;
			}

			}
			@@ -537,7 +542,6 @@
			/**
			* 堆垛机站出库到出库站
			*/
			@Async
			public void crnStnToOutStn() {
			for (CrnSlave crnSlave : slaveProperties.getCrn()) {
			// 遍历堆垛机出库站
			@@ -588,11 +592,396 @@
			// 复位堆垛机
			crnThread.setResetFlag(true);
			} else {
			log.error("更新工作档的工作状态为 17.出库完成失败！！！ [工作号:{}]", wrkMast.getWrkNo());
			News.error("更新工作档的工作状态为 17.出库完成失败！！！ [工作号:{}]", wrkMast.getWrkNo());
			}

			}

			}
			}
			}
			}

			/**
			* 入出库 ===>> 四向穿梭车入出库作业下发
			*/
			public synchronized void shuttleIoExecute() {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历入库站
			for (DevpSlave.StaRack rackInStn : devp.getRackInStn()) {
			// 获取入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());

			StaProtocol staProtocol = devpThread.getStation().get(rackInStn.getStaNo());
			StaProtocol staProtocol105 = devpThread.getStation().get(105);
			staProtocol105.setWorkNo((short) 752);
			staProtocol105.setStaNo((short) 100);

			StaProtocol staProtocol106 = devpThread.getStation().get(106);
			staProtocol106.setWorkNo((short) 753);
			staProtocol106.setStaNo((short) 100);

			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			Short workNo = staProtocol.getWorkNo();

			// 判断是否满足入库条件
			if (true \|\| staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()) {
			WrkMast wrkMast = wrkMastMapper.selectRackInStep48(workNo, staProtocol.getSiteId());
			if (wrkMast != null) {
			if (wrkMast.getWrkSts() == 4 \|\| wrkMast.getWrkSts() == 8) {
			ShuttleThread shuttleThread = null;
			HashMap<String, Object> searchIdleShuttle = null;
			if (wrkMast.getWrkSts() == 4) {
			//寻找最近且空闲的四向穿梭车
			searchIdleShuttle = this.searchIdleShuttle(wrkMast);
			shuttleThread = (ShuttleThread) searchIdleShuttle.get("result");
			}else {
			//状态8，四向穿梭车已在提升机口，等待命令进行入库搬运动作
			Integer shuttleNo = wrkMast.getShuttleNo();//四向穿梭车号
			shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
			}

			if (shuttleThread == null) {
			continue;
			}

			ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (!shuttleProtocol.isIdle()) {
			continue;
			}

			wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//给工作档分配四向穿梭车号

			//分配任务号
			shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
			//分配源库位
			shuttleProtocol.setSourceLocNo(wrkMast.getSourceLocNo());

			ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
			//四向穿梭车号
			assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
			//任务号
			assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
			//入出库模式
			assignCommand.setTaskMode(ShuttleTaskModeType.PAK_IN.id.shortValue());
			//源库位(小车当前位置)
			String currentLocNo = shuttleProtocol.getCurrentLocNo();
			assignCommand.setSourceLocNo(currentLocNo);

			if (wrkMast.getWrkSts() == 8 \|\| Boolean.parseBoolean(searchIdleShuttle.get("sameLay").toString())) {
			//同一层
			//分配目标库位
			shuttleProtocol.setLocNo(wrkMast.getLocNo());
			//目标库位
			assignCommand.setLocNo(wrkMast.getLocNo());
			wrkMast.setWrkSts(9L);//小车入库中
			}else {
			//不同层，将目标库位分配成提升机库位号

			//小车当前层高
			Integer currentLev = Integer.parseInt(currentLocNo.substring(currentLocNo.length() - 2, currentLocNo.length()));

			//获取提升机
			LiftSlave liftSlave = slaveProperties.getLift().get(0);
			//提升机库位号
			String liftLocNo = liftSlave.getLiftLocNo(currentLev);
			shuttleProtocol.setLocNo(liftLocNo);
			//目标库位
			assignCommand.setLocNo(liftLocNo);
			wrkMast.setWrkSts(5L);//小车迁移状态
			}

			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
			}
			}

			}
			}

			}
			}

			}

			/**
			* 搜索空闲且最近的四向穿梭车
			*/
			public HashMap<String,Object> searchIdleShuttle(WrkMast wrkMast) {
			HashMap<String, Object> map = new HashMap<>();
			String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();//库位号
			LocMast locMast = locMastService.queryByLoc(locNo);//找到库位记录
			String lay = locNo.substring(locNo.length() - 2, locNo.length());//当前工作档库位层高
			ShuttleThread recentShuttle = null;//当前距离最近的四向穿梭车线程

			for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
			//获取四向穿梭车线程
			ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
			ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (shuttleProtocol == null) {
			continue;
			}
			if (!shuttleProtocol.isIdle()) {
			continue;
			}

			String shuttleLocNo = shuttleProtocol.getCurrentLocNo();//二维码对应库位号
			String shuttleLocNoLay = shuttleLocNo.substring(shuttleLocNo.length() - 2, shuttleLocNo.length());//库位号对应层高
			if (lay.equals(shuttleLocNoLay)) {
			//当前四向穿梭车和工作档任务在同一层，则调配该车辆
			map.put("sameLay", true);//同一层
			map.put("result", shuttleThread);
			return map;
			}

			//更新当前最近的四向穿梭车
			if (recentShuttle == null) {
			recentShuttle = shuttleThread;
			}else {
			ShuttleProtocol recentShuttleProtocol = recentShuttle.getShuttleProtocol();//目前最近穿梭车
			String recentShuttleLocNo = recentShuttleProtocol.getCurrentLocNo();//二维码对应库位号
			String recentShuttleLocNoLay = recentShuttleLocNo.substring(recentShuttleLocNo.length() - 2, recentShuttleLocNo.length());//库位号对应层高

			int recentShuttleLocNoLayInt = Integer.parseInt(recentShuttleLocNoLay);
			int layInt = Integer.parseInt(lay);
			int shuttleLocNoLayInt = Integer.parseInt(shuttleLocNoLay);
			int i = Math.abs(layInt - recentShuttleLocNoLayInt);//工作档楼层减最近穿梭车楼层，取绝对值
			int j = Math.abs(layInt - shuttleLocNoLayInt);//工作档楼层减当前穿梭车楼层，取绝对值
			if (i < j) {
			//更新最近穿梭车
			recentShuttle = shuttleThread;
			} else if (i == j) {
			//楼层相同情况
			//找距离出库点最近的车

			if (!(recentShuttleProtocol.isIdle() && shuttleProtocol.isIdle())) {
			//只要有一辆车不是空闲则不进行调度
			map.put("sameLay", false);//不同层
			map.put("result", null);
			return map;
			}

			//获取提升机
			LiftSlave liftSlave = slaveProperties.getLift().get(0);
			//提升机库位号
			String recentLiftLocNo = liftSlave.getLiftLocNo(recentShuttleLocNoLayInt);
			String shuttleLiftLocNo = liftSlave.getLiftLocNo(shuttleLocNoLayInt);

			//当前最近四向穿梭车到提升机路径
			List<NavigateNode> recentShuttlePath = NavigateUtils.calc(recentShuttleLocNo, recentLiftLocNo, ShuttleTaskModeType.PAK_IN.id);
			//当前楼层四向穿梭车到提升机路径
			List<NavigateNode> shuttlePath = NavigateUtils.calc(shuttleLocNo, shuttleLiftLocNo, ShuttleTaskModeType.PAK_IN.id);
			//判断哪一个路径最短
			if (shuttlePath.size() < recentShuttlePath.size()) {
			//如果当前楼层的车路径更小，则更新最近穿梭车
			recentShuttle = shuttleThread;
			}
			}
			}
			}

			map.put("sameLay", false);//不同层
			map.put("result", recentShuttle);
			return map;
			}

			/**
			* 四向穿梭车任务完成
			*/
			public synchronized void shuttleFinished() {
			for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
			//获取四向穿梭车信息
			ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
			ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (shuttleProtocol == null) {
			continue;
			}

			//四向穿梭车状态为等待确认
			if (shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.WAITING.id && shuttleProtocol.getTaskNo() != 0) {
			//将任务档标记为完成
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo59(shuttleProtocol.getTaskNo().intValue());
			if (wrkMast != null) {
			switch (wrkMast.getWrkSts().intValue()) {
			case 9:
			wrkMast.setWrkSts(14L);
			break;
			case 5:
			wrkMast.setWrkSts(6L);
			break;
			default:
			}

			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//设置四向穿梭车为空闲状态
			shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
			//任务号清零
			shuttleProtocol.setTaskNo((short) 0);
			//源库位清零
			shuttleProtocol.setSourceLocNo(null);
			//目标库位清零
			shuttleProtocol.setLocNo(null);
			//标记复位
			shuttleProtocol.setPakMk(true);
			//任务指令清零
			shuttleProtocol.setAssignCommand(null);
			News.info("四向穿梭车已确认且任务完成状态,复位。四向穿梭车号={}", shuttleProtocol.getShuttleNo());
			} else {
			News.error("四向穿梭车已确认且任务完成状态,复位失败，但未找到工作档。四向穿梭车号={}，工作号={}", shuttleProtocol.getShuttleNo(), shuttleProtocol.getTaskNo());
			}
			}

			}
			}
			}

			/**
			* 提升机任务
			*/
			public synchronized void liftIoExecute() {
			for (LiftSlave liftSlave : slaveProperties.getLift()) {
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
			if (liftThread == null) {
			continue;
			}
			LiftProtocol liftProtocol = liftThread.getLiftProtocol();
			if (liftProtocol == null) {
			continue;
			}

			//判断提升机是否处于空闲状态
			if (!liftProtocol.isIdle()) {
			continue;
			}

			//搜索是否有待处理的任务
			WrkMast wrkMast = wrkMastMapper.selectLiftStep6();
			if (wrkMast == null) {
			continue;
			}

			//给提升机分配任务
			liftProtocol.setLiftLock(true);//锁定提升机
			liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//设置任务号
			liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//设置四向穿梭车号
			liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//设置提升机状态为工作中

			//找到四向穿梭车的线程
			ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, liftProtocol.getShuttleNo().intValue());
			if (shuttleThread == null) {
			continue;
			}
			ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (shuttleProtocol == null) {
			continue;
			}

			//命令list
			ArrayList<LiftCommand> commands = new ArrayList<>();

			//当前穿梭车库位号
			String currentLocNo = shuttleProtocol.getCurrentLocNo();
			//当前穿梭车楼层
			int currentLocNoLey = Integer.parseInt(currentLocNo.substring(currentLocNo.length() - 2, currentLocNo.length()));

			//工作档目标库位号
			String wrkMastLocNo = wrkMast.getLocNo();
			//工作档目标库位楼层
			int wrkMastLocNoLey = Integer.parseInt(wrkMastLocNo.substring(wrkMastLocNo.length() - 2, wrkMastLocNo.length()));

			//提升机当前楼层
			int liftLev = liftProtocol.getLev().intValue();
			if (liftLev != currentLocNoLey) {
			//不同楼层
			LiftCommand command1 = new LiftCommand();
			command1.setLiftNo(liftProtocol.getLiftNo());//提升机号
			command1.setTaskNo(liftProtocol.getTaskNo());//任务号
			command1.setRun((short) 1);//升降
			command1.setDistPosition((short) currentLocNoLey);//目标楼层(穿梭车所在楼层)
			command1.setLiftLock(true);//锁定提升机

			commands.add(command1);//将命令添加进list
			}

			//输送线将四向穿梭车移动进来
			LiftCommand command2 = new LiftCommand();
			command2.setLiftNo(liftProtocol.getLiftNo());//提升机号
			command2.setTaskNo(liftProtocol.getTaskNo());//任务号
			command2.setRun((short) 6);//输送线运作
			command2.setLiftLock(true);//锁定提升机

			commands.add(command2);//将命令添加进list

			//提升机搬运四向穿梭车
			LiftCommand command3 = new LiftCommand();
			command3.setLiftNo(liftProtocol.getLiftNo());//提升机号
			command3.setTaskNo(liftProtocol.getTaskNo());//任务号
			command3.setRun((short) 1);//升降
			command3.setDistPosition((short) wrkMastLocNoLey);//工作档目标楼层
			command3.setLiftLock(true);//锁定提升机

			commands.add(command3);//将命令添加进list

			//提升机到达指定楼层，输送线将四向穿梭车移出去
			//输送线将四向穿梭车移动进来
			LiftCommand command4 = new LiftCommand();
			command4.setLiftNo(liftProtocol.getLiftNo());//提升机号
			command4.setTaskNo(liftProtocol.getTaskNo());//任务号
			command4.setRun((short) 3);//输送线运作
			command4.setLiftLock(true);//锁定提升机

			commands.add(command4);//将命令添加进list

			wrkMast.setWrkSts(7L);//移动任务
			//所需命令组合完毕，更新数据库，提交到线程去工作
			LiftAssignCommand assignCommand = new LiftAssignCommand();
			assignCommand.setCommands(commands);
			assignCommand.setLiftNo(liftProtocol.getLiftNo());
			assignCommand.setTaskNo(liftProtocol.getTaskNo());
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, assignCommand));
			}
			}
			}

			/**
			* 提升机任务完成
			*/
			public synchronized void liftFinished() {
			for (LiftSlave liftSlave : slaveProperties.getLift()) {
			//获取提升机信息
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
			LiftProtocol liftProtocol = liftThread.getLiftProtocol();
			if (liftProtocol == null) {
			continue;
			}

			//提升机为等待确认
			if (liftProtocol.getProtocolStatus() == LiftProtocolStatusType.WAITING.id && liftProtocol.getTaskNo() != 0) {
			//将任务档标记为完成
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo7(liftProtocol.getTaskNo().intValue());
			if (wrkMast != null) {
			wrkMast.setWrkSts(8L);
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//设置提升机为空闲状态
			liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
			//任务号清零
			liftProtocol.setTaskNo((short) 0);
			//标记复位
			liftProtocol.setPakMk(true);
			//任务指令清零
			liftProtocol.setAssignCommand(null);
			News.info("提升机已确认且任务完成状态,复位。提升机号={}", liftProtocol.getLiftNo());
			} else {
			News.error("提升机已确认且任务完成状态,复位失败，但未找到工作档。提升机号={}，工作号={}", liftProtocol.getLiftNo(), liftProtocol.getTaskNo());
			}
			}
			}
			}
			@@ -609,7 +998,7 @@
			if (crnProtocol == null) { continue; }
			BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
			if (basCrnp == null) {
			log.error("{}号堆垛机尚未在数据库进行维护！", crn.getId());
			News.error("{}号堆垛机尚未在数据库进行维护！", crn.getId());
			continue;
			}
			// 只有当堆垛机空闲并且无任务时才继续执行
			@@ -644,6 +1033,8 @@
			}
			// 库位移转
			// this.locToLoc(crn, crnProtocol);
			// 演示
			// this.steMoveDemo(crn, crnProtocol);
			}
			}
			}
			@@ -665,15 +1056,24 @@
			// 查询站点详细信息
			BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
			if (staDetl == null) {
			log.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			News.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			continue;
			}
			// 获取工作状态为 2,3,4,5,6 的入库工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep23456(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
			if(null == wrkMast) {
			// log.error("{}站点查询无待入库数据工作号={}", crnStn.getStaNo(), staProtocol.getWorkNo());
			// News.error("{}站点查询无待入库数据工作号={}", crnStn.getStaNo(), staProtocol.getWorkNo());
			continue;
			}

			// 同库位组进行校验
			List<String> groupLocNo = Utils.getGroupLocNo(wrkMast.getLocNo());
			if (!Cools.isEmpty(groupLocNo)) {
			if (null != wrkMastMapper.selectPakoutWorkingByGroupLoc(groupLocNo)) {
			continue;
			}
			}

			if (wrkMast.getWrkSts() < 3) {
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
			&& staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
			@@ -686,135 +1086,160 @@
			// 获取库位信息
			LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
			if (locMast == null) {
			log.error("查询库存无数据--库位号{}", wrkMast.getLocNo());
			News.error("查询库存无数据--库位号{}", wrkMast.getLocNo());
			continue;
			}
			if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
			log.error("入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
			News.error("入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
			continue;
			}

			List<LocMast> locMasts = null;
			boolean sign=false;
			if (locMast.getRow1()>=5){
			locMasts=locMastService.selectList(new EntityWrapper<LocMast>().ge("row1", 5)
			.eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
			for (LocMast locMast1:locMasts){
			if (locMast1.getRow1()>locMast.getRow1()){
			if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D")){
			if (!locMast1.getLocSts().equals("X")){
			sign=true;
			break;
			}
			}
			}else if (locMast1.getRow1()<locMast.getRow1()){
			if (locMast1.getLocSts().equals("F") \|\| locMast1.getLocSts().equals("D")){
			News.error("当前工作档目标库位所在排前边存在货物！", wrkMast.getWrkNo());
			sign=true;
			break;
			}
			}
			}
			}else {
			locMasts=locMastService.selectList(new EntityWrapper<LocMast>().le("row1", 4)
			.eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
			for (LocMast locMast1:locMasts){
			if (locMast1.getRow1()>locMast.getRow1()){
			if (locMast1.getLocSts().equals("F") \|\| locMast1.getLocSts().equals("D")){
			News.error("当前工作档目标库位所在排前边存在货物！", wrkMast.getWrkNo());
			sign=true;
			break;
			}
			}else if (locMast1.getRow1()<locMast.getRow1()){
			if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D")){
			if (!locMast1.getLocSts().equals("X")){
			sign=true;
			break;
			}
			}
			}
			}
			}
			if (sign){
			continue;
			}

			// 检测是否存在出库任务
			if (null != wrkMastMapper.selectPakout(slave.getId(), null)) {
			log.error("{}入库任务无法作业，因存在出库中任务!", wrkMast.getWrkNo());
			News.error("{}入库任务无法作业，因存在出库中任务!", wrkMast.getWrkNo());
			continue;
			}

			// 置顶任务
			wrkMast.setIoPri((double) 9999);
			if (wrkMast.getIoPri()<8000){
			wrkMast.setIoPri(wrkMast.getIoPri()+9000d);
			}
			wrkMastMapper.updateById(wrkMast);

			// 判断是否为穿梭库
			if (!locMastService.isShuttle(wrkMast.getLocNo())) {

			// 非穿梭库入库【堆垛机直接入库】
			if (wrkMast.getWrkSts() == 2) {

			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			// 目标库位 ===>> 最外层库位
			if (locMastService.isOutMost(wrkMast.getLocNo(), true)) {
			// 判断小车是否在最外层库位，如果是则搬走，如果不是，则直接堆垛机入库
			Integer steNo = this.hasCar(wrkMast.getLocNo());
			// 有小车
			if (steNo != null) {
			// 小车行走到堆垛机待搬移点
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			// 没有其他任务
			if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
			this.letCarBeReady(wrkMast, steNo, wrkMast.getLocNo());
			return true;
			}
			}
			// 小车搬走
			if (wrkMast.getWrkSts() == 3L) {
			this.carMoveOut(wrkMast, steNo, crnProtocol);
			return true;
			}
			// 没有小车
			} else {

			// 双深库位且浅库位有货，则需先对浅库位进行库位移转
			if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
			String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo());
			LocMast shallowLoc = locMastService.selectById(shallowLocNo);
			// O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用直接搬！
			if (shallowLoc.getLocSts().equals("P") \|\| shallowLoc.getLocSts().equals("R")) {
			WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
			if (null == waitWrkMast) {
			log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
			// 当前入库库位组没有小车堆垛机则去站点取货入库
			// case 1：从始至终库位组都没有小车，没有迁出小车动作，所以工作状态 = 2
			// case 2：堆垛机已经搬出小车，有迁出小车动作，所以工作状态 = 6
			if ((wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) \|\| wrkMast.getWrkSts() == 6L) {

			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			}

			// 堆垛机入库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 源库位排
			crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 7.吊车入库中
			Date now = new Date();
			wrkMast.setWrkSts(7L);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.error("修改工作档状态 {} => 7.吊车入库中失败！！，工作号={}", wrkMast.getWrkSts$(), wrkMast.getWrkNo());
			} else {
			if (waitWrkMast.getWrkSts() < 17) {
			waitWrkMast.setIoPri(30D);
			waitWrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(waitWrkMast) == 0) {
			log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			}
			//20220719 Add，如果浅库位状态为P/R，工作状态为14/15,说明浅库位已经空了，可以执行入库任务
			}
			}
			continue;
			}
			if (shallowLoc.getLocSts().equals("F") \|\| shallowLoc.getLocSts().equals("D")) {
			// 此标记避免多次执行移库任务
			if (Cools.isEmpty(wrkMast.getUpdMk()) \|\| "N".equals(wrkMast.getUpdMk())) {
			wrkMast.setUpdMk("Y");
			wrkMast.setIoPri(20D);
			wrkMastMapper.updateById(wrkMast);
			// 生成工作档、改变浅库位的源库/目标库库位状态、下发堆垛机命令（立马执行)
			moveLocForDeepLoc(slave, shallowLoc);
			}
			continue;
			}
			if (shallowLoc.getLocSts().equals("Q")) {
			WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
			if (null != waitWrkMast && waitWrkMast.getWrkSts() == 9) {
			continue;
			return true;
			}
			}
			}

			// 堆垛机入库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 源库位排
			crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 7.吊车入库中
			Date now = new Date();
			wrkMast.setWrkSts(7L);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 {} => 7.吊车入库中失败！！，工作号={}", wrkMast.getWrkSts$(), wrkMast.getWrkNo());
			}

			// 目标库位 ===>> 非最外层库位
			} else {
			// 判断小车是否在当前组库位，如果是则将穿梭车移至最外层，等待堆垛机放货；如果不是，则堆垛机寻找穿梭车，并放置当前组最外层
			Integer steNo = this.hasCarOfIdle(wrkMast.getLocNo());
			// 有小车
			if (steNo != null) {
			// 小车行走到待机位
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			// 没有其他任务
			if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
			this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
			} else {
			return true;
			}
			}
			}
			} else {
			// 目标库位 ===>> 最外层库位
			if (locMastService.isOutMost(wrkMast.getLocNo(), true)) {
			// 判断小车是否在最外层库位，如果是则搬走，如果不是，则直接堆垛机入库
			Integer steNo = this.hasCar(wrkMast.getLocNo());
			// 有小车
			if (steNo != null) {
			// 小车行走到堆垛机待搬移点
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			// 没有其他任务
			if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
			this.letCarBeReady(wrkMast, steNo, wrkMast.getLocNo());
			return true;
			}
			}
			// 小车搬走
			if (wrkMast.getWrkSts() == 3L) {
			this.carMoveOut(wrkMast, steNo, crnProtocol);
			return true;
			}
			// 没有小车
			} else {

			// 当前入库库位组没有小车堆垛机则去站点取货入库
			// case 1：从始至终库位组都没有小车，没有迁出小车动作，所以工作状态 = 2
			// case 2：堆垛机已经搬出小车，有迁出小车动作，所以工作状态 = 6
			if ((wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) \|\| wrkMast.getWrkSts() == 6L) {
			// 堆垛机将货放至小车上 3.小车待搬（小车不用搬运，已经在当前组库位） / 6.小车待入 ===>> 7.吊车入库中
			if (wrkMast.getWrkSts() == 3L \|\| wrkMast.getWrkSts() == 6L) {
			// 小车处于空闲
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isIdle()) {

			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			}

			// 堆垛机入库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			@@ -824,105 +1249,46 @@
			crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 源库位排
			crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 目标库位排
			crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo(), true).shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 7.吊车入库中
			// 修改工作档状态 3.小车待搬 ===>> 7.吊车入库中
			Date now = new Date();
			wrkMast.setWrkSts(7L);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 {} => 7.吊车入库中失败！！，工作号={}", wrkMast.getWrkSts$(), wrkMast.getWrkNo());
			News.error("修改工作档状态 3.小车待搬/6.小车待入 => 7.吊车入库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			}
			}

			}

			// 目标库位 ===>> 非最外层库位
			// 没有小车
			} else {
			// 判断小车是否在当前组库位，如果是则将穿梭车移至最外层，等待堆垛机放货；如果不是，则堆垛机寻找穿梭车，并放置当前组最外层
			Integer steNo = this.hasCarOfIdle(wrkMast.getLocNo());
			// 有小车
			if (steNo != null) {
			// 小车行走到待机位
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			// 寻找当前堆垛机对应的小车
			SteThread steThread = queryIdleCar(wrkMast);
			if (steThread != null) {
			// 没有其他任务
			if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
			this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
			} else {
			// 让小车等待搬运待续
			this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getLocNo());
			return true;
			}
			}
			// 堆垛机将货放至小车上 3.小车待搬（小车不用搬运，已经在当前组库位） / 6.小车待入 ===>> 7.吊车入库中
			if (wrkMast.getWrkSts() == 3L \|\| wrkMast.getWrkSts() == 6L) {
			// 小车处于空闲
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isIdle()) {

			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			}
			// 堆垛机入库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 源库位排
			crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo(), true).shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 3.小车待搬 ===>> 7.吊车入库中
			Date now = new Date();
			wrkMast.setWrkSts(7L);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 3.小车待搬/6.小车待入 => 7.吊车入库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			}
			}
			}
			// 没有小车
			} else {
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			// 寻找当前堆垛机对应的小车
			SteThread steThread = queryIdleCar(wrkMast);
			if (steThread != null) {
			// 没有其他任务
			if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
			// 让小车等待搬运待续
			this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getLocNo());
			return true;
			}
			}
			}
			// 堆垛机搬运小车
			if (wrkMast.getWrkSts() == 3L) {
			this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
			return true;
			}
			}
			// 堆垛机搬运小车
			if (wrkMast.getWrkSts() == 3L) {
			this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
			return true;
			}
			}
			}

			}
			return false;
			}
			@@ -939,21 +1305,59 @@
			}
			// 工作档状态判断
			if (wrkMast.getIoType() < 100 \|\| wrkMast.getSourceStaNo() == null){
			log.error("查询工作档数据不符合条件--入出类型/站点, 工作号={}，源库位={}，入出类型={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
			News.error("查询工作档数据不符合条件--入出类型/站点, 工作号={}，源库位={}，入出类型={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
			continue;
			}
			// 获取源库位信息
			LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
			if (!sourceSta.getLocSts().equals("R") &&!sourceSta.getLocSts().equals("P")) {
			log.error("出库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), sourceSta.getLocSts());
			News.error("出库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), sourceSta.getLocSts());
			continue;
			}
			List<LocMast> locMasts = null;
			boolean sign=false;
			if (sourceSta.getRow1()>=5){
			locMasts=locMastService.selectList(new EntityWrapper<LocMast>().ge("row1", 5)
			.eq("bay1",sourceSta.getBay1()).eq("lev1",sourceSta.getLev1()));
			for (LocMast locMast1:locMasts){
			if (locMast1.getRow1()<sourceSta.getRow1()){
			if (!locMast1.getLocSts().equals("O")){
			News.error("当前工作档源库位所在排前边存在货物！", wrkMast.getWrkNo());
			sign=true;
			break;
			}
			}
			}
			}else {
			locMasts=locMastService.selectList(new EntityWrapper<LocMast>().le("row1", 4)
			.eq("bay1",sourceSta.getBay1()).eq("lev1",sourceSta.getLev1()));
			for (LocMast locMast1:locMasts){
			if (locMast1.getRow1()>sourceSta.getRow1()){
			if (!locMast1.getLocSts().equals("O")){
			News.error("当前工作档目标库位所在排前边存在货物！", wrkMast.getWrkNo());
			sign=true;
			break;
			}
			}
			}
			}
			if (sign){
			continue;
			}

			// 同库位组进行校验
			List<String> groupLocNo = Utils.getGroupLocNo(wrkMast.getSourceLocNo());
			if (!Cools.isEmpty(groupLocNo)) {
			if (null != wrkMastMapper.selectPakinWorkingByGroupLoc(groupLocNo)) {
			continue;
			}
			}

			// 判断是否有同库位组的出库任务，如果有，则暂停
			List<String> outsideLoc = Utils.getGroupOutsideLoc(wrkMast.getSourceLocNo());
			if (!Cools.isEmpty(outsideLoc)) {
			if (!Cools.isEmpty(wrkMastMapper.selectWorkingOfPakOutBySource(outsideLoc))) {
			log.warn("{}工作档出库失败，原因：外层库位{}正在执行出库任务！", wrkMast.getWrkNo(), JSON.toJSONString(outsideLoc));
			// News.warn("{}工作档出库失败，原因：外层库位{}正在执行出库任务！", wrkMast.getWrkNo(), JSON.toJSONString(outsideLoc));
			continue;
			}
			}
			@@ -969,7 +1373,7 @@
			// 查询站点详细信息
			BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
			if (staDetl == null) {
			log.error("出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			News.error("出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			continue;
			}
			// 判断堆垛机出库站状态
			@@ -984,55 +1388,24 @@

			// 过滤
			if (null != wrkMastMapper.selectPakin(slave.getId(), null)) {
			log.error("{}出库任务无法作业，因存在入库中任务!", wrkMast.getWrkNo());
			News.error("{}出库任务无法作业，因存在入库中任务!", wrkMast.getWrkNo());
			continue;
			}

			// 置顶任务
			wrkMast.setIoPri((double) 9998);
			if (wrkMast.getIoPri()<8000){
			wrkMast.setIoPri(wrkMast.getIoPri()+8999d);
			}
			wrkMastMapper.updateById(wrkMast);

			// 判断是否为穿梭库
			if (!locMastService.isShuttle(wrkMast.getSourceLocNo())) {

			// 双深库位且浅库位有货，则需先对浅库位进行库位移转
			if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
			String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
			LocMast shallowLoc = locMastService.selectById(shallowLocNo);
			// O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用直接搬！
			if (shallowLoc.getLocSts().equals("P") \|\| shallowLoc.getLocSts().equals("R")) {
			WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
			if (null == waitWrkMast) {
			log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
			} else {
			if(waitWrkMast.getWrkSts() == 11) {
			waitWrkMast.setIoPri(wrkMast.getIoPri() + 1);
			waitWrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(waitWrkMast) == 0) {
			log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			}
			}
			continue;
			}
			} else if (shallowLoc.getLocSts().equals("F") \|\| shallowLoc.getLocSts().equals("D")) {
			// 此标记避免多次执行移库任务
			if (Cools.isEmpty(wrkMast.getUpdMk()) \|\| "N".equals(wrkMast.getUpdMk())) {
			wrkMast.setUpdMk("Y");
			wrkMastMapper.updateById(wrkMast);
			// 生成工作档、改变浅库位的源库/目标库库位状态、下发堆垛机命令（立马执行)
			moveLocForDeepLoc(slave, shallowLoc);
			}
			log.error("{}任务出库失败，浅库位堵塞！", wrkMast.getWrkNo());
			continue;
			}
			}

			// 最外层库位，直接堆垛机出库
			if (locMastService.isOutMost(wrkMast.getSourceLocNo(), false)) {
			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			}

			// 1.堆垛机开始移动
			// 堆垛机出库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			@@ -1045,7 +1418,7 @@
			crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 11.生成出库ID => 16.吊车出库中
			Date now = new Date();
			@@ -1053,148 +1426,110 @@
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 11.生成出库ID => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			}

			} else {

			// 最外层库位，直接堆垛机出库
			if (locMastService.isOutMost(wrkMast.getSourceLocNo(), false)) {
			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			}

			// 堆垛机出库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 源库位排
			crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 11.生成出库ID => 16.吊车出库中
			Date now = new Date();
			wrkMast.setWrkSts(16L);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			}
			// 不是最外层库位，需要使用穿梭车搬运后，再堆垛机出库
			} else {
			// 当前组库位是否有穿梭车
			Integer steNo = this.hasCarOfIdle(wrkMast.getSourceLocNo());
			// 有小车
			if (steNo != null) {
			if (wrkMast.getWrkSts() == 11L && wrkMast.getSteNo() == null) {
			} else {
			// 当前组库位是否有穿梭车
			Integer steNo = this.hasCarOfIdle(wrkMast.getSourceLocNo());
			// 有小车
			if (steNo != null) {
			if (wrkMast.getWrkSts() == 11L && wrkMast.getSteNo() == null) {

			// 给穿梭车下发命令让其将货物挪至堆垛机搬运点
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isIdle()) {
			// 给穿梭车下发命令让其将货物挪至堆垛机搬运点
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isIdle()) {

			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOutByLoc(wrkMast.getSourceLocNo())); // 任务模式: 去近点等待堆垛机叉取
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOutByLoc(wrkMast.getSourceLocNo())); // 任务模式: 去近点等待堆垛机叉取

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());
			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 11.生成出库ID => 14.小车搬出库
			Date now = new Date();
			wrkMast.setWrkSts(14L);
			wrkMast.setSteNo(steNo);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
			Integer outCrnNo = locMastService.getOutCrnNo(locMast);
			wrkMast.setCrnNo(outCrnNo);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 14.小车搬出库失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			}
			}
			}
			if (wrkMast.getWrkSts() == 15L) {
			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			}

			// 堆垛机出库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(sourceSta.getRow1(), false).shortValue()); // 源库位排
			crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 15.等待吊车 => 16.吊车出库中
			// 修改工作档状态 11.生成出库ID => 14.小车搬出库
			Date now = new Date();
			wrkMast.setWrkSts(16L);
			wrkMast.setWrkSts(14L);
			wrkMast.setSteNo(steNo);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
			Integer outCrnNo = locMastService.getOutCrnNo(locMast);
			wrkMast.setCrnNo(outCrnNo);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 15.等待吊车 => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 11.生成出库ID => 14.小车搬出库失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			}
			}
			}
			if (wrkMast.getWrkSts() == 15L) {
			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			}

			// 没有小车
			} else {
			if (wrkMast.getWrkSts() == 11L && wrkMast.getSteNo() == null) {
			// 寻找最近的小车
			SteThread steThread = queryIdleCar(wrkMast);
			if (steThread != null) {
			// 没有其他任务
			if (null == wrkMastMapper.selectPakout(slave.getId(), steNo)) {
			// 让小车等待搬运待续
			this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
			return true;
			}
			// 堆垛机出库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(sourceSta.getRow1(), false).shortValue()); // 源库位排
			crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 15.等待吊车 => 16.吊车出库中
			Date now = new Date();
			wrkMast.setWrkSts(16L);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.error("修改工作档状态 15.等待吊车 => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			}
			// 堆垛机搬运小车
			if (wrkMast.getWrkSts() == 12L) {
			this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
			return true;
			}

			// 没有小车
			} else {
			if (wrkMast.getWrkSts() == 11L && wrkMast.getSteNo() == null) {
			// 寻找最近的小车
			SteThread steThread = queryIdleCar(wrkMast);
			if (steThread != null) {
			// 没有其他任务
			if (null == wrkMastMapper.selectPakout(slave.getId(), steNo)) {
			// 让小车等待搬运待续
			this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
			return true;
			}
			}
			}
			// 堆垛机搬运小车
			if (wrkMast.getWrkSts() == 12L) {
			this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
			return true;
			}
			}
			}

			}
			}
			return false;
			@@ -1213,7 +1548,7 @@
			// 获取源库位信息
			LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
			if (null == sourceLoc) {
			log.error("工作档库位移转失败，原因：检索源库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
			News.error("工作档库位移转失败，原因：检索源库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
			return;
			}
			// 源库位库位状态判断
			@@ -1223,7 +1558,7 @@
			// 获取目标库位信息
			LocMast loc = locMastService.selectById(wrkMast.getLocNo());
			if (null == loc) {
			log.error("工作档库位移转失败，原因：检索目标库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
			News.error("工作档库位移转失败，原因：检索目标库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
			return;
			}
			// 获取堆垛机信息并判断是否可入出
			@@ -1259,7 +1594,7 @@
			crnCommand.setDestinationPosY(loc.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(loc.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 11.生成出库ID => 16.吊车出库中
			Date now = new Date();
			@@ -1267,7 +1602,7 @@
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("【库位移转】修改工作档状态 11.生成出库ID => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("【库位移转】修改工作档状态 11.生成出库ID => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}

			@@ -1356,7 +1691,7 @@
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (!steProtocol.isIdle()) { continue; }
			if (steProtocol.getRow() == 1) { continue; }
			// if (steProtocol.getRow() == 1) { continue; }
			String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
			// 如果在同一个库位组
			if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
			@@ -1367,6 +1702,34 @@
			LocMast locMast = locMastService.selectById(locNo);
			int lev = locMast.getLev1();
			int bay = locMast.getBay1();
			int levAbs = Math.abs(lev - steProtocol.getLev());
			int bayAbs = Math.abs(bay - steProtocol.getBay());
			if (val == 0) {
			val = levAbs + bayAbs;
			result = steThread;
			} else {
			if ((levAbs + bayAbs) < val) {
			val = levAbs + bayAbs;
			result = steThread;
			}
			}
			}
			return result;
			}

			public SteThread queryIdleCar(CrnProtocol crnProtocol) {
			List<BasSte> basStes = basSteService.selectList(new EntityWrapper<>());
			int val = 0;
			SteThread result = null;
			for (BasSte basSte : basStes) {
			// 获取穿梭车信息
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, basSte.getSteNo());
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (!steProtocol.isIdle()) { continue; }
			if (steProtocol.getRow() == 1) { continue;}
			int lev = crnProtocol.getLevel();
			int bay = crnProtocol.getBay();
			int levAbs = Math.abs(lev - steProtocol.getLev());
			int bayAbs = Math.abs(bay - steProtocol.getBay());
			if (val == 0) {
			@@ -1399,7 +1762,7 @@
			wrkMast.setSteNo(steNo);
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			} else {
			// 命令下发区 --------------------------------------------------------------------------
			@@ -1413,13 +1776,13 @@
			steCommand.setLev(steProtocol.getLev());

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态绑定穿梭车
			wrkMast.setSteNo(steNo);
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			@@ -1433,7 +1796,7 @@
			if (steProtocol == null) { return; }

			if (!basSteService.updatePakMk(steNo, "Y")) {
			log.error("修改穿梭车作业状态失败！！，穿梭车={}", steNo);
			News.error("修改穿梭车作业状态失败！！，穿梭车={}", steNo);
			return;
			}

			@@ -1448,13 +1811,13 @@
			steCommand.setLev(steProtocol.getLev());

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态绑定穿梭车
			wrkCharge.setSteNo(steNo);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			@@ -1481,13 +1844,47 @@
			steCommand.setLev(steProtocol.getLev());

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态绑定穿梭车
			wrkMast.setSteNo(steNo);
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			}

			/**
			* 让小车从远点 ====>> 移动到近点
			* 等待堆垛机搬运
			*/
			public void letCarBeReady(WrkCharge wrkCharge, Integer steNo) {
			// 获取穿梭车信息
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { return; }
			if (steProtocol.isIdle()) {

			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol)); // 任务模式: 去近点等待堆垛机叉取

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态绑定穿梭车
			wrkCharge.setSteNo(steNo);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			News.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			@@ -1511,7 +1908,7 @@
			// 判断被移库位是否存在其他小车
			Integer otherSte = existOtherSte(wrkMast.getLocNo(), steNo);
			if (otherSte != null) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", steNo, wrkMast.getLocNo(), otherSte);
			News.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", steNo, wrkMast.getLocNo(), otherSte);
			return;
			}

			@@ -1529,7 +1926,7 @@
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo(), true), locMast.getBay1(), locMast.getLev1());
			@@ -1539,7 +1936,7 @@
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 3.小车待搬 => 4.迁入小车失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 3.小车待搬 => 4.迁入小车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			// 出库搬
			@@ -1547,7 +1944,7 @@
			// 判断被移库位是否存在其他小车
			Integer otherSte = existOtherSte(wrkMast.getSourceLocNo(), steNo);
			if (otherSte != null) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", steNo, wrkMast.getSourceLocNo(), otherSte);
			News.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", steNo, wrkMast.getSourceLocNo(), otherSte);
			return;
			}

			@@ -1565,7 +1962,7 @@
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo(), true), locMast.getBay1(), locMast.getLev1());
			@@ -1575,7 +1972,7 @@
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 12.小车待搬 => 13.迁入小车失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 12.小车待搬 => 13.迁入小车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			@@ -1599,7 +1996,7 @@

			BasSte basSte = basSteService.selectById(steNo);
			if (basSte == null) {
			log.error("{}号穿梭车在数据库不存在！！！", steNo);
			News.error("{}号穿梭车在数据库不存在！！！", steNo);
			return;
			}

			@@ -1608,7 +2005,7 @@
			// 判断被移库位是否存在其他小车
			Integer otherSte = existOtherSte(idleLocNo, steNo);
			if (otherSte != null) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", steNo, idleLocNo, otherSte);
			News.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", steNo, idleLocNo, otherSte);
			return;
			}

			@@ -1625,7 +2022,7 @@
			crnCommand.setDestinationPosY((short) Utils.getBay(idleLocNo)); // 目标库位列
			crnCommand.setDestinationPosZ((short) Utils.getLev(idleLocNo)); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(idleLocNo, true), Utils.getBay(idleLocNo), Utils.getLev(idleLocNo));
			@@ -1635,7 +2032,7 @@
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 3.小车待搬 => 5.迁出小车失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 3.小车待搬 => 5.迁出小车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			@@ -1646,7 +2043,6 @@
			/**
			* 执行对工作档的完成操作
			*/
			@Async
			@Transactional
			public void storeFinished() {
			for (CrnSlave crn : slaveProperties.getCrn()) {
			@@ -1663,7 +2059,18 @@
			// 充电任务
			WrkCharge wrkCharge = wrkChargeService.selectById(crnProtocol.getTaskNo());
			if (wrkCharge == null) {
			log.error("堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
			News.error("堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
			wrkMast = wrkMastMapper.selectCrnWaiting2(crnProtocol.getTaskNo().intValue());
			if (wrkMast.getIoType() != 11) {
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			News.error("堆垛机处于等待确认且任务完成状态,复位，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
			} else {
			News.error("堆垛机处于等待确认且任务完成状态,复位失败，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
			}
			}
			continue;
			} else {
			// 小车搬至指定库位完成
			@@ -1671,14 +2078,14 @@
			// 23.吊车搬运 ===>> 24.小车到达
			wrkCharge.setWrkSts(24L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 23.吊车搬运 ===>> 24.小车到达失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改充电任务状态 23.吊车搬运 ===>> 24.小车到达失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业充电任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			News.error("{}号穿梭车重新定位失败！作业充电任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			}
			}
			} else if (wrkCharge.getWrkSts() == 27) {
			@@ -1690,51 +2097,51 @@
			// 27.放至充电位 ===>> 28.充电就绪
			wrkCharge.setWrkSts(28L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 27.放至充电位 ===>> 28.充电就绪失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改充电任务状态 27.放至充电位 ===>> 28.充电就绪失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			} else {
			log.error("{}号穿梭车重新定位失败！作业充电任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			News.error("{}号穿梭车重新定位失败！作业充电任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			}
			} else if (wrkCharge.getWrkSts() == 34) {
			// 34.吊车搬运 ===>> 35.小车就绪
			wrkCharge.setWrkSts(35L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 34.吊车搬运 ===>> 35.小车就绪失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改充电任务状态 34.吊车搬运 ===>> 35.小车就绪失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业充电任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			News.error("{}号穿梭车重新定位失败！作业充电任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			}
			}
			} else if (wrkCharge.getWrkSts() == 42) {
			// 42.吊车搬运 ===>> 43.小车到达
			wrkCharge.setWrkSts(43L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改复位任务状态 42.吊车搬运 ===>> 43.小车到达失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改复位任务状态 42.吊车搬运 ===>> 43.小车到达失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业复位任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			News.error("{}号穿梭车重新定位失败！作业复位任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			}
			}
			} else if (wrkCharge.getWrkSts() == 46) {
			// 46.放至待机位 ===>> 47.复位成功
			wrkCharge.setWrkSts(47L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改复位任务状态 46.放至待机位 ===>> 47.复位成功失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改复位任务状态 46.放至待机位 ===>> 47.复位成功失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业复位任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			News.error("{}号穿梭车重新定位失败！作业复位任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			}
			}
			}
			@@ -1745,7 +2152,8 @@
			if (wrkMast.getIoType() != 11) {
			// 入库 ==>> 货物搬入库
			if (wrkMast.getWrkSts() == 7){
			if (!locMastService.isShuttle(wrkMast.getLocNo())) {
			// 判断是否需要小车入库
			if (locMastService.isOutMost(wrkMast.getLocNo(), true)) {
			// ==> 9.入库完成
			wrkMast.setWrkSts(9L);
			Date now = new Date();
			@@ -1756,49 +2164,33 @@
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			log.error("修改工作档状态 7.吊车入库中 => 9.入库完成失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 7.吊车入库中 => 9.入库完成失败！！，工作号={}", wrkMast.getWrkNo());
			}
			} else {
			// 判断是否需要小车入库
			if (locMastService.isOutMost(wrkMast.getLocNo(), true)) {
			// ==> 9.入库完成
			wrkMast.setWrkSts(9L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 给穿梭车下发命令
			Integer steNo = wrkMast.getSteNo();
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isIdle()) {
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findInByLoc(wrkMast.getLocNo())); // 任务模式: 搬入库
			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			log.error("修改工作档状态 7.吊车入库中 => 9.入库完成失败！！，工作号={}", wrkMast.getWrkNo());
			}
			} else {
			// 给穿梭车下发命令
			Integer steNo = wrkMast.getSteNo();
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isIdle()) {
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findInByLoc(wrkMast.getLocNo())); // 任务模式: 搬入库
			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			// 修改工作档状态 7.吊车入库中 => 8.小车搬入库
			wrkMast.setWrkSts(8L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			// 修改工作档状态 7.吊车入库中 => 8.小车搬入库
			wrkMast.setWrkSts(8L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			log.error("修改工作档状态 7.吊车入库中 => 8.小车搬入库失败！！，工作号={}", wrkMast.getWrkNo());
			}
			News.error("修改工作档状态 7.吊车入库中 => 8.小车搬入库失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			@@ -1817,7 +2209,7 @@
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkMast.getSteNo());
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			News.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 穿梭车去待机位
			BasSte basSte = basSteService.selectById(wrkMast.getSteNo());
			@@ -1829,10 +2221,10 @@
			// steCommand.setBay(steProtocol.getBay());
			// steCommand.setLev(steProtocol.getLev());
			if (!MessageQueue.offer(SlaveType.Ste, wrkMast.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车待机位命令下发失败，穿梭车号={}，任务数据={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
			News.error("穿梭车待机位命令下发失败，穿梭车号={}，任务数据={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
			}
			} else {
			log.error("修改工作档状态 4.迁入小车 => 6.小车待入失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 4.迁入小车 => 6.小车待入失败！！，工作号={}", wrkMast.getWrkNo());
			}
			// 入库 ===>> 迁出小车完成
			} else if (wrkMast.getWrkSts() == 5) {
			@@ -1848,7 +2240,7 @@
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkMast.getSteNo());
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			News.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 穿梭车去待机位
			BasSte basSte = basSteService.selectById(wrkMast.getSteNo());
			@@ -1860,10 +2252,10 @@
			// steCommand.setBay(steProtocol.getBay());
			// steCommand.setLev(steProtocol.getLev());
			if (!MessageQueue.offer(SlaveType.Ste, wrkMast.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车待机位命令下发失败，穿梭车号={}，任务数据={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
			News.error("穿梭车待机位命令下发失败，穿梭车号={}，任务数据={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
			}
			} else {
			log.error("修改工作档状态 5.迁出小车 => 6.小车待入失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 5.迁出小车 => 6.小车待入失败！！，工作号={}", wrkMast.getWrkNo());
			}
			// 出库 ===>> 迁入小车完成
			} else if (wrkMast.getWrkSts() == 13) {
			@@ -1874,7 +2266,7 @@
			if (steProtocol == null) { continue; }
			// 穿梭车重新定位排列层
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			News.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			@@ -1882,7 +2274,7 @@
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOutByLoc(wrkMast.getSourceLocNo())); // 任务模式: 搬出库
			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 13.迁入小车 ==> 14.小车搬出库
			wrkMast.setWrkSts(14L);
			@@ -1897,24 +2289,25 @@
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			log.error("修改工作档状态 13.迁入小车 ==> 14.小车搬出库失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 13.迁入小车 ==> 14.小车搬出库失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			// 移库 ===>> 堆垛机搬至目标库位组完成
			}
			// 库位移转
			} else {
			if (!locMastService.isShuttle(wrkMast.getLocNo())) {
			if (wrkMast.getWrkSts() == 16 && wrkMast.getIoType() == 11){
			// 更新工作档状态为 17.出库完成
			wrkMast.setWrkSts(17L);
			wrkMast.setCrnEndTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) != 0) {
			// 复位堆垛机
			crnThread.setResetFlag(true);
			} else {
			log.error("更新工作档的工作状态为 17.出库完成失败！！！ [工作号:{}]", wrkMast.getWrkNo());
			}
			} else if (wrkMast.getWrkSts() == 16) {
			// 16.吊车出库中 ==> 17.出库完成
			wrkMast.setWrkSts(17L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
			Integer outCrnNo = locMastService.getOutCrnNo(locMast);
			wrkMast.setCrnNo(outCrnNo);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			News.error("修改工作档状态 16.吊车出库中 ==> 17.出库完成失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			@@ -1948,7 +2341,7 @@
			// 21.准备充电 ===>> 22.小车待搬
			wrkCharge.setWrkSts(22L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 21.准备充电 ===>> 22.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改充电任务状态 21.准备充电 ===>> 22.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -1956,23 +2349,25 @@
			// 25.小车走行 ===>> 26.等待充电
			wrkCharge.setWrkSts(26L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 25.小车走行 ===>> 26.等待充电失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改充电任务状态 25.小车走行 ===>> 26.等待充电失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			} else if (wrkCharge.getWrkSts() == 29) {
			// 29.开始充电 ===>> 30.完成充电
			wrkCharge.setWrkSts(30L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 29.开始充电 ===>> 30.完成充电失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			} else if (wrkCharge.getWrkSts() == 32) {
			}
			// else if (wrkCharge.getWrkSts() == 29) {
			// // 29.开始充电 ===>> 30.完成充电
			// wrkCharge.setWrkSts(30L);
			// if (!wrkChargeService.updateById(wrkCharge)) {
			// News.error("修改充电任务状态 29.开始充电 ===>> 30.完成充电失败！！，工作号={}", wrkCharge.getWrkNo());
			// } else {
			// steThread.setResetFlag(true);
			// }
			// }
			else if (wrkCharge.getWrkSts() == 32) {
			// 32.小车走行 ===>> 33.小车待搬
			wrkCharge.setWrkSts(33L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改演示任务状态 32.小车走行 ===>> 33.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改演示任务状态 32.小车走行 ===>> 33.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -1980,7 +2375,7 @@
			// 36.小车走行 ===>> 37.演示完成
			wrkCharge.setWrkSts(37L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改演示任务状态 36.小车走行 ===>> 37.演示完成失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改演示任务状态 36.小车走行 ===>> 37.演示完成失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -1988,7 +2383,7 @@
			// 44.小车走行 ===>> 45.小车待搬
			wrkCharge.setWrkSts(45L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改演示任务状态 44.小车走行 ===>> 45.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改演示任务状态 44.小车走行 ===>> 45.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -2003,7 +2398,7 @@
			wrkMast.setWrkSts(3L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 2.设备上走 => 3.小车待搬失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 2.设备上走 => 3.小车待搬失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -2013,7 +2408,7 @@
			wrkMast.setWrkSts(9L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 8.小车搬入库 => 9.入库完成失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 8.小车搬入库 => 9.入库完成失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -2024,7 +2419,7 @@
			wrkMast.setWrkSts(12L);
			} else {
			if (Cools.isEmpty(wrkMast.getMk())) {
			log.error("移库工作档没有流程标记！！，工作号={}", wrkMast.getWrkNo());
			News.error("移库工作档没有流程标记！！，工作号={}", wrkMast.getWrkNo());
			} else {
			if (wrkMast.getMk().equals("I")) {
			String locNo = wrkMast.getLocNo();
			@@ -2045,7 +2440,7 @@
			}
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.小车待搬失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 11.生成出库ID => 12.小车待搬失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -2055,7 +2450,7 @@
			wrkMast.setWrkSts(15L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 14.小车搬出库 => 15.等待吊车失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("修改工作档状态 14.小车搬出库 => 15.等待吊车失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -2074,7 +2469,7 @@
			this.recCrnErr();
			this.recSteErr();
			} catch (Exception e) {
			log.error("recErr fail", e);
			News.error("recErr fail", e);
			}
			}

			@@ -2126,7 +2521,7 @@
			"任务中异常" // 备注
			);
			if (!basErrLogService.insert(basErrLog)) {
			log.error("堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
			News.error("堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
			}
			}
			} else {
			@@ -2136,7 +2531,7 @@
			latest.setUpdateTime(now);
			latest.setStatus(2);
			if (!basErrLogService.updateById(latest)) {
			log.error("堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
			News.error("堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
			}
			}
			}
			@@ -2173,7 +2568,7 @@
			"无任务异常" // 备注
			);
			if (!basErrLogService.insert(basErrLog)) {
			log.error("堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
			News.error("堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
			}
			}
			// 无异常
			@@ -2184,7 +2579,7 @@
			latest.setUpdateTime(now);
			latest.setStatus(2);
			if (!basErrLogService.updateById(latest)) {
			log.error("堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
			News.error("堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
			}
			}
			}
			@@ -2240,7 +2635,7 @@
			"任务中异常" // 备注
			);
			if (!basSteErrLogService.insert(basSteErrLog)) {
			log.error("穿梭车plc异常记录失败 ===>> [id:{}] [error:{}]", ste.getId(), errName);
			News.error("穿梭车plc异常记录失败 ===>> [id:{}] [error:{}]", ste.getId(), errName);
			}
			}
			} else {
			@@ -2250,7 +2645,7 @@
			latest.setUpdateTime(now);
			latest.setStatus(2);
			if (!basSteErrLogService.updateById(latest)) {
			log.error("穿梭车plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", ste.getId(), latest.getId());
			News.error("穿梭车plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", ste.getId(), latest.getId());
			}
			}
			}
			@@ -2287,7 +2682,7 @@
			"无任务异常" // 备注
			);
			if (!basSteErrLogService.insert(basSteErrLog)) {
			log.error("穿梭车plc异常记录失败 ===>> [id:{}] [error:{}]", ste.getId(), errName);
			News.error("穿梭车plc异常记录失败 ===>> [id:{}] [error:{}]", ste.getId(), errName);
			}
			}
			// 无异常
			@@ -2298,7 +2693,7 @@
			latest.setUpdateTime(now);
			latest.setStatus(2);
			if (!basSteErrLogService.updateById(latest)) {
			log.error("穿梭车plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", ste.getId(), latest.getId());
			News.error("穿梭车plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", ste.getId(), latest.getId());
			}
			}
			}
			@@ -2312,7 +2707,6 @@
			/**
			* 空栈板初始化入库,叉车入库站放货
			*/
			@Async
			public void storeEmptyPlt(){
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历空板入库口
			@@ -2339,7 +2733,7 @@
			if (barcodeThread != null) {
			String barcode0 = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode0)) {
			// log.info("{}号条码扫描器检测条码信息：{}", emptyInSta.getBarcode(), barcode0);
			// News.info("{}号条码扫描器检测条码信息：{}", emptyInSta.getBarcode(), barcode0);
			if(!"NG".endsWith(barcode0) && !"NoRead".equals(barcode0) && !"empty".equals(barcode0)) {
			barcode = barcode0;
			}
			@@ -2357,7 +2751,7 @@
			param.setBarcode(barcode);
			}
			param.setSourceStaNo(emptyInSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			// param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			@@ -2384,7 +2778,7 @@
			MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, errorMsg));
			}
			}
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}
			} catch (Exception e) {
			e.printStackTrace();
			@@ -2401,7 +2795,6 @@
			/**
			* 出库 ===>> 工作档信息写入led显示器
			*/
			@Async
			public void ledExecute() {
			for (LedSlave led : slaveProperties.getLed()) {
			// 获取输送线plc线程
			@@ -2445,21 +2838,15 @@
			ledCommand.setEmptyMk(true);
			break;
			default:
			log.error("任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
			News.error("任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
			break;
			}
			ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
			ledCommand.setLocNo(wrkMast.getLocNo());
			ledCommand.setStaNo(wrkMast.getStaNo());
			if (wrkMast.getIoType() != 110) {
			if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
			List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
			wrkDetls.forEach(wrkDetl -> {
			if (wrkMast.getIoType() == 101) {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
			}
			if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() \|\| 0 == wrkDetl.getInspect())) {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
			}
			});
			wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getSpecs())));
			}
			commands.add(ledCommand);
			}
			@@ -2472,9 +2859,20 @@
			}
			// 命令下发 -------------------------------------------------------------------------------
			if (!commands.isEmpty()) {
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
			log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			continue;
			if (led.getId()>3){
			if (!MessageQueue.offer(SlaveType.Led, led.getId()-3, new Task(1, commands))) {
			log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId()-3, led.getIp(), led.getPort());
			continue;
			}else {
			ledThread.setLedMk(false);
			}
			}else {
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
			log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			continue;
			}else {
			ledThread.setLedMk(false);
			}
			}
			}

			@@ -2502,8 +2900,36 @@
			/**
			* 其他 ===>> LED显示器复位，显示默认信息
			*/
			@Async
			public void ledReset() {
			for (LedSlave led : slaveProperties.getLed()) {

			// 获取输送线plc线程
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
			// 命令集合
			boolean reset = true;
			for (Integer staNo : led.getStaArr()) {
			// 获取叉车站点
			StaProtocol staProtocol = devpThread.getStation().get(staNo);
			if (staProtocol == null) {
			continue;
			}
			if (staProtocol.getWorkNo() != 0 && staProtocol.isLoading()) {
			reset = false;
			break;
			}
			}
			// 获取led线程
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
			// led显示默认内容
			if (reset && !ledThread.isLedMk()) {
			ledThread.setLedMk(true);
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) {
			News.error(" - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			} else {

			}
			}
			}
			for (LedSlave led : slaveProperties.getLed()) {
			// 获取输送线plc线程
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
			@@ -2519,11 +2945,12 @@
			}
			}
			// 获取led线程
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
			// led显示默认内容
			if (reset) {
			if (reset && !ledThread.isLedMk()) {
			ledThread.setLedMk(true);
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
			log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			News.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			}
			}
			}
			@@ -2534,6 +2961,9 @@
			*/
			@SuppressWarnings("serial")
			public synchronized void loopSteCharge() {
			if (!Cools.isEmpty(wrkMastMapper.selectAllC())){
			return;
			}
			if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
			return;
			}
			@@ -2569,7 +2999,7 @@
			SteChargeType steCharge = null;
			do {
			String locNo;
			if (!devpThread.charge0) {
			if (devpThread.charge0) {
			SteChargeType first = SteChargeType.FIRST;
			locNo = first.locNo;
			if (basSteService.hasCarOfLocNo(locNo) == null
			@@ -2578,29 +3008,29 @@
			break;
			}
			}
			if (!devpThread.charge1) {
			SteChargeType second = SteChargeType.SECOND;
			locNo = second.locNo;
			if (basSteService.hasCarOfLocNo(locNo) == null
			&& wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
			steCharge = second;
			break;
			}
			}
			if (!devpThread.charge2) {
			SteChargeType third = SteChargeType.THIRD;
			locNo = third.locNo;
			if (basSteService.hasCarOfLocNo(locNo) == null
			&& wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
			steCharge = third;
			break;
			}
			}
			// if (!devpThread.charge1) {
			// SteChargeType second = SteChargeType.SECOND;
			// locNo = second.locNo;
			// if (basSteService.hasCarOfLocNo(locNo) == null
			// && wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
			// steCharge = second;
			// break;
			// }
			// }
			// if (!devpThread.charge2) {
			// SteChargeType third = SteChargeType.THIRD;
			// locNo = third.locNo;
			// if (basSteService.hasCarOfLocNo(locNo) == null
			// && wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
			// steCharge = third;
			// break;
			// }
			// }
			break;
			} while (false);

			if (steCharge == null) {
			log.warn("{}号小车【电量：{}】充电失败，原因：没有空闲充电桩。", ste.getId(), steProtocol.getCharge());
			// News.warn("{}号小车【电量：{}】充电失败，原因：没有空闲充电桩。", ste.getId(), steProtocol.getCharge());
			continue;
			}
			String chargeLocNo = steCharge.locNo;
			@@ -2609,59 +3039,25 @@
			wrkCharge.setCharge(steCharge.ssbm);
			wrkCharge.setWrkNo(commonService.getChargeWorkNo(4));
			wrkCharge.setWrkSts(21L); // 21.准备充电
			wrkCharge.setCrnNo(2); // 固定2号堆垛机
			wrkCharge.setCrnNo(1); // 固定1号堆垛机
			wrkCharge.setIoPri((double) 10);
			wrkCharge.setLocNo(chargeLocNo);
			wrkCharge.setMemo("charge");
			wrkCharge.setAppeTime(new Date());
			if (!wrkChargeService.insert(wrkCharge)) {
			log.error("保存{}号穿梭车充电任务失败!!!", ste.getId());
			News.error("保存{}号穿梭车充电任务失败!!!", ste.getId());
			continue;
			}

			// 小车处于通道
			List<String> channel = slaveProperties.getChannel();
			for (String channelLocNo : channel) {
			if (steProtocol.getRow().intValue() == Utils.getRow(channelLocNo)
			&& steProtocol.getBay().intValue() == Utils.getBay(channelLocNo)
			&& steProtocol.getLev().intValue() == Utils.getLev(channelLocNo)) {
			Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
			if (null != otherSte) {
			log.warn("{}号小车充电阻断，原因：通道存在{}号穿梭车！", wrkCharge.getSteNo(), otherSte);
			} else {
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.GO_ORIGIN); // 去右端

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 21.准备充电 ===> 25.小车走行
			wrkCharge.setWrkSts(25L);
			Date now = new Date();
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 21.准备充电 ===> 25.小车走行失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			}
			}

			// 处于充电库位组
			if (steProtocol.getRow().intValue() == Utils.getRow(chargeLocNo)
			if ( 0<steProtocol.getRow().intValue() && steProtocol.getRow().intValue()<=4
			&& steProtocol.getBay().intValue() == Utils.getBay(chargeLocNo)
			&& steProtocol.getLev().intValue() == Utils.getLev(chargeLocNo)) {
			// 修改工作档状态 21.准备充电 => 28.充电就绪
			wrkCharge.setWrkSts(28L);
			// 修改工作档状态 21.准备充电 => 24.小车到达
			wrkCharge.setWrkSts(24L);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 21.准备充电 => 28.充电就绪失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改充电任务状态 21.准备充电 => 24.小车到达失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			} else {
			this.letCarBeWaiting(wrkCharge, ste.getId());
			@@ -2671,7 +3067,7 @@
			}
			} catch (Exception e) {
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			log.error("loopSteCharge fail", e);
			News.error("loopSteCharge fail", e);
			}
			}
			}
			@@ -2681,10 +3077,26 @@
			*/
			public synchronized void executeSteCharge() {
			WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.charge);
			if (null == wrkCharge) { return; }
			Integer steNo = wrkCharge.getSteNo();
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, 1);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (null == wrkCharge) {
			try{
			if (steProtocol.getChargeStatus()==(short)0 && steProtocol.isBrushConnect()){
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(1); // 穿梭车编号
			steCommand.setTaskNo(10060); // 工作号
			steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 任务模式: 断开充电
			if (!MessageQueue.offer(SlaveType.Ste, 1, new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			}
			}
			}catch (Exception e){
			return;
			}
			return;
			}
			Integer steNo = wrkCharge.getSteNo();

			BasSte basSte = basSteService.selectById(steNo);
			if (Cools.isEmpty(steProtocol, basSte)) { return; }
			if (steProtocol.getMode() == 0
			@@ -2698,9 +3110,35 @@
			if (!steProtocol.isEnable()) {
			return;
			}
			if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
			if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())+40) {
			MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 999));//中断充电标记
			wrkCharge.setWrkSts(30L);
			wrkChargeMapper.updateById(wrkCharge);
			if (!wrkChargeService.updateById(wrkCharge)) {
			News.error("修改充电任务状态 29.开始充电 ===>> 30.完成充电失败！！，工作号={}", wrkCharge.getWrkNo());
			}else {
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 任务模式: 断开充电
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			}
			}
			return;
			}else if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine()) && steProtocol.getChargeStatus()==(short)0 && steProtocol.isBrushConnect()) {
			MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 999));//中断充电标记
			wrkCharge.setWrkSts(30L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			News.error("修改充电任务状态 29.开始充电 ===>> 30.完成充电失败！！，工作号={}", wrkCharge.getWrkNo());
			}else {
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 任务模式: 断开充电
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			}
			}
			return;
			}
			try {
			@@ -2712,49 +3150,44 @@
			// 22.小车待搬
			if (wrkCharge.getWrkSts() == 22) {

			// 入出库任务优先
			if (null != wrkMastMapper.selectWorkingByCrn(wrkCharge.getCrnNo())) {
			return;
			}

			LocMast locMast = locMastService.selectById(basSte.getIdleLoc());

			// 搬小车至小车走向通道
			List<String> channel = slaveProperties.getChannel();
			for (String channelLocNo : channel) {
			Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
			if (null != otherSte) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", wrkCharge.getSteNo(), channelLocNo, otherSte);
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkCharge.getCrnNo());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { return; }
			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
			// 堆垛机命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(wrkCharge.getCrnNo()); // 堆垛机编号
			crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo(), true).shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			LocMast channelLoc = locMastService.selectById(channelLocNo);

			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkCharge.getCrnNo());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { continue; }
			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
			// 堆垛机命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(wrkCharge.getCrnNo()); // 堆垛机编号
			crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(channelLoc.getLocNo(), true).shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(channelLoc.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(channelLoc.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(channelLoc.getLocNo(), true), channelLoc.getBay1(), channelLoc.getLev1());
			// 修改工作档状态 22.小车待搬 => 23.吊车搬运
			Date now = new Date();
			wrkCharge.setWrkSts(23L);
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态 22.小车待搬 => 23.吊车搬运失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			break;
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo(), true), locMast.getBay1(), locMast.getLev1());
			// 修改工作档状态 22.小车待搬 => 23.吊车搬运
			Date now = new Date();
			wrkCharge.setWrkSts(23L);
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			News.error("修改工作档状态 22.小车待搬 => 23.吊车搬运失败！！，工作号={}", wrkCharge.getWrkNo());
			}

			}
			}

			@@ -2766,13 +3199,13 @@
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.GO_ORIGIN); // 去右端
			steCommand.setTaskMode(SteTaskModeType.BACK_ORIGIN); // 去右端

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 24.小车到达 ===> 25.小车走行
			wrkCharge.setWrkSts(25L);
			@@ -2780,72 +3213,57 @@
			wrkCharge.setCrnEndTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 24.小车到达 ===> 25.小车走行失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改充电任务状态 24.小车到达 ===> 25.小车走行失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			} else if (wrkCharge.getWrkSts() == 26) {
			// 固定堆垛机
			int crnNo = 1;
			// 充电位
			LocMast chargeLoc = locMastService.selectById(wrkCharge.getLocNo());

			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo);
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { return; }
			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
			// 堆垛机命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(crnNo); // 堆垛机编号
			crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(chargeLoc.getRow1().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(chargeLoc.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(chargeLoc.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", crnNo, JSON.toJSON(crnCommand));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(chargeLoc.getRow1(), chargeLoc.getBay1(), chargeLoc.getLev1());
			// 修改工作档状态 26.等待充电 => 27.放至充电位
			Date now = new Date();
			wrkCharge.setWrkSts(27L);
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态 26.等待充电 => 27.放至充电位失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			} else if (wrkCharge.getWrkSts() == 28L) {
			//26.等待充电 ===>
			// 穿梭车下发充电任务
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.CHARGE_LEFT); // 任务模式: 充电
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			} else {
			// 28.充电就绪 ===>> 29.开始充电
			wrkCharge.setWrkSts(29L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 28.充电就绪 ===>> 29.开始充电失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改充电任务状态 28.充电就绪 ===>> 29.开始充电失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			} else if (wrkCharge.getWrkSts() == 29) {
			Float idle2 = steProtocol.isIdle2();
			String chargeLine = SpringUtils.getBean(BasSteService.class).selectById(1).getChargeLine();
			if (idle2<(Float.parseFloat(chargeLine)+2)){
			MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 666));//充电标记
			}else if (idle2 >= 100f){
			MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 999));//中断充电标记
			// 29.开始充电 ===>> 30.完成充电
			wrkCharge.setWrkSts(30L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			News.error("修改充电任务状态 29.开始充电 ===>> 30.完成充电失败！！，工作号={}", wrkCharge.getWrkNo());
			}else {
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 任务模式: 断开充电
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			}
			}
			}
			}
			} catch (Exception e) {
			log.error("executeSteCharge fail", e);
			News.error("executeSteCharge fail", e);
			}
			}

			/**
			* 轮询充电桩是否有空闲小车
			*/
			@Deprecated
			public synchronized void queryChargeLocOfComplete() {
			// 与充电任务不同步进行
			if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) { return; }
			@@ -2910,7 +3328,7 @@
			wrkCharge.setMemo("reset");
			wrkCharge.setAppeTime(new Date());
			if (!wrkChargeService.insert(wrkCharge)) {
			log.error("保存{}号穿梭车复位任务失败!!!", steNo);
			News.error("保存{}号穿梭车复位任务失败!!!", steNo);
			} else {
			break;
			}
			@@ -2922,6 +3340,7 @@
			/**
			* 小车从充电桩至待机库位
			*/
			@Deprecated
			public synchronized void steFromChargeToIdleLoc() {
			WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset);
			if (wrkCharge == null) { return; }
			@@ -2938,10 +3357,14 @@
			for (String channelLocNo : channel) {
			Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
			if (null != otherSte) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", wrkCharge.getSteNo(), channelLocNo, otherSte);
			News.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", wrkCharge.getSteNo(), channelLocNo, otherSte);
			} else {
			// 固定堆垛机
			int crnNo = 1;
			if (null != wrkMastMapper.selectWorkingByCrn(crnNo)) {
			return;
			}

			LocMast channelLoc = locMastService.selectById(channelLocNo);

			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo);
			@@ -2962,7 +3385,7 @@
			crnCommand.setDestinationPosY(channelLoc.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(channelLoc.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(channelLoc.getLocNo(), false), channelLoc.getBay1(), channelLoc.getLev1());
			@@ -2972,7 +3395,7 @@
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改复位任务状态 41.小车准备复位 => 42.吊车搬运失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改复位任务状态 41.小车准备复位 => 42.吊车搬运失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			break;
			@@ -2993,7 +3416,7 @@
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 43.小车到达 ===> 44.小车走行
			wrkCharge.setWrkSts(44L);
			@@ -3001,16 +3424,20 @@
			wrkCharge.setCrnEndTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改复位任务状态 43.小车到达 ===> 44.小车走行失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改复位任务状态 43.小车到达 ===> 44.小车走行失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			} else if (wrkCharge.getWrkSts() == 45L) {
			if (null != wrkMastMapper.selectWorkingByCrn(wrkCharge.getCrnNo())) {
			return;
			}

			LocMast idleLoc = locMastService.selectById(basSte.getIdleLoc());

			Integer otherSte = existOtherSte(idleLoc.getLocNo(), wrkCharge.getSteNo());
			if (null != otherSte) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", wrkCharge.getSteNo(), idleLoc.getLocNo(), otherSte);
			News.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", wrkCharge.getSteNo(), idleLoc.getLocNo(), otherSte);
			} else {
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkCharge.getCrnNo());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			@@ -3030,7 +3457,7 @@
			crnCommand.setDestinationPosY(idleLoc.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(idleLoc.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(idleLoc.getLocNo(), true), idleLoc.getBay1(), idleLoc.getLev1());
			@@ -3040,7 +3467,7 @@
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态 45.小车待搬 => 46.放至待机位失败！！，工作号={}", wrkCharge.getWrkNo());
			News.error("修改工作档状态 45.小车待搬 => 46.放至待机位失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			@@ -3097,7 +3524,7 @@
			}
			}
			if (null == loc) {
			log.error("双深库位 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			News.error("双深库位 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("双深库位 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			}

			@@ -3123,7 +3550,7 @@
			wrkMast.setModiTime(new Date());
			int res = wrkMastMapper.insert(wrkMast);
			if (res == 0) {
			log.error("双深库位 --- 保存工作档失败！待移转浅库位：" + shallowLoc.getLocNo());
			News.error("双深库位 --- 保存工作档失败！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("保存工作档失败");
			}
			// 工作档明细保存
			@@ -3138,7 +3565,7 @@
			wrkDetl.setAppeTime(new Date());
			wrkDetl.setModiTime(new Date());
			if (!wrkDetlService.insert(wrkDetl)) {
			log.error("双深库位 --- 保存工作档明细失败！待移转浅库位：" + shallowLoc.getLocNo());
			News.error("双深库位 --- 保存工作档明细失败！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("保存工作档明细失败");
			}
			}
			@@ -3148,11 +3575,11 @@
			shallowLoc.setLocSts("R"); // R.出库预约
			shallowLoc.setModiTime(new Date());
			if (!locMastService.updateById(shallowLoc)) {
			log.error("双深库位 --- 更新源库位状态失败！待移转浅库位：" + shallowLoc.getLocNo());
			News.error("双深库位 --- 更新源库位状态失败！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("更新源库位状态失败");
			}
			} else {
			log.error("双深库位 --- 源库位出库失败！待移转浅库位：" + shallowLoc.getLocNo());
			News.error("双深库位 --- 源库位出库失败！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("源库位出库失败");
			}
			// 修改目标库位状态
			@@ -3160,19 +3587,254 @@
			loc.setLocSts("S"); // S.入库预约
			loc.setModiTime(new Date());
			if (!locMastService.updateById(loc)) {
			log.error("双深库位 --- 更新目标库位状态失败！待移转浅库位：" + shallowLoc.getLocNo());
			News.error("双深库位 --- 更新目标库位状态失败！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("更新目标库位状态失败");
			}
			} else {
			log.error("双深库位 --- 移转失败！待移转浅库位：" + shallowLoc.getLocNo());
			News.error("双深库位 --- 移转失败！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("移转失败");
			}
			} catch (Exception e) {
			log.error("双深库位阻塞，对浅库位进行移转失败", e);
			News.error("双深库位阻塞，对浅库位进行移转失败", e);
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}

			public List<String> crn2DemoLocs = new ArrayList<String>(); public String crn2LastLoc = "";
			public synchronized void demo() {
			if (Cools.isEmpty(crn2DemoLocs)) {
			crn2DemoLocs = locMastService.getDemoNextLoc(2);
			}
			for (CrnSlave crn : slaveProperties.getCrn()) {
			if (!crn.getDemo()) {
			continue;
			}
			// 必须为演示状态
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) {
			continue;
			}

			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {

			// filter
			if (wrkChargeService.selectCount(new EntityWrapper<WrkCharge>()
			.eq("crn_no", crn.getId()).between("wrk_sts", 31, 36)) > 0) {
			continue;
			}

			SteThread steThread = queryIdleCar(crnProtocol);
			if (Cools.isEmpty(steThread)) {
			News.warn("没有空闲的小车进行演示功能");
			continue;
			}
			int steNo = steThread.getSlave().getId();
			SteProtocol steProtocol = steThread.getSteProtocol();
			BasSte basSte = basSteService.selectById(steNo);
			if (Cools.isEmpty(steProtocol, basSte)) { continue; }

			// 只有当穿梭车空闲并且无任务时才继续执行
			if (steProtocol.isIdle()) {

			String locNo = null;
			Iterator<String> iterator = crn2DemoLocs.iterator();
			while (iterator.hasNext()) {
			String next = iterator.next();
			if (!Cools.isEmpty(this.hasCar(next))) { continue; }
			String lastLoc = crn2LastLoc;
			if (!Cools.isEmpty(lastLoc)) {
			if (!lastLoc.substring(2, 7).equals(next.substring(2, 7))
			\|\| !Utils.getGroupRow(lastLoc, true).equals(Utils.getGroupRow(next, true))) {
			locNo = next;
			iterator.remove();
			break;
			} else {
			iterator.remove();
			}
			} else {
			locNo = next;
			iterator.remove();
			break;
			}

			}
			if (!Cools.isEmpty(locNo)) {
			crn2LastLoc = locNo;
			}

			News.info("{}号堆垛机对{}库位进行演示", crn.getId(), locNo);

			String sourceLocNo = Utils.getLocNo(steProtocol.getRow(), steProtocol.getBay(), steProtocol.getLev());

			WrkCharge wrkCharge = new WrkCharge();
			wrkCharge.setCrnNo(crn.getId());
			wrkCharge.setSteNo(steNo);
			wrkCharge.setWrkNo(commonService.getChargeWorkNo(5));
			wrkCharge.setWrkSts(31L); // 31.生成演示ID
			wrkCharge.setIoPri((double) 10);
			wrkCharge.setSourceLocNo(sourceLocNo);
			wrkCharge.setLocNo(locNo);
			wrkCharge.setMemo("demo");
			if (!wrkChargeService.insert(wrkCharge)) {
			News.error("生成演示任务失败，堆垛机号：{}，小车：{}，源库位：{}，目标库位：{}", crn.getId(), steNo, sourceLocNo, locNo);
			}
			}
			}
			}
			}

			/**
			* 演示取货
			*/
			private void steMoveDemo(CrnSlave slave, CrnProtocol crnProtocol) {
			// 获取工作档信息
			WrkCharge wrkCharge = wrkChargeService.selectOne(new EntityWrapper<WrkCharge>().eq("crn_no", slave.getId())
			.in("wrk_sts", 31, 33, 35));
			if (null == wrkCharge) {
			return;
			}
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (null == steProtocol) { return; }
			if (steProtocol.isIdle()) {
			// 31.生成演示ID
			if (wrkCharge.getWrkSts() == 31L) {
			this.letCarBeReady(wrkCharge, steProtocol.getSteNo().intValue());
			wrkCharge.setWrkSts(32L);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			News.error("修改演示任务{}工作档 31.生成演示ID ==>> 32.小车走行失败!", wrkCharge.getWrkNo());
			}
			// 33.小车待搬
			} else if (wrkCharge.getWrkSts() == 33L) {
			LocMast locMast = locMastService.selectById(wrkCharge.getLocNo());
			// 堆垛机命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
			crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo(), true).shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo(), true), locMast.getBay1(), locMast.getLev1());
			// 修改工作档状态 33.小车待搬 => 34.吊车搬运
			Date now = new Date();
			wrkCharge.setWrkSts(34L);
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			News.error("修改演示任务{}工作档 33.小车待搬 => 34.吊车搬运失败!", wrkCharge.getWrkNo());
			}
			}
			// 35.小车就绪
			} else if (wrkCharge.getWrkSts() == 35L) {

			int steNo = steProtocol.getSteNo().intValue();
			if (!basSteService.updatePakMk(steNo, "Y")) {
			News.error("修改穿梭车作业状态失败！！，穿梭车={}", steNo);
			return;
			}

			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			SteTaskModeType originByLoc = SteTaskModeType.findOriginByLoc(steProtocol.getRow().intValue());
			if (originByLoc.equals(SteTaskModeType.GO_ORIGIN)) {
			originByLoc = SteTaskModeType.BACK_ORIGIN;
			} else if (originByLoc.equals(SteTaskModeType.BACK_ORIGIN)) {
			originByLoc = SteTaskModeType.GO_ORIGIN;
			} else {
			return;
			}
			steCommand.setTaskMode(originByLoc);

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 35.小车就绪 => 36.小车走行
			wrkCharge.setWrkSts(36L);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			News.error("修改演示任务{}工作档 35.小车就绪 => 36.小车走行失败!", wrkCharge.getWrkNo());
			}
			}
			}
			}

			}
			/**
			* 出入库模式切换
			*/
			public synchronized void outAndIn() {
			try {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			for (DevpSlave.Sta inSta : devp.getInSta()) {
			Thread.sleep(500);
			boolean a=true,b=true;
			List<WrkMast> wrkMasts = wrkMastMapper.selectAll(inSta.getStaNo());
			if (Cools.isEmpty(wrkMasts)){
			b=false;
			}else {
			for (WrkMast wrkMast:wrkMasts){
			if (wrkMast.getSourceStaNo() > wrkMast.getStaNo()){
			a=false;
			break;
			}
			}
			}
			switch (inSta.getStaNo()) {
			case 102://1F
			if (a && b){
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 11));
			}else if (b){
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 12));
			}else {
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 10));
			}
			break;
			case 202://2F
			if (a && b){
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 21));
			}else if (b){
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 22));
			}else {
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 20));
			}
			break;
			case 302://3F
			if (a && b){
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 31));
			}else if (b){
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 32));
			}else {
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 30));
			}
			break;
			}
			}
			}

			} catch (Exception e) {
			e.printStackTrace();
			}
			}


			}