zy-wcs.git - Gitblit

			@@ -15,6 +15,7 @@
			import com.zy.common.model.MatDto;
			import com.zy.common.model.SearchLocParam;
			import com.zy.common.model.StartupDto;
			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;
			@@ -38,12 +39,14 @@
			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.*;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Set;
			import java.util.stream.Collectors;

			/**
			@@ -94,7 +97,6 @@
			* 组托
			* 入库站，根据条码扫描生成入库工作档，工作状态 2
			*/
			@Async
			public void generateStoreWrkFile() {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			@@ -115,6 +117,54 @@
			&& !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) {
			log.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;
			}

			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
			if (barcodeThread == null) {
			@@ -124,7 +174,7 @@
			if(!Cools.isEmpty(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "empty".equals(barcode)) {
			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));
			@@ -138,7 +188,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));
			@@ -153,16 +203,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) {
			// log.error("工作档中已存在该站状态为（ 2.设备上走）的数据,工作号={}", wrkMast.getWrkNo());
			// continue;
			// }

			try {
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			@@ -170,7 +220,7 @@
			param.setBarcode(barcode);
			param.setIoType(1);
			param.setSourceStaNo(inSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			// param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			@@ -201,7 +251,7 @@
			}
			log.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));
			@@ -225,7 +275,7 @@
			* wms入库
			* 入库站，根据条码扫描生成入库工作档，工作状态 1 ==>> 2
			*/
			@Async
			@Deprecated
			public void generateStoreWrkFile0() {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			@@ -245,6 +295,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) {
			log.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; }
			@@ -272,63 +371,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()) {
			@@ -345,65 +390,63 @@
			&& 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)) {
			// log.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) {
			// log.error("{}条码错误，暂无拣料任务！", barcode);
			// }
			// }
			if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
			\|\| Cools.isEmpty(wrkMast.getStaNo()) \|\| Cools.isEmpty(wrkMast.getSourceStaNo()) ) {
			continue;
			@@ -416,7 +459,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")
			@@ -467,27 +510,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());
			@@ -507,7 +529,7 @@
			}
			log.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));
			@@ -523,7 +545,6 @@
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			// continue;
			}

			}
			@@ -535,7 +556,6 @@
			/**
			* 堆垛机站出库到出库站
			*/
			@Async
			public void crnStnToOutStn() {
			for (CrnSlave crnSlave : slaveProperties.getCrn()) {
			// 遍历堆垛机出库站
			@@ -641,9 +661,7 @@
			}
			}
			// 库位移转
			this.locToLoc(crn, crnProtocol);
			// 演示任务
			this.steMoveDemo(crn, crnProtocol);
			// this.locToLoc(crn, crnProtocol);
			}
			}
			}
			@@ -674,6 +692,15 @@
			// log.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")) {
			@@ -720,42 +747,37 @@
			String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo());
			LocMast shallowLoc = locMastService.selectById(shallowLocNo);
			// O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用直接搬！
			switch (shallowLoc.getLocSts()) {
			case "P":
			case "R": {
			WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
			if (null == waitWrkMast) {
			log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
			} else {
			if (waitWrkMast.getWrkSts() < 17) {
			waitWrkMast.setIoPri(20D);
			waitWrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(waitWrkMast) == 0) {
			log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			}
			//20220719 Add，如果浅库位状态为P/R，工作状态为14/15,说明浅库位已经空了，可以执行入库任务
			continue;
			if (shallowLoc.getLocSts().equals("P") \|\| shallowLoc.getLocSts().equals("R")) {
			WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
			if (null == waitWrkMast) {
			log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
			} 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,说明浅库位已经空了，可以执行入库任务
			}
			break;
			}
			case "F":
			case "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("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;
			case "Q": {
			WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
			if (null != waitWrkMast && waitWrkMast.getWrkSts() == 9) {
			continue;
			}
			break;
			}
			}
			}
			@@ -782,8 +804,9 @@
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 {} => 7.吊车入库中失败！！，工作号={}", wrkMast.getWrkSts$(), wrkMast.getWrkNo());
			} else {
			return true;
			}
			return true;
			}
			}
			} else {
			@@ -798,11 +821,13 @@
			// 没有其他任务
			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 {
			@@ -839,24 +864,27 @@
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 {} => 7.吊车入库中失败！！，工作号={}", wrkMast.getWrkSts$(), wrkMast.getWrkNo());
			} else {
			return true;
			}
			return true;
			}
			}

			}

			// 目标库位 ===>> 非最外层库位
			// 目标库位 ===>> 非最外层库位
			} 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;
			}
			}
			// 堆垛机将货放至小车上 3.小车待搬（小车不用搬运，已经在当前组库位） / 6.小车待入 ===>> 7.吊车入库中
			@@ -893,12 +921,13 @@
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 3.小车待搬/6.小车待入 => 7.吊车入库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			return true;
			}
			}
			}
			// 没有小车
			// 没有小车
			} else {
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			// 寻找当前堆垛机对应的小车
			@@ -908,12 +937,14 @@
			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;
			}
			}
			}
			@@ -926,7 +957,7 @@
			/**
			* 出库 ===>> 库位到堆垛机站
			*/
			public boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			// 获取工作状态为11（生成出库ID）的出库工作档
			WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
			@@ -944,6 +975,24 @@
			log.error("出库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), sourceSta.getLocSts());
			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));
			continue;
			}
			}

			// 获取堆垛机出库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
			@@ -975,11 +1024,11 @@
			}

			// 置顶任务
			wrkMast.setIoPri((double) 9999);
			wrkMast.setIoPri((double) 9998);
			wrkMastMapper.updateById(wrkMast);

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

			// 双深库位且浅库位有货，则需先对浅库位进行库位移转
			if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
			@@ -992,7 +1041,7 @@
			log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
			} else {
			if(waitWrkMast.getWrkSts() == 11) {
			waitWrkMast.setIoPri(20D);
			waitWrkMast.setIoPri(wrkMast.getIoPri() + 1);
			waitWrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(waitWrkMast) == 0) {
			log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			@@ -1040,8 +1089,9 @@
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			break;
			}

			} else {
			@@ -1075,10 +1125,11 @@
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			return true;
			}
			// 不是最外层库位，需要使用穿梭车搬运后，再堆垛机出库
			// 不是最外层库位，需要使用穿梭车搬运后，再堆垛机出库
			} else {
			// 当前组库位是否有穿梭车
			Integer steNo = this.hasCarOfIdle(wrkMast.getSourceLocNo());
			@@ -1098,7 +1149,7 @@
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOutByLoc(wrkMast.getSourceLocNo())); // 任务模式: 去近点等待堆垛机叉取

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

			@@ -1111,8 +1162,13 @@
			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;
			}
			}
			}
			@@ -1129,7 +1185,7 @@
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(sourceSta.getRow1()).shortValue()); // 源库位排
			crnCommand.setSourcePosX(Utils.getGroupRow(sourceSta.getRow1(), false).shortValue()); // 源库位排
			crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			@@ -1145,12 +1201,13 @@
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 15.等待吊车 => 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			return true;
			}
			return true;
			}
			}

			// 没有小车
			// 没有小车
			} else {
			if (wrkMast.getWrkSts() == 11L && wrkMast.getSteNo() == null) {
			// 寻找最近的小车
			@@ -1160,12 +1217,14 @@
			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;
			}
			}
			}
			@@ -1179,6 +1238,7 @@
			/**
			* 库位移转
			*/
			@Deprecated
			public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			// 获取工作档信息
			WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
			@@ -1256,12 +1316,46 @@
			// 获取堆垛机信息
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (Utils.getGroupRow(locNo).equals(Utils.getGroupRow(steProtocol.getRow().intValue())) && steProtocol.getBay() == Utils.getBay(locNo) && steProtocol.getLev() == Utils.getLev(locNo)) {
			return steProtocol.getSteNo().intValue();
			BasSte basSte = basSteService.selectById(ste.getId());
			if (Cools.isEmpty(steProtocol, basSte)) { continue; }
			if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(basSte.getRow(), true))
			&& basSte.getBay() == Utils.getBay(locNo)
			&& basSte.getLev() == Utils.getLev(locNo)) {
			return ste.getId();
			}
			}
			return null;
			}

			/**
			* 当前库位组是否存在其他小车
			*/
			public Integer existOtherSte(String locNo, Integer steNo) {
			Integer otherSteNo = null;
			for (SteSlave ste : slaveProperties.getSte()) {
			if (ste.getId().equals(steNo)) { continue; }
			// 获取堆垛机信息
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isEnable()) {
			BasSte basSte = basSteService.selectById(ste.getId());
			if (basSte != null) {
			if ((Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(basSte.getRow(), true))
			&& basSte.getBay() == Utils.getBay(locNo)
			&& basSte.getLev() == Utils.getLev(locNo))
			\|\|
			(Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
			&& steProtocol.getBay() == Utils.getBay(locNo)
			&& steProtocol.getLev() == Utils.getLev(locNo))
			) {
			otherSteNo = ste.getId();
			break;
			}
			}
			}
			}
			return otherSteNo;
			}

			/**
			@@ -1274,7 +1368,9 @@
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isIdle()) {
			if (Utils.getGroupRow(locNo).equals(Utils.getGroupRow(steProtocol.getRow().intValue())) && steProtocol.getBay() == Utils.getBay(locNo) && steProtocol.getLev() == Utils.getLev(locNo)) {
			if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
			&& steProtocol.getBay() == Utils.getBay(locNo)
			&& steProtocol.getLev() == Utils.getLev(locNo)) {
			return steProtocol.getSteNo().intValue();
			}
			}
			@@ -1286,22 +1382,43 @@
			* 查找当前库位最适合的穿梭车来作业
			*/
			public SteThread queryIdleCar(WrkMast wrkMast) {
			Integer crnNo = wrkMast.getCrnNo();
			BasSte basSte = basSteService.findByCrnNo(crnNo);
			// 获取穿梭车信息
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, basSte.getSteNo());
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol != null) {
			if (steProtocol.isIdle()) {
			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; }
			String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
			// 如果在同一个库位组
			if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
			&& steProtocol.getBay().intValue() == Utils.getBay(locNo)
			&& steProtocol.getLev().intValue() == Utils.getLev(locNo)) {
			return steThread;
			}
			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 null;
			return result;
			}

			/**
			* 让小车从远点 ====>> 待机
			* 等待堆垛机搬运
			* 让小车行走至待机位
			*/
			public void letCarBeWaiting(WrkMast wrkMast, Integer steNo, String locNo) {
			// 获取穿梭车信息
			@@ -1310,24 +1427,35 @@
			if (steProtocol == null) { return; }
			if (steProtocol.isIdle()) {

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

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).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 {
			// 如果处于待机位
			if (steProtocol.locaType.equals(SteLocaType.A_WAITING) \|\| steProtocol.locaType.equals(SteLocaType.B_WAITING)) {
			// 修改工作档状态绑定穿梭车
			wrkMast.setWrkSts(3L);
			wrkMast.setSteNo(steNo);
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			} else {
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findWaiting(steProtocol.getRow().intValue())); // 任务模式: 行走至待机位

			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))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态绑定穿梭车
			wrkMast.setSteNo(steNo);
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			}
			@@ -1350,7 +1478,7 @@
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol.getRow().intValue())); // 任务模式: 去近点等待堆垛机叉取

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

			@@ -1383,7 +1511,7 @@
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol)); // 任务模式: 去近点等待堆垛机叉取

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

			@@ -1401,40 +1529,6 @@
			}

			/**
			* 让小车从远点 ====>> 移动到近点
			* 等待堆垛机搬运
			*/
			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()).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 {
			// 修改工作档状态绑定穿梭车
			wrkCharge.setSteNo(steNo);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			}

			/**
			* 入出库 ===>> 堆垛机搬入小车
			*/
			public void carMoveIn(WrkMast wrkMast, Integer steNo, CrnProtocol crnProtocol) {
			@@ -1444,10 +1538,18 @@
			if (steProtocol == null) { return; }
			if (steProtocol.isIdle()) {
			// 堆垛机空闲
			if (crnProtocol.getStatusType().equals(CrnStatusType.IDLE) \|\| crnProtocol.getTaskNo() == 0) {
			if (crnProtocol.getStatusType().equals(CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
			LocMast locMast;
			// 入库搬
			if (wrkMast.getWrkSts() <= 10) {

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

			locMast = locMastService.selectById(wrkMast.getLocNo());
			// 堆垛机命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			@@ -1455,17 +1557,17 @@
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue()); // 源库位排
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo()).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 {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo()), locMast.getBay1(), locMast.getLev1());
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo(), true), locMast.getBay1(), locMast.getLev1());
			// 修改工作档状态 3.小车待搬 => 4.迁入小车
			Date now = new Date();
			wrkMast.setWrkSts(4L);
			@@ -1477,6 +1579,13 @@
			}
			// 出库搬
			} else {
			// 判断被移库位是否存在其他小车
			Integer otherSte = existOtherSte(wrkMast.getSourceLocNo(), steNo);
			if (otherSte != null) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", steNo, wrkMast.getSourceLocNo(), otherSte);
			return;
			}

			locMast = locMastService.selectById(wrkMast.getSourceLocNo());
			// 堆垛机命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			@@ -1484,17 +1593,17 @@
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue()); // 源库位排
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo()).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 {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo()), locMast.getBay1(), locMast.getLev1());
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo(), true), locMast.getBay1(), locMast.getLev1());
			// 修改工作档状态 12.小车待搬 => 13.迁入小车
			Date now = new Date();
			wrkMast.setWrkSts(13L);
			@@ -1521,14 +1630,22 @@
			// 穿梭车空闲
			if (steProtocol.isIdle()) {
			// 堆垛机空闲
			if (crnProtocol.getStatusType().equals(CrnStatusType.IDLE) \|\| crnProtocol.getTaskNo() == 0) {
			if (crnProtocol.getStatusType().equals(CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {

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

			String idleLocNo = basSte.getIdleLoc();

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

			// 堆垛机命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			@@ -1536,17 +1653,17 @@
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue()); // 源库位排
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(idleLocNo).shortValue()); // 目标库位排
			crnCommand.setDestinationPosX(Utils.getGroupRow(idleLocNo, true).shortValue()); // 目标库位排
			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));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(idleLocNo), Utils.getBay(idleLocNo), Utils.getLev(idleLocNo));
			steThread.modifyPos(Utils.getGroupRow(idleLocNo, true), Utils.getBay(idleLocNo), Utils.getLev(idleLocNo));
			// 修改工作档状态 3.小车待搬 => 5.迁出小车
			Date now = new Date();
			wrkMast.setWrkSts(5L);
			@@ -1564,7 +1681,6 @@
			/**
			* 执行对工作档的完成操作
			*/
			@Async
			@Transactional
			public void storeFinished() {
			for (CrnSlave crn : slaveProperties.getCrn()) {
			@@ -1599,6 +1715,20 @@
			log.error("{}号穿梭车重新定位失败！作业充电任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			}
			}
			} else if (wrkCharge.getWrkSts() == 27) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			if (steThread.confirmPos()) {
			// 27.放至充电位 ===>> 28.充电就绪
			wrkCharge.setWrkSts(28L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 27.放至充电位 ===>> 28.充电就绪失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			} else {
			log.error("{}号穿梭车重新定位失败！作业充电任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			}
			} else if (wrkCharge.getWrkSts() == 34) {
			// 34.吊车搬运 ===>> 35.小车就绪
			wrkCharge.setWrkSts(35L);
			@@ -1611,6 +1741,34 @@
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			if (!steThread.confirmPos()) {
			log.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());
			} else {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			if (!steThread.confirmPos()) {
			log.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());
			} else {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业复位任务号：{}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
			}
			}
			}
			@@ -1636,7 +1794,7 @@
			}
			} else {
			// 判断是否需要小车入库
			if (locMastService.isOutMost(wrkMast.getLocNo())) {
			if (locMastService.isOutMost(wrkMast.getLocNo(), true)) {
			// ==> 9.入库完成
			wrkMast.setWrkSts(9L);
			Date now = new Date();
			@@ -1765,6 +1923,9 @@
			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) {
			// 堆垛机复位
			@@ -1777,128 +1938,16 @@
			}
			// 库位移转
			} else {
			if (wrkMast.getWrkSts() == 16) {
			Date now = new Date();
			if (locMastService.isOutMost(wrkMast.getLocNo())) {
			// 16.吊车出库中 ==> 9.入库完成
			wrkMast.setWrkSts(9L);
			wrkMast.setCrnEndTime(now);
			} else {
			// 16.吊车出库中 ==> 9.入库完成
			wrkMast.setWrkSts(9L);
			}
			wrkMast.setModiTime(now);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			log.error("修改工作档状态 16.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			}
			} else if (wrkMast.getWrkSts() == 4) {
			// 4.迁入小车 ==> 6.小车待入
			wrkMast.setWrkSts(6L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			// 穿梭车重新定位排列层
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkMast.getSteNo());
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 穿梭车去待机位
			BasSte basSte = basSteService.selectById(wrkMast.getSteNo());
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkMast.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(9999); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findWaiting(basSte.getRow())); // 任务模式: 去近点等待堆垛机叉取
			// steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			// 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));
			}
			} else {
			log.error("修改工作档状态 4.迁入小车 => 6.小车待入失败！！，工作号={}", wrkMast.getWrkNo());
			}
			// 入库 ===>> 迁出小车完成
			} else if (wrkMast.getWrkSts() == 7){
			// 判断是否需要小车入库
			if (locMastService.isOutMost(wrkMast.getLocNo())) {
			// ==> 9.入库完成
			wrkMast.setWrkSts(9L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			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("修改工作档状态 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));
			} 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());
			}
			}
			}
			}
			} else if (wrkMast.getWrkSts() == 13) {
			// 给穿梭车下发命令
			Integer steNo = wrkMast.getSteNo();
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			// 穿梭车重新定位排列层
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			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));
			} else {
			// 13.迁入小车 ==> 14.小车搬出库
			wrkMast.setWrkSts(14L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			log.error("修改工作档状态 13.迁入小车 ==> 14.小车搬出库失败！！，工作号={}", wrkMast.getWrkNo());
			log.error("更新工作档的工作状态为 17.出库完成失败！！！ [工作号:{}]", wrkMast.getWrkNo());
			}
			}
			}
			@@ -1938,18 +1987,26 @@
			steThread.setResetFlag(true);
			}
			} else if (wrkCharge.getWrkSts() == 25) {
			// 25.小车去充电 ===>> 26.等待充电
			// 25.小车走行 ===>> 26.等待充电
			wrkCharge.setWrkSts(26L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 25.小车去充电 ===>> 26.等待充电失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改充电任务状态 25.小车走行 ===>> 26.等待充电失败！！，工作号={}", 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)) {
			log.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("修改演示任务状态 25.小车去充电 ===>> 26.等待充电失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改演示任务状态 32.小车走行 ===>> 33.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -1958,6 +2015,14 @@
			wrkCharge.setWrkSts(37L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改演示任务状态 36.小车走行 ===>> 37.演示完成失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			} else if (wrkCharge.getWrkSts() == 44) {
			// 44.小车走行 ===>> 45.小车待搬
			wrkCharge.setWrkSts(45L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改演示任务状态 44.小车走行 ===>> 45.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -1997,7 +2062,9 @@
			} else {
			if (wrkMast.getMk().equals("I")) {
			String locNo = wrkMast.getLocNo();
			if (Utils.getGroupRow(locNo).equals(Utils.getGroupRow(steProtocol.getRow().intValue())) && steProtocol.getBay() == Utils.getBay(locNo) && steProtocol.getLev() == Utils.getLev(locNo)) {
			if (Utils.getGroupRow(locNo, false).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), false))
			&& steProtocol.getBay() == Utils.getBay(locNo)
			&& steProtocol.getLev() == Utils.getLev(locNo)) {
			// 修改工作档状态 11.生成出库ID => 6.小车待入
			wrkMast.setWrkSts(6L);
			} else {
			@@ -2279,7 +2346,6 @@
			/**
			* 空栈板初始化入库,叉车入库站放货
			*/
			@Async
			public void storeEmptyPlt(){
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历空板入库口
			@@ -2324,7 +2390,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")
			@@ -2368,7 +2434,6 @@
			/**
			* 出库 ===>> 工作档信息写入led显示器
			*/
			@Async
			public void ledExecute() {
			for (LedSlave led : slaveProperties.getLed()) {
			// 获取输送线plc线程
			@@ -2469,7 +2534,6 @@
			/**
			* 其他 ===>> LED显示器复位，显示默认信息
			*/
			@Async
			public void ledReset() {
			for (LedSlave led : slaveProperties.getLed()) {
			// 获取输送线plc线程
			@@ -2499,7 +2563,15 @@
			/**
			* 小车电量检测 ===>> 发起充电
			*/
			@SuppressWarnings("serial")
			public synchronized void loopSteCharge() {
			if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
			return;
			}
			if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) {
			return;
			}
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
			for (SteSlave ste : slaveProperties.getSte()) {
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
			SteProtocol steProtocol = steThread.getSteProtocol();
			@@ -2510,6 +2582,7 @@
			if (steProtocol.getMode() == 0
			\|\| !steProtocol.statusType.equals(SteStatusType.IDLE)
			\|\| basSte.getPakMk().equals("Y")
			\|\| basSte.getAutoCharge().equals("N")
			// \|\| steProtocol.getChargeStatus() == 1
			) {
			continue;
			@@ -2520,223 +2593,367 @@
			if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
			continue;
			}
			WrkCharge wrkCharge = wrkChargeService.selectWorking(steProtocol.getSteNo().intValue());
			WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.charge);

			if (wrkCharge == null && steProtocol.getChargeStatus() == 0) {
			String idleLoc = basSte.getIdleLoc();
			// 寻找空闲充电桩
			SteChargeType steCharge = null;
			do {
			String locNo;
			if (!devpThread.charge0) {
			SteChargeType first = SteChargeType.FIRST;
			locNo = first.locNo;
			if (basSteService.hasCarOfLocNo(locNo) == null
			&& wrkChargeService.selectWorkingOfCharge(first.ssbm) == null) {
			steCharge = first;
			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());
			continue;
			}
			String chargeLocNo = steCharge.locNo;
			wrkCharge = new WrkCharge();
			wrkCharge.setSteNo(ste.getId());
			wrkCharge.setCharge(steCharge.ssbm);
			wrkCharge.setWrkNo(commonService.getChargeWorkNo(4));
			wrkCharge.setWrkSts(21L); // 21.准备充电
			wrkCharge.setCrnNo(basSte.getCrnNo());
			wrkCharge.setCrnNo(2); // 固定2号堆垛机
			wrkCharge.setIoPri((double) 10);
			wrkCharge.setLocNo(idleLoc);
			wrkCharge.setLocNo(chargeLocNo);
			wrkCharge.setMemo("charge");
			wrkCharge.setAppeTime(new Date());
			if (!wrkChargeService.insert(wrkCharge)) {
			log.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 (Utils.getGroupRow(idleLoc).equals(Utils.getGroupRow(steProtocol.getRow().intValue())) && steProtocol.getBay() == Utils.getBay(idleLoc) && steProtocol.getLev() == Utils.getLev(idleLoc)) {
			// 修改工作档状态 21.准备充电 => 24.小车到达
			wrkCharge.setWrkSts(24L);
			if (steProtocol.getRow().intValue() == Utils.getRow(chargeLocNo)
			&& steProtocol.getBay().intValue() == Utils.getBay(chargeLocNo)
			&& steProtocol.getLev().intValue() == Utils.getLev(chargeLocNo)) {
			// 修改工作档状态 21.准备充电 => 28.充电就绪
			wrkCharge.setWrkSts(28L);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 21.准备充电 => 24.小车到达失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改充电任务状态 21.准备充电 => 28.充电就绪失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			} else {
			this.letCarBeWaiting(wrkCharge, ste.getId());
			}

			} else {
			// filter
			if (wrkCharge == null \|\| (wrkCharge.getWrkSts() < 26 && steProtocol.getChargeStatus() == 1)) {
			continue;
			}

			// 22.小车待搬
			if (wrkCharge.getWrkSts() == 22) {
			// 搬小车至充电库位
			LocMast locMast = locMastService.selectById(basSte.getIdleLoc());

			// 堆垛机命令下发区 --------------------------------------------------------------------------
			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()).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo()).shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.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(locMast.getLocNo()), locMast.getBay1(), locMast.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());
			}
			}

			} else if (wrkCharge.getWrkSts() == 24L) {
			// 小车行驶至充电位
			if (steProtocol.statusType.equals(SteStatusType.IDLE) && steProtocol.getPakMk().equals("N")) {
			if (steProtocol.getChargeStatus() == 1) { continue; }
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findChargeByLoc(steProtocol.getRow().intValue()));
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 24.小车到达 ===> 25.小车去充电
			wrkCharge.setWrkSts(25L);
			Date now = new Date();
			wrkCharge.setCrnEndTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 24.小车到达 ===> 25.小车去充电失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			} else if (wrkCharge.getWrkSts() == 26) {
			if (steProtocol.getChargeStatus() == 0) { continue; }
			// 给输送线下发充电任务
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
			SteChargeType steChargeType = SteChargeType.get(wrkCharge.getLocNo());
			if (null != steChargeType) {
			if (devpThread.charge(steChargeType.ssbm - 1, true)) {
			// 修改工作档状态 26.等待充电 ===> 28.完成充电
			wrkCharge.setWrkSts(28L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 26.等待充电 ===> 28.完成充电失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			}
			} else {
			log.error("获取充电桩号失败，解析库位：{}", wrkCharge.getLocNo());
			}
			}
			break;
			}
			} catch (Exception e) {
			log.error("fail", e);
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			log.error("loopSteCharge fail", e);
			}
			}
			}


			public List<String> crn1DemoLocs = new ArrayList<String>(); public String crn1LastLoc = "";
			public List<String> crn2DemoLocs = new ArrayList<String>(); public String crn2LastLoc = "";
			public List<String> crn3DemoLocs = new ArrayList<String>(); public String crn3LastLoc = "";
			public synchronized void demo() {
			if (Cools.isEmpty(crn1DemoLocs)) {
			crn1DemoLocs = locMastService.getDemoNextLoc(1);
			/**
			* 执行小车充电任务
			*/
			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);
			SteProtocol steProtocol = steThread.getSteProtocol();
			BasSte basSte = basSteService.selectById(steNo);
			if (Cools.isEmpty(steProtocol, basSte)) { return; }
			if (steProtocol.getMode() == 0
			\|\| !steProtocol.statusType.equals(SteStatusType.IDLE)
			\|\| basSte.getPakMk().equals("Y")
			\|\| basSte.getAutoCharge().equals("N")
			// \|\| steProtocol.getChargeStatus() == 1
			) {
			return;
			}
			if (Cools.isEmpty(crn2DemoLocs)) {
			crn2DemoLocs = locMastService.getDemoNextLoc(2);
			if (!steProtocol.isEnable()) {
			return;
			}
			if (Cools.isEmpty(crn3DemoLocs)) {
			crn3DemoLocs = locMastService.getDemoNextLoc(3);
			if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
			wrkCharge.setWrkSts(30L);
			wrkChargeMapper.updateById(wrkCharge);
			return;
			}
			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;
			try {
			// filter
			if (wrkCharge.getWrkSts() < 28 && steProtocol.getChargeStatus() == 1) {
			return;
			}

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

			// filter
			if (wrkChargeService.selectCount(new EntityWrapper<WrkCharge>()
			.eq("crn_no", crn.getId()).between("wrk_sts", 31, 36)) > 0) {
			continue;
			// 入出库任务优先
			if (null != wrkMastMapper.selectWorkingByCrn(wrkCharge.getCrnNo())) {
			return;
			}

			int steNo = crn.getId();
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			BasSte basSte = basSteService.selectById(steNo);
			if (Cools.isEmpty(steProtocol, basSte)) { continue; }
			// 搬小车至小车走向通道
			List<String> channel = slaveProperties.getChannel();
			for (String channelLocNo : channel) {
			Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
			if (null != otherSte) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", wrkCharge.getSteNo(), channelLocNo, otherSte);
			} else {
			LocMast channelLoc = locMastService.selectById(channelLocNo);

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

			String locNo = null;
			Iterator<String> iterator = crn1DemoLocs.iterator();
			if (crn.getId() == 1) {
			iterator = crn1DemoLocs.iterator();
			} else if (crn.getId() == 2) {
			iterator = crn2DemoLocs.iterator();
			} else if (crn.getId() == 3) {
			iterator = crn3DemoLocs.iterator();
			}
			while (iterator.hasNext()) {
			String next = iterator.next();
			String lastLoc = "";
			if (crn.getId() == 1) {
			lastLoc = crn1LastLoc;
			} else if (crn.getId() == 2) {
			lastLoc = crn2LastLoc;
			} else if (crn.getId() == 3) {
			lastLoc = crn3LastLoc;
			}
			if (!Cools.isEmpty(lastLoc)) {
			if (!lastLoc.substring(2, 7).equals(next.substring(2, 7)) \|\| !Utils.getGroupRow(lastLoc).equals(Utils.getGroupRow(next))) {
			locNo = next;
			iterator.remove();
			break;
			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 {
			iterator.remove();
			// 修改穿梭车运行中排列层
			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());
			}
			}
			} else {
			locNo = next;
			iterator.remove();
			break;
			}

			}
			if (!Cools.isEmpty(locNo)) {
			if (crn.getId() == 1) {
			crn1LastLoc = locNo;
			} else if (crn.getId() == 2) {
			crn2LastLoc = locNo;
			} else if (crn.getId() == 3) {
			crn3LastLoc = locNo;
			}

			} else if (wrkCharge.getWrkSts() == 24L) {
			// 小车行驶通道
			if (steProtocol.statusType.equals(SteStatusType.IDLE) && steProtocol.getPakMk().equals("N")) {
			if (steProtocol.getChargeStatus() == 1) { return; }
			// 命令下发区 --------------------------------------------------------------------------
			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 {
			// 修改工作档状态 24.小车到达 ===> 25.小车走行
			wrkCharge.setWrkSts(25L);
			Date now = new Date();
			wrkCharge.setCrnEndTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 24.小车到达 ===> 25.小车走行失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			} else if (wrkCharge.getWrkSts() == 26) {
			// 固定堆垛机
			int crnNo = 1;
			// 入出库任务优先
			if (null != wrkMastMapper.selectWorkingByCrn(crnNo)) {
			return;
			}

			log.info("{}号堆垛机对{}库位进行演示", crn.getId(), locNo);
			// 充电位
			LocMast chargeLoc = locMastService.selectById(wrkCharge.getLocNo());

			String sourceLocNo = Utils.getLocNo(steProtocol.getRow(), steProtocol.getBay(), steProtocol.getLev());
			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) {
			// 穿梭车下发充电任务
			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));
			} else {
			// 28.充电就绪 ===>> 29.开始充电
			wrkCharge.setWrkSts(29L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 28.充电就绪 ===>> 29.开始充电失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			} catch (Exception e) {
			log.error("executeSteCharge fail", e);
			}
			}

			WrkCharge wrkCharge = new WrkCharge();
			wrkCharge.setCrnNo(crn.getId());
			/**
			* 轮询充电桩是否有空闲小车
			*/
			public synchronized void queryChargeLocOfComplete() {
			// 与充电任务不同步进行
			if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) { return; }
			if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) { return; }
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
			// 检索充电桩
			for (SteChargeType value : SteChargeType.values()) {
			Integer steNo = basSteService.hasCarOfLocNo(value.locNo);
			if (steNo != null) {
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			BasSte basSte = basSteService.selectById(steNo);
			if (Cools.isEmpty(steProtocol, basSte)) {
			continue;
			}
			if (steProtocol.getCharge() < 99) {
			continue;
			}
			if (steProtocol.getMode() == 0) {
			continue;
			}
			if (!steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
			continue;
			}
			// // 1号充电桩
			// if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
			// continue;
			// }
			// // 2号充电桩
			// if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
			// continue;
			// }
			// // 3号充电桩
			// if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
			// continue;
			// }
			// // 小车是否处于充电状态
			// if (steProtocol.getChargeStatus() == 1) {
			// continue;
			// }
			// case 1 : 自动充电开馈电 ×
			// case 2 : 自动充电开满电 ✔
			// case 3 : 自动充电关馈电 ✔
			// case 4 : 自动充电关满电 ✔
			if (basSte.getAutoCharge().equals("Y")
			&& steProtocol.getCharge() < Float.parseFloat(basSte.getChargeLine())) {
			continue;
			}

			WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset);

			if (wrkCharge == null) {
			// 开始穿梭车复位任务
			wrkCharge = new WrkCharge();
			wrkCharge.setSteNo(steNo);
			wrkCharge.setWrkNo(commonService.getChargeWorkNo(5));
			wrkCharge.setWrkSts(31L); // 31.生成演示ID
			wrkCharge.setWrkNo(commonService.getChargeWorkNo(6));
			wrkCharge.setWrkSts(41L); // 41.小车准备复位
			wrkCharge.setCrnNo(2); // 固定2号堆垛机
			wrkCharge.setIoPri((double) 10);
			wrkCharge.setSourceLocNo(sourceLocNo);
			wrkCharge.setLocNo(locNo);
			wrkCharge.setMemo("demo");
			wrkCharge.setSourceLocNo(value.locNo);
			wrkCharge.setLocNo(basSte.getIdleLoc());
			wrkCharge.setMemo("reset");
			wrkCharge.setAppeTime(new Date());
			if (!wrkChargeService.insert(wrkCharge)) {
			log.error("生成演示任务失败，堆垛机号：{}，小车：{}，源库位：{}，目标库位：{}", crn.getId(), steNo, sourceLocNo, locNo);
			log.error("保存{}号穿梭车复位任务失败!!!", steNo);
			} else {
			break;
			}
			}
			}
			@@ -2744,97 +2961,143 @@
			}

			/**
			* 演示取货
			* 小车从充电桩至待机库位
			*/
			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;
			}
			public synchronized void steFromChargeToIdleLoc() {
			WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset);
			if (wrkCharge == null) { 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)) {
			log.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()).shortValue()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo()).shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
			BasSte basSte = basSteService.selectById(wrkCharge.getSteNo());
			if (Cools.isEmpty(steProtocol, basSte)) {
			return;
			}
			// 搬运至固定通道
			if (wrkCharge.getWrkSts() == 41L) {
			// 搬小车至小车走向通道
			List<String> channel = slaveProperties.getChannel();
			for (String channelLocNo : channel) {
			Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
			if (null != otherSte) {
			log.warn("{}号小车移入{}库位组失败，原因：存在{}号穿梭车！", wrkCharge.getSteNo(), channelLocNo, otherSte);
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo()), locMast.getBay1(), locMast.getLev1());
			// 修改工作档状态 33.小车待搬 => 34.吊车搬运
			Date now = new Date();
			wrkCharge.setWrkSts(34L);
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改演示任务{}工作档 33.小车待搬 => 34.吊车搬运失败!", wrkCharge.getWrkNo());
			// 固定堆垛机
			int crnNo = 1;
			if (null != wrkMastMapper.selectWorkingByCrn(crnNo)) {
			return;
			}
			}
			// 35.小车就绪
			} else if (wrkCharge.getWrkSts() == 35L) {

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

			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo);
			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(crnNo); // 堆垛机编号
			crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(steProtocol.getRow()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(channelLoc.getLocNo(), false).shortValue()); // 目标库位排
			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));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(channelLoc.getLocNo(), false), channelLoc.getBay1(), channelLoc.getLev1());
			// 修改工作档状态 41.小车准备复位 => 42.吊车搬运
			Date now = new Date();
			wrkCharge.setWrkSts(42L);
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改复位任务状态 41.小车准备复位 => 42.吊车搬运失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			break;
			}

			}
			}
			} else if (wrkCharge.getWrkSts() == 43L) {
			// 小车行驶通道
			if (steProtocol.statusType.equals(SteStatusType.IDLE) && steProtocol.getPakMk().equals("N")) {
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			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.setTaskMode(SteTaskModeType.BACK_ORIGIN); // 去左端

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			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))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 35.小车就绪 => 36.小车走行
			wrkCharge.setWrkSts(36L);
			wrkCharge.setModiTime(new Date());
			// 修改工作档状态 43.小车到达 ===> 44.小车走行
			wrkCharge.setWrkSts(44L);
			Date now = new Date();
			wrkCharge.setCrnEndTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改演示任务{}工作档 35.小车就绪 => 36.小车走行失败!", wrkCharge.getWrkNo());
			log.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);
			} else {
			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(idleLoc.getLocNo(), true).shortValue()); // 目标库位排
			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));
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(idleLoc.getLocNo(), true), idleLoc.getBay1(), idleLoc.getLev1());
			// 修改工作档状态 45.小车待搬 => 46.放至待机位
			Date now = new Date();
			wrkCharge.setWrkSts(46L);
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态 45.小车待搬 => 46.放至待机位失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}

			}
			}
			}


			/**
			* 因双深库位阻塞，对浅库位进行移转（出库版)
			@@ -2857,7 +3120,6 @@
			}
			}
			}


			if (null != loc) {
			break;