zy-wcs.git - Gitblit

			@@ -39,6 +39,7 @@
			import com.zy.core.thread.BarcodeThread;
			import com.zy.core.thread.LedThread;
			import com.zy.core.thread.SiemensDevpThread;
			import com.zy.system.service.impl.ConfigServiceImpl;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			@@ -92,11 +93,14 @@
			@Value("${wms.url}")
			private String wmsUrl;
			public short wrkNo = 9999;
			@Autowired
			private ConfigServiceImpl configService;

			/**
			* 组托
			* 入库站，根据条码扫描生成入库工作档，工作状态 2
			*/
			public synchronized void generateStoreWrkFile(Integer mark) {
			public synchronized void generateStoreWrkFile(Integer mark) throws InterruptedException {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) { //遍历输送线
			// 遍历入库口
			@@ -125,10 +129,7 @@
			是2号输送线9995拣料任务
			*/
			String barcode = barcodeThread.getBarcode();
			if (Cools.isEmpty(barcode) \|\| !staProtocol.isInEnable() \|\| staProtocol.isEmptyMk()
			\|\| !staProtocol.isFullPlt() \|\| (staProtocol.getWorkNo() == 9995 && devp.getId() == 2)) {
			continue;
			}


			// 尺寸检测异常
			boolean back = false;
			@@ -162,16 +163,16 @@
			back = true;
			}

			if (!back && devp.getId() == 2) {
			if(staProtocol.getWorkNo() == 9907 && '5' != barcode.charAt(0)){
			errMsg = "条码5只能入7排";
			back = true;
			}
			if(staProtocol.getWorkNo() == 9906 && '5' == barcode.charAt(0)){
			errMsg = "条码5不能入6排";
			back = true;
			}
			}
			// if (!back && devp.getId() == 2) {
			// if(staProtocol.getWorkNo() == 9907 && '5' != barcode.charAt(0)){
			// errMsg = "条码5只能入7排";
			// back = true;
			// }
			// if(staProtocol.getWorkNo() == 9906 && '5' == barcode.charAt(0)){
			// errMsg = "条码5不能入6排";
			// back = true;
			// }
			// }

			// 退回
			if (back && devp.getId() == 2) {
			@@ -180,46 +181,56 @@
			// continue;
			// }

			if (!staProtocol.isLoading()){
			if (!staProtocol.isLoading()) {
			continue;
			}
			if (!staProtocol.isPakMk()) {
			continue;
			}
			staProtocol.setWorkNo(wrkNo);
			News.warn("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
			News.warn("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg, wrkNo);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg));
			Thread.sleep(500);
			}

			if (Cools.isEmpty(barcode) \|\| !staProtocol.isInEnable() \|\| staProtocol.isEmptyMk()
			\|\| !staProtocol.isFullPlt() \|\| (staProtocol.getWorkNo() <= 9000 && devp.getId() == 2)) {
			continue;
			}

			if (staProtocol.isAutoing() && staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk() && staProtocol.getWorkNo() > 9000
			&& staProtocol.isPakMk() &&!Cools.isEmpty(barcode) && !back) {
			&& staProtocol.isPakMk() && !Cools.isEmpty(barcode) && !back) {
			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
			//过滤判断，防止拣料再入库货物，经过入库站再入库时，被退回到退库站
			WrkMast wrkMast1 = wrkMastMapper.selectPakInStepBarcode(barcode);
			if (wrkMast1 !=null){
			if (wrkMast1.getIoType()==103 \|\| wrkMast1.getIoType()==107 \|\| wrkMast1.getIoType()==104){
			if (wrkMast1 != null) {
			if (wrkMast1.getIoType() == 103 \|\| wrkMast1.getIoType() == 53 \|\| wrkMast1.getIoType() == 107 \|\| wrkMast1.getIoType() == 57 \|\| wrkMast1.getIoType() == 104) {
			continue;
			}
			}
			if (wrkMast != null && devp.getId() == 2) {
			News.warn(""+mark+" - 4"+" - 工作档中已存在该站状态为（ 2.设备上走）的数据,工作号={}", wrkMast.getWrkNo());
			staProtocol.setWorkNo((short)9999);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			if (wrkMast != null) {
			News.warn("" + mark + " - 4" + " - 满托盘入库工作档中已存在该站状态为（ 2.设备上走）的数据,工作号={}", wrkMast.getWrkNo());
			if (devp.getId() == 2) {
			// staProtocol.setWorkNo((short)9999);
			// staProtocol.setStaNo(inSta.getBackSta().shortValue());
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			}

			// led 异常显示
			if (ledThread != null) {
			String errorMsg = "工作档已存在该条码号===>>" + barcode;
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
			// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
			}
			continue;
			}
			@@ -262,14 +273,28 @@
			ledCommand.setTitle("全板入库");
			ledCommand.setLocNo(dto.getLocNo());
			ledCommand.setStaNo(dto.getStaNo());
			ArrayList<MatDto> matDtos = new ArrayList<>();
			MatDto matDto = new MatDto();
			matDto.setLocNo(dto.getLocNo());
			matDtos.add(matDto);
			ledCommand.setMatDtos(matDtos);
			ledCommand.setBarcode(barcode);
			commands.add(ledCommand);
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands));
			if (devp.getId() == 1) {
			// if (MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(1, commands))){
			// ledThread.setLedMk(false);
			// }
			} else {
			if (MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands))) {
			ledThread.setLedMk(false);
			}
			}
			// ledThread.errorReset();
			}
			} else {
			News.error(""+mark+" - 5"+" - 请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			if(devp.getId() == 2) {
			staProtocol.setWorkNo((short)9999);
			News.error("" + mark + " - 5" + " - 满板入库请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			if (devp.getId() == 2) {
			staProtocol.setWorkNo((short) 9999);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			@@ -290,15 +315,15 @@
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}

			}else {
			News.errorNoLog(""+mark+" - 6"+" - 站点信息不符合入库条件！！！"+" 自动信号："+staProtocol.isAutoing()+"、可入信号：" + staProtocol.isInEnable()
			+"、空板信号："+ staProtocol.isEmptyMk()+"、工作号：" + staProtocol.getWorkNo()
			+"、锁定标记"+ staProtocol.isPakMk()+"、入库印记：" + staProtocol.getStamp());
			} else {
			News.errorNoLog("" + mark + " - 6" + " - 站点信息不符合入库条件！！！" + " 自动信号：" + staProtocol.isAutoing() + "、可入信号：" + staProtocol.isInEnable()
			+ "、空板信号：" + staProtocol.isEmptyMk() + "、工作号：" + staProtocol.getWorkNo()
			+ "、锁定标记" + staProtocol.isPakMk() + "、入库印记：" + staProtocol.getStamp());
			}

			}
			}
			News.infoNoLog(""+mark+" - 0"+" - 组托 ===》执行完成");
			News.infoNoLog("" + mark + " - 0" + " - 组托 ===》执行完成");

			}

			@@ -326,13 +351,13 @@
			}

			// 判断是否满足入库条件
			if (!staProtocol.isLoading()){
			if (!staProtocol.isLoading()) {
			continue;
			}
			if (staProtocol.isAutoing() && staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getWorkNo() == 9999)
			&& staProtocol.isPakMk()) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行");
			News.warnNoLog("" + mark + " - 0" + " - 开始执行");
			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep11(inSta.getStaNo());
			if (wrkMast == null) {
			@@ -351,20 +376,20 @@
			wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.error(""+mark+" - 1"+" - 更新工作档失败！！！ [工作号：{}]", wrkMast.getWrkNo());
			News.error("" + mark + " - 1" + " - 更新工作档失败！！！ [工作号：{}]", wrkMast.getWrkNo());
			}
			} else {
			News.error(""+mark+" - 2"+" - 发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			News.error("" + mark + " - 2" + " - 发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			}

			}else {
			News.errorNoLog(""+mark+" - 6"+" - 站点信息不符合入库条件！！！"+" 自动信号："+staProtocol.isLoading()+"、可入信号：" + staProtocol.isInEnable()
			+"、空板信号："+ staProtocol.isEmptyMk()+"、工作号：" + staProtocol.getWorkNo()
			+"、锁定标记"+ staProtocol.isPakMk()+"、入库印记：" + staProtocol.getStamp());
			} else {
			News.errorNoLog("" + mark + " - 6" + " - 站点信息不符合入库条件！！！" + " 自动信号：" + staProtocol.isLoading() + "、可入信号：" + staProtocol.isInEnable()
			+ "、空板信号：" + staProtocol.isEmptyMk() + "、工作号：" + staProtocol.getWorkNo()
			+ "、锁定标记" + staProtocol.isPakMk() + "、入库印记：" + staProtocol.getStamp());
			}
			}
			}
			News.infoNoLog(""+mark+" - 0"+" - wms入库 ===》执行完成");
			News.infoNoLog("" + mark + " - 0" + " - wms入库 ===》执行完成");

			}

			@@ -381,9 +406,9 @@
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode)) {
			if (!Cools.isEmpty(barcode)) {
			// News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			continue;
			}
			} else {
			@@ -403,7 +428,7 @@
			// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }

			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行");
			News.warnNoLog("" + mark + " - 0" + " - 开始执行");
			WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
			// WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
			if (wrkMast == null) {
			@@ -418,20 +443,24 @@
			// 拣、盘、并作业站转换
			int stnNo = 0;
			if (wrkMast.getIoType() == 103) { // 拣料出库
			if(wrkMast.getCrnNo() == 1) {
			if (wrkMast.getCrnNo() == 1) {
			stnNo = 104;
			}else if(wrkMast.getCrnNo() == 2) {
			stnNo =204;
			}else if(wrkMast.getCrnNo() == 3) {
			} else if (wrkMast.getCrnNo() == 2) {
			stnNo = 204;
			} else if (wrkMast.getCrnNo() == 3) {
			stnNo = 304;
			} else if (wrkMast.getCrnNo() == 4) {
			stnNo = 311;
			}
			} else if(wrkMast.getIoType() == 107){ //盘点出库
			if(wrkMast.getCrnNo() == 1) {
			} else if (wrkMast.getIoType() == 107) { //盘点出库
			if (wrkMast.getCrnNo() == 1) {
			stnNo = 101;
			}else if(wrkMast.getCrnNo() == 2) {
			stnNo =201;
			}else if(wrkMast.getCrnNo() == 3) {
			} else if (wrkMast.getCrnNo() == 2) {
			stnNo = 201;
			} else if (wrkMast.getCrnNo() == 3) {
			stnNo = 301;
			} else if (wrkMast.getCrnNo() == 4) {
			stnNo = 314;
			}
			}
			if (stnNo == 0) {
			@@ -444,17 +473,20 @@
			.eq("stn_no", stnNo) // 作业站点 = 拣料出库的目标站
			.eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
			StaDesc staDesc = staDescService.selectOne(wrapper);
			//LED
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			if (Cools.isEmpty(staDesc)) {
			News.error(""+mark+" - 2"+" - 入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
			staProtocol.setWorkNo((short) 9999);
			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());
			News.error("" + mark + " - 2" + " - 入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
			if (devp.getId() == 2) {
			staProtocol.setWorkNo((short) 9999);
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}

			// led 异常显示
			if (ledThread != null) {
			String errorMsg = "此为拣料、并板、盘点再入库.请放在"+pickSta.getBackSta().shortValue()+"站点";
			String errorMsg = "此为拣料、并板、盘点再入库.请放在" + pickSta.getBackSta().shortValue() + "站点";
			MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(5, errorMsg));
			}
			continue;
			@@ -499,6 +531,29 @@
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			continue;
			}
			List<LedCommand> commands = new ArrayList<>();
			LedCommand ledCommand = new LedCommand();
			ledCommand.setWorkNo(wrkMast.getWrkNo());
			ledCommand.setIoType(wrkMast.getIoType());
			ledCommand.setTitle(wrkMast.getIoType() == 53 ? "拣料再入库" : "盘点再入库");
			ledCommand.setLocNo(wrkMast.getLocNo());
			ledCommand.setStaNo(wrkMast.getStaNo());
			ledCommand.setBarcode(barcode);
			ArrayList<MatDto> matDtos = new ArrayList<>();
			MatDto matDto = new MatDto();
			matDto.setLocNo(wrkMast.getLocNo());
			matDtos.add(matDto);
			ledCommand.setMatDtos(matDtos);
			commands.add(ledCommand);
			if (devp.getId() == 1) {
			// if (MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(1, commands))) {
			// ledThread.setLedMk(false);
			// }
			} else {
			if (MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, commands))) {
			ledThread.setLedMk(false);
			}
			}

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

			}else {
			News.errorNoLog(""+mark+" - 6"+" - 站点信息不符合入库条件！！！"+" 自动信号："+staProtocol.isLoading()+"、可入信号：" + staProtocol.isInEnable()
			+"、空板信号："+ staProtocol.isEmptyMk());
			} else {
			News.errorNoLog("" + mark + " - 6" + " - 站点信息不符合入库条件！！！" + " 自动信号：" + staProtocol.isLoading() + "、可入信号：" + staProtocol.isInEnable()
			+ "、空板信号：" + staProtocol.isEmptyMk());
			}

			}

			}
			News.infoNoLog(""+mark+" - 0"+" - 拣料、并板、盘点再入库 ===》执行完成");
			News.infoNoLog("" + mark + " - 0" + " - 拣料、并板、盘点再入库 ===》执行完成");
			}

			/**
			@@ -557,7 +612,7 @@
			if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
			&& crnProtocol.statusType == CrnStatusType.WAITING
			&& crnProtocol.forkPosType == CrnForkPosType.HOME) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行");
			News.warnNoLog("" + mark + " - 0" + " - 开始执行");

			// 命令下发区 --------------------------------------------------------------------------

			@@ -575,21 +630,21 @@
			// 复位堆垛机
			crnThread.setResetFlag(true);
			} else {
			News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
			News.error("" + mark + " - 1" + " - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
			}

			}else {
			News.errorNoLog(""+mark+" - 6"+" - 堆垛机信息不符合入库条件！！！"
			+" 堆垛机状态："+crnProtocol.modeType+"==自动AUTO：" + CrnModeType.AUTO
			+"、堆垛机任务号："+crnProtocol.getTaskNo()+"==工作档任务号：" + wrkMast.getWrkNo().shortValue()
			+"、状态枚举："+crnProtocol.statusType+"==WAITING：90 //任务完成等待WCS确认)：" + CrnStatusType.WAITING
			+"、货叉位置："+crnProtocol.forkPosType+"==HOME：0 // 货叉原位：" + CrnForkPosType.HOME);
			} else {
			News.errorNoLog("" + mark + " - 6" + " - 堆垛机信息不符合入库条件！！！"
			+ " 堆垛机状态：" + crnProtocol.modeType + "==自动AUTO：" + CrnModeType.AUTO
			+ "、堆垛机任务号：" + crnProtocol.getTaskNo() + "==工作档任务号：" + wrkMast.getWrkNo().shortValue()
			+ "、状态枚举：" + crnProtocol.statusType + "==WAITING：90 //任务完成等待WCS确认)：" + CrnStatusType.WAITING
			+ "、货叉位置：" + crnProtocol.forkPosType + "==HOME：0 // 货叉原位：" + CrnForkPosType.HOME);
			}

			}
			}
			}
			News.infoNoLog(""+mark+" - 0"+" - 堆垛机站出库到出库站 ===》执行完成");
			News.infoNoLog("" + mark + " - 0" + " - 堆垛机站出库到出库站 ===》执行完成");
			}

			/**
			@@ -606,7 +661,7 @@
			}
			BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
			if (basCrnp == null) {
			News.error(""+mark+" - 1"+" - {}号堆垛机尚未在数据库进行维护！", crn.getId());
			News.error("" + mark + " - 1" + " - {}号堆垛机尚未在数据库进行维护！", crn.getId());
			continue;
			}

			@@ -618,33 +673,33 @@
			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行堆垛机入出库作业下发");
			News.warnNoLog("" + mark + " - 0" + " - 开始执行堆垛机入出库作业下发");
			// 如果最近一次是入库模式
			if (crnProtocol.getLastIo().equals("I")) {
			if (basCrnp.getInEnable().equals("Y")) {
			//mark - 1 - ....
			this.crnStnToLoc(crn, crnThread,mark); // 入库
			this.crnStnToLoc(crn, crnThread, mark); // 入库
			crnProtocol.setLastIo("O");
			} else if (basCrnp.getOutEnable().equals("Y")) {
			//mark - 2 - ....
			this.locToCrnStn(crn, crnThread,mark); // 出库
			this.locToCrnStn(crn, crnThread, mark); // 出库
			crnProtocol.setLastIo("I");
			}
			}
			// 如果最近一次是出库模式
			else if (crnProtocol.getLastIo().equals("O")) {
			if (basCrnp.getOutEnable().equals("Y")) {
			this.locToCrnStn(crn, crnThread,mark); // 出库
			this.locToCrnStn(crn, crnThread, mark); // 出库
			crnProtocol.setLastIo("I");
			} else if (basCrnp.getInEnable().equals("Y")) {
			this.crnStnToLoc(crn, crnThread,mark); // 入库
			this.crnStnToLoc(crn, crnThread, mark); // 入库
			crnProtocol.setLastIo("O");
			}
			}
			}
			// 库位移转
			//mark - 3 - ....
			this.locToLoc(crn, crnProtocol,mark);
			this.locToLoc(crn, crnProtocol, mark);

			// if (!Cools.isEmpty(basCrnp.getMoveOrigin()) && basCrnp.getMoveOrigin().equals("Y")){
			// if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			@@ -656,30 +711,30 @@
			// this.crnRebackHp(crnProtocol, crnThread);

			}
			News.infoNoLog(""+mark+" - 0"+" - 堆垛机入出库作业下发执行完成");
			News.infoNoLog("" + mark + " - 0" + " - 堆垛机入出库作业下发执行完成");
			}

			/**
			* 堆垛机xy移动
			*/
			public synchronized void crnMoveIntXY(CrnSlave crn,CrnProtocol crnProtocol, CrnThread crnThread) {
			public synchronized void crnMoveIntXY(CrnSlave crn, CrnProtocol crnProtocol, CrnThread crnThread) {
			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			&& !crnProtocol.getBay().equals((short)1) && crnThread.isCmdFlag()) {
			List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().ne("io_type", 1).and().ne("wrk_sts", 40L).and().ne("io_type",10));
			if (Cools.isEmpty(wrkMasts) \|\| wrkMasts.size()==0){
			&& !crnProtocol.getBay().equals((short) 1) && crnThread.isCmdFlag()) {
			List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().ne("io_type", 1).and().ne("wrk_sts", 40L).and().ne("io_type", 10));
			if (Cools.isEmpty(wrkMasts) \|\| wrkMasts.size() == 0) {
			// 堆垛机入库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(crn.getId()); // 堆垛机编号
			crnCommand.setTaskNo((short)9999); // 工作号
			crnCommand.setTaskNo((short) 9999); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式: 回原点
			crnCommand.setSourcePosX((short)1); // 源库位排
			crnCommand.setSourcePosY((short)1); // 源库位列
			crnCommand.setSourcePosZ((short)1); // 源库位层
			crnCommand.setDestinationPosX((short)1); // 目标库位排
			crnCommand.setDestinationPosY((short)1); // 目标库位列
			crnCommand.setDestinationPosZ((short)1); // 目标库位层
			crnCommand.setSourcePosX((short) 1); // 源库位排
			crnCommand.setSourcePosY((short) 1); // 源库位列
			crnCommand.setSourcePosZ((short) 1); // 源库位层
			crnCommand.setDestinationPosX((short) 1); // 目标库位排
			crnCommand.setDestinationPosY((short) 1); // 目标库位列
			crnCommand.setDestinationPosZ((short) 1); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
			News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={} ,任务类型:回原点", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			@@ -692,15 +747,15 @@
			/**
			* 堆垛机xy移动
			*/
			public synchronized void crnMoveOutXY(CrnSlave crn,CrnProtocol crnProtocol, CrnThread crnThread) {
			public synchronized void crnMoveOutXY(CrnSlave crn, CrnProtocol crnProtocol, CrnThread crnThread) {
			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			&& crnThread.isCmdFlag()) {
			List<WrkMast> wrkMastsM = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 1).and().ne("wrk_sts", 20L));
			List<WrkMast> wrkMastsK = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 10).and().ne("wrk_sts", 20L));
			if ((Cools.isEmpty(wrkMastsM) \|\| wrkMastsM.size()==0) && (Cools.isEmpty(wrkMastsK) \|\| wrkMastsK.size()==0)){
			if ((Cools.isEmpty(wrkMastsM) \|\| wrkMastsM.size() == 0) && (Cools.isEmpty(wrkMastsK) \|\| wrkMastsK.size() == 0)) {
			WrkMast wrkMast = wrkMastService.wrkCrnMoveOutXY(crnProtocol.getCrnNo());
			if (Cools.isEmpty(wrkMast)){
			if (Cools.isEmpty(wrkMast)) {
			return;
			}
			short locRow = 1;
			@@ -711,19 +766,19 @@
			String locNo = wrkMast.getLocNo();
			locBay = (short) Utils.getBay(locNo);
			locLev = (short) Utils.getLev(locNo);
			}else if ( wrkMast.getIoType().equals(101) \|\| wrkMast.getIoType().equals(110) \|\| wrkMast.getIoType().equals(11)){
			} else if (wrkMast.getIoType().equals(101) \|\| wrkMast.getIoType().equals(110) \|\| wrkMast.getIoType().equals(11)) {
			//出库，获取工作档源库位的排列层
			String sourceLocNo = wrkMast.getSourceLocNo();
			locBay = (short) Utils.getBay(sourceLocNo);
			locLev = (short) Utils.getLev(sourceLocNo);
			}
			if (crnProtocol.getBay().equals(locBay)){
			if (crnProtocol.getBay().equals(locBay)) {
			return;
			}
			// 堆垛机入库命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(crn.getId()); // 堆垛机编号
			crnCommand.setTaskNo((short)9999); // 工作号
			crnCommand.setTaskNo((short) 9999); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.XY_MOVE); // 任务模式: 站位转移
			crnCommand.setSourcePosX(locRow); // 源库位排
			@@ -801,20 +856,22 @@
			/**
			* 入库 ===>> 堆垛机站到库位
			*/
			public synchronized void crnStnToLoc(CrnSlave slave, CrnThread crnThread,Integer mark) {
			public synchronized void crnStnToLoc(CrnSlave slave, CrnThread crnThread, Integer mark) {
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { return; }
			if (crnProtocol == null) {
			return;
			}
			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			&& crnThread.isCmdFlag()) {
			News.warnNoLog(""+mark+" - 1"+" - 0"+" - 堆垛机入出库作业下发：执行入库");
			News.warnNoLog("" + mark + " - 1" + " - 0" + " - 堆垛机入出库作业下发：执行入库");
			for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
			boolean flag = false;
			// 获取堆垛机入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
			if (staProtocol == null) {
			News.infoNoLog(""+mark+" - 1"+" - 1"+" - 堆垛机入库站信息(staProtocol!=null继续执行)：staProtocol="+staProtocol);
			News.infoNoLog("" + mark + " - 1" + " - 1" + " - 堆垛机入库站信息(staProtocol!=null继续执行)：staProtocol=" + staProtocol);
			continue;
			} else {
			staProtocol = staProtocol.clone();
			@@ -822,13 +879,13 @@
			// 查询站点详细信息
			BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
			if (staDetl == null) {
			News.error(""+mark+" - 1"+" - 2"+" - 入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			News.error("" + mark + " - 1" + " - 2" + " - 入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			continue;
			}
			// 获取工作状态为2（设备上走）的入库工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
			if (null == wrkMast) {
			News.infoNoLog(""+mark+" - 1"+" - 4"+" - 查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
			News.infoNoLog("" + mark + " - 1" + " - 4" + " - 查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
			// log.error("查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
			continue;
			}
			@@ -840,21 +897,21 @@
			flag = true;
			}
			if (!flag) {
			News.errorNoLog(""+mark+" - 1"+" - 3"+" - 堆垛机入库站信息(以下需要全true):"
			+"自动信号"+staProtocol.isAutoing()+"有物信号"+staProtocol.isLoading()
			+"工作号>0"+staProtocol.getWorkNo()+"可入信号"+staProtocol.isInEnable()
			+"能入信号（wms设置）.equals(\"Y\")"+staDetl.getCanining());
			News.errorNoLog("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):"
			+ "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading()
			+ "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isInEnable()
			+ "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanining());
			continue;
			}

			// 获取库位信息
			LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
			if (locMast == null) {
			News.error(""+mark+" - 1"+" - 5"+" - 查询库存无数据--库位号{}", wrkMast.getLocNo());
			News.error("" + mark + " - 1" + " - 5" + " - 查询库存无数据--库位号{}", wrkMast.getLocNo());
			continue;
			}
			if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
			News.error(""+mark+" - 1"+" - 6"+" - 入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
			News.error("" + mark + " - 1" + " - 6" + " - 入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
			continue;
			}

			@@ -871,49 +928,49 @@

			// 双深库位且浅库位有货，则需先对浅库位进行库位移转
			if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
			News.warnNoLog(""+mark+" - 1"+" - 8"+" - 双深库位且浅库位有货，则需先对浅库位进行库位移转 : 开始执行任务号={}",wrkMast.getWrkNo());
			News.warnNoLog("" + mark + " - 1" + " - 8" + " - 双深库位且浅库位有货，则需先对浅库位进行库位移转 : 开始执行任务号={}", wrkMast.getWrkNo());
			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")) {
			News.warnNoLog(""+mark+" - 1"+" - 9"+" - // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用直接搬！库位状态={}",shallowLoc.getLocSts());
			News.warnNoLog("" + mark + " - 1" + " - 9" + " - // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用直接搬！库位状态={}", shallowLoc.getLocSts());
			WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
			if (null == waitWrkMast) {
			News.error(""+mark+" - 1"+" - 10"+" - {}库位异常，未检索到相应工作档！", shallowLocNo);
			News.error("" + mark + " - 1" + " - 10" + " - {}库位异常，未检索到相应工作档！", shallowLocNo);
			} else {
			waitWrkMast.setIoPri(15D);
			waitWrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(waitWrkMast) == 0) {
			News.error(""+mark+" - 1"+" - 11"+" - 调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			News.error("" + mark + " - 1" + " - 11" + " - 调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			}
			continue;
			}

			} else if (shallowLoc.getLocSts().equals("F") \|\| shallowLoc.getLocSts().equals("D")) {
			News.warnNoLog(""+mark+" - 1"+" - 12"+" - // F、D 库位状态={}",shallowLoc.getLocSts());
			News.warnNoLog("" + mark + " - 1" + " - 12" + " - // F、D 库位状态={}", shallowLoc.getLocSts());
			// 此标记避免多次执行移库任务
			if (Cools.isEmpty(wrkMast.getUpdMk()) \|\| "N".equals(wrkMast.getUpdMk())) {
			wrkMast.setUpdMk("Y");
			wrkMast.setIoPri(14D);
			wrkMastMapper.updateById(wrkMast);
			// 生成工作档,将浅库位移转到新的库位中
			moveLocForDeepLoc(slave, shallowLoc,mark);
			moveLocForDeepLoc(slave, shallowLoc, mark);
			// 生成工作档、改变浅库位的源库/目标库库位状态、下发堆垛机命令（立马执行)
			// moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
			}
			continue;
			} else if (shallowLoc.getLocSts().equals("Q")) {
			News.warnNoLog(""+mark+" - 1"+" - 13"+" - // Q 库位状态={}",shallowLoc.getLocSts());
			News.warnNoLog("" + mark + " - 1" + " - 13" + " - // Q 库位状态={}", shallowLoc.getLocSts());
			WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
			if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
			News.infoNoLog(""+mark+" - 1"+" - 14"+" - // F、D 工作状态(判断条件为==4)={}",waitWrkMast.getWrkSts());
			News.infoNoLog("" + mark + " - 1" + " - 14" + " - // F、D 工作状态(判断条件为==4)={}", waitWrkMast.getWrkSts());
			continue;
			}
			}
			}
			News.warnNoLog(""+mark+" - 1"+" - 15"+" - 命令下发 : 工作号={},源排={},源列={},源层={},目标排={},目标列={},目标层={}",wrkMast.getWrkNo().shortValue()
			,crnStn.getRow().shortValue(),crnStn.getBay().shortValue(),crnStn.getLev().shortValue()
			,locMast.getRow1().shortValue(),locMast.getBay1().shortValue(),locMast.getLev1().shortValue());
			News.warnNoLog("" + mark + " - 1" + " - 15" + " - 命令下发 : 工作号={},源排={},源列={},源层={},目标排={},目标列={},目标层={}", wrkMast.getWrkNo().shortValue()
			, crnStn.getRow().shortValue(), crnStn.getBay().shortValue(), crnStn.getLev().shortValue()
			, locMast.getRow1().shortValue(), locMast.getBay1().shortValue(), locMast.getLev1().shortValue());

			// 命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			@@ -929,7 +986,7 @@
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			crnCommand.setCommand((short) 1);
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			News.error(""+mark+" - 1"+" - 16"+" - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("" + mark + " - 1" + " - 16" + " - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {

			// long startTime = System.currentTimeMillis();
			@@ -950,11 +1007,11 @@
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.error(""+mark+" - 1"+" - 17"+" - 修改工作档状态 2.设备上走 => 3.吊车入库中失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("" + mark + " - 1" + " - 17" + " - 修改工作档状态 2.设备上走 => 3.吊车入库中失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			News.infoNoLog(""+mark+" - 1"+" - 0"+" - 堆垛机入出库作业下发：入库执行完毕");
			News.infoNoLog("" + mark + " - 1" + " - 0" + " - 堆垛机入出库作业下发：入库执行完毕");
			}
			}

			@@ -962,13 +1019,15 @@
			* 出库 ===>> 库位到堆垛机站
			* 2022-06-09 TQS修改，查询工作档LIST，遍历下发，防止第一个任务堵塞出库
			*/
			public synchronized void locToCrnStn(CrnSlave slave, CrnThread crnThread,Integer mark) {
			public synchronized void locToCrnStn(CrnSlave slave, CrnThread crnThread, Integer mark) {
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { return; }
			if (crnProtocol == null) {
			return;
			}
			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			&& crnThread.isCmdFlag()) {
			News.warnNoLog(""+mark+" - 2"+" - 0"+" - 堆垛机入出库作业下发：执行出库");
			News.warnNoLog("" + mark + " - 2" + " - 0" + " - 堆垛机入出库作业下发：执行出库");
			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			// 获取工作状态为11（生成出库ID）的出库工作档
			// WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
			@@ -979,20 +1038,20 @@
			}
			// 工作档状态判断
			if (wrkMast.getIoType() < 100 \|\| wrkMast.getSourceStaNo() == null) {
			News.error(""+mark+" - 2"+" - 1"+" - 查询工作档数据不符合条件--入出类型/站点, 工作号={}，源库位={}，入出类型={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
			News.error("" + mark + " - 2" + " - 1" + " - 查询工作档数据不符合条件--入出类型/站点, 工作号={}，源库位={}，入出类型={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
			continue;
			}
			// 获取源库位信息
			LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
			if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) {
			News.error(""+mark+" - 2"+" - 2"+" - 出库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), sourceSta.getLocSts());
			News.error("" + mark + " - 2" + " - 2" + " - 出库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), sourceSta.getLocSts());
			continue;
			}
			// 获取堆垛机出库站信息
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
			if (staProtocol == null) {
			News.infoNoLog(""+mark+" - 2"+" - 3"+" - 堆垛机出库站信息(staProtocol!=null继续执行,否则循环终止)：staProtocol="+staProtocol);
			News.infoNoLog("" + mark + " - 2" + " - 3" + " - 堆垛机出库站信息(staProtocol!=null继续执行,否则循环终止)：staProtocol=" + staProtocol);
			break;
			// continue;
			} else {
			@@ -1009,7 +1068,7 @@
			// 查询站点详细信息
			BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
			if (staDetl == null) {
			News.error(""+mark+" - 2"+" - 5"+" - 出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			News.error("" + mark + " - 2" + " - 5" + " - 出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			break;
			// continue;
			}
			@@ -1026,12 +1085,12 @@

			// 双深库位且浅库位有货，则需先对浅库位进行库位移转
			if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
			News.warnNoLog(""+mark+" - 2"+" - 6"+" - 双深库位且浅库位有货，则需先对浅库位进行库位移转 : 开始执行任务号={}",wrkMast.getWrkNo());
			News.warnNoLog("" + mark + " - 2" + " - 6" + " - 双深库位且浅库位有货，则需先对浅库位进行库位移转 : 开始执行任务号={}", wrkMast.getWrkNo());
			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")) {
			News.warnNoLog(""+mark+" - 2"+" - 7"+" - // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用直接搬！库位状态={}",shallowLoc.getLocSts());
			News.warnNoLog("" + mark + " - 2" + " - 7" + " - // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用直接搬！库位状态={}", shallowLoc.getLocSts());
			WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
			if (null == waitWrkMast) {
			News.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
			@@ -1040,7 +1099,7 @@
			waitWrkMast.setIoPri(15D);
			waitWrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(waitWrkMast) == 0) {
			News.error(""+mark+" - 2"+" - 8"+" - 调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			News.error("" + mark + " - 2" + " - 8" + " - 调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			}
			continue;
			} else {
			@@ -1048,7 +1107,7 @@
			}
			}
			} else if (shallowLoc.getLocSts().equals("F") \|\| shallowLoc.getLocSts().equals("D")) {
			News.warnNoLog(""+mark+" - 2"+" - 9"+" - // F、D 库位状态={}",shallowLoc.getLocSts());
			News.warnNoLog("" + mark + " - 2" + " - 9" + " - // F、D 库位状态={}", shallowLoc.getLocSts());
			// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
			//2022-08-16 modify,不根据updmk标记移库任务(容易被取消导致堵塞)，查询工作档是否存在任务
			WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
			@@ -1059,15 +1118,15 @@
			wrkMast.setUpdMk("Y");
			wrkMastMapper.updateById(wrkMast);
			// 生成工作档,将浅库位移转到新的库位中
			moveLocForDeepLoc(slave, shallowLoc,mark);
			moveLocForDeepLoc(slave, shallowLoc, mark);
			}
			News.error("{}任务出库失败，浅库位堵塞！浅库位号:{}", wrkMast.getWrkNo(), shallowLocNo);
			continue;
			} else if (shallowLoc.getLocSts().equals("Q") \|\| shallowLoc.getLocSts().equals("S")) {
			News.warnNoLog(""+mark+" - 2"+" - 10"+" - // Q、S 库位状态={}",shallowLoc.getLocSts());
			News.warnNoLog("" + mark + " - 2" + " - 10" + " - // Q、S 库位状态={}", shallowLoc.getLocSts());
			WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
			if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
			News.infoNoLog(""+mark+" - 2"+" - 11"+" - // F、D 工作状态(判断条件为==4)={}",waitWrkMast.getWrkSts());
			News.infoNoLog("" + mark + " - 2" + " - 11" + " - // F、D 工作状态(判断条件为==4)={}", waitWrkMast.getWrkSts());
			continue;
			}
			}
			@@ -1079,9 +1138,9 @@
			// return;
			}

			News.warnNoLog(""+mark+" - 2"+" - 12"+" - 命令下发 : 工作号={},源排={},源列={},源层={},目标排={},目标列={},目标层={}",wrkMast.getWrkNo().shortValue()
			,sourceSta.getRow1().shortValue(),sourceSta.getBay1().shortValue(),sourceSta.getLev1().shortValue()
			,crnStn.getRow().shortValue(),crnStn.getBay().shortValue(),crnStn.getLev().shortValue());
			News.warnNoLog("" + mark + " - 2" + " - 12" + " - 命令下发 : 工作号={},源排={},源列={},源层={},目标排={},目标列={},目标层={}", wrkMast.getWrkNo().shortValue()
			, sourceSta.getRow1().shortValue(), sourceSta.getBay1().shortValue(), sourceSta.getLev1().shortValue()
			, crnStn.getRow().shortValue(), crnStn.getBay().shortValue(), crnStn.getLev().shortValue());

			// 1.堆垛机开始移动
			CrnCommand crnCommand = new CrnCommand();
			@@ -1097,7 +1156,7 @@
			crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			crnCommand.setCommand((short) 1);
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			News.error(""+mark+" - 2"+" - 13"+" - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("" + mark + " - 2" + " - 13" + " - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 11.生成出库ID => 12.吊车出库中
			Date now = new Date();
			@@ -1105,14 +1164,14 @@
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.error(""+mark+" - 2"+" - 14"+" - 修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("" + mark + " - 2" + " - 14" + " - 修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			}
			break;
			}
			}
			}
			}
			News.infoNoLog(""+mark+" - 2"+" - 0"+" - 堆垛机入出库作业下发：出库执行完毕");
			News.infoNoLog("" + mark + " - 2" + " - 0" + " - 堆垛机入出库作业下发：出库执行完毕");
			}
			}

			@@ -1236,17 +1295,17 @@
			/**
			* 库位移转
			*/
			public synchronized void locToLoc(CrnSlave slave, CrnProtocol crnProtocol,Integer mark) {
			public synchronized void locToLoc(CrnSlave slave, CrnProtocol crnProtocol, Integer mark) {
			// 获取工作档信息
			WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
			if (null == wrkMast) {
			return;
			}
			News.warnNoLog(""+mark+" - 3"+" - 0"+" - 堆垛机入出库作业下发：执行库位移转");
			News.warnNoLog("" + mark + " - 3" + " - 0" + " - 堆垛机入出库作业下发：执行库位移转");
			// 获取源库位信息
			LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
			if (null == sourceSta) {
			News.error(""+mark+" - 3"+" - 1"+" - 工作档库位移转失败，原因：检索源库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
			News.error("" + mark + " - 3" + " - 1" + " - 工作档库位移转失败，原因：检索源库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
			return;
			}
			// 源库位库位状态判断
			@@ -1256,7 +1315,7 @@
			// 获取目标库位信息
			LocMast sta = locMastService.selectById(wrkMast.getLocNo());
			if (null == sta) {
			News.error(""+mark+" - 3"+" - 2"+" - 工作档库位移转失败，原因：检索目标库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
			News.error("" + mark + " - 3" + " - 2" + " - 工作档库位移转失败，原因：检索目标库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
			return;
			}
			// 获取堆垛机信息并判断是否可入出
			@@ -1275,9 +1334,9 @@
			return;
			}

			News.warnNoLog(""+mark+" - 3"+" - 3"+" - 命令下发 : 工作号={},源排={},源列={},源层={},目标排={},目标列={},目标层={}",wrkMast.getWrkNo().shortValue()
			,sourceSta.getRow1().shortValue(),sourceSta.getBay1().shortValue(),sourceSta.getLev1().shortValue()
			,sta.getRow1().shortValue(),sta.getBay1().shortValue(),sta.getLev1().shortValue());
			News.warnNoLog("" + mark + " - 3" + " - 3" + " - 命令下发 : 工作号={},源排={},源列={},源层={},目标排={},目标列={},目标层={}", wrkMast.getWrkNo().shortValue()
			, sourceSta.getRow1().shortValue(), sourceSta.getBay1().shortValue(), sourceSta.getLev1().shortValue()
			, sta.getRow1().shortValue(), sta.getBay1().shortValue(), sta.getLev1().shortValue());

			// 命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			@@ -1293,7 +1352,7 @@
			crnCommand.setDestinationPosZ(sta.getLev1().shortValue()); // 目标库位层
			crnCommand.setCommand((short) 1);
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			News.error(""+mark+" - 3"+" - 4"+" - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			News.error("" + mark + " - 3" + " - 4" + " - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 11.生成出库ID => 12.吊车出库中
			Date now = new Date();
			@@ -1301,10 +1360,10 @@
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.error(""+mark+" - 3"+" - 5"+" - 【库位移转】修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			News.error("" + mark + " - 3" + " - 5" + " - 【库位移转】修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			News.infoNoLog(""+mark+" - 3"+" - 0"+" - 堆垛机入出库作业下发：库位移转完成");
			News.infoNoLog("" + mark + " - 3" + " - 0" + " - 堆垛机入出库作业下发：库位移转完成");

			}

			@@ -1322,7 +1381,7 @@
			}
			// 状态：等待确认并且任务完成位 = 1
			if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行对工作档的完成操作");
			News.warnNoLog("" + mark + " - 0" + " - 开始执行对工作档的完成操作");
			if (crnProtocol.getTaskNo() == 9999) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			@@ -1330,7 +1389,7 @@
			// 获取入库待确认工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep3(Integer.valueOf(crnProtocol.getTaskNo()));
			if (wrkMast == null) {
			News.error(""+mark+" - 1"+" - 堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
			News.error("" + mark + " - 1" + " - 堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
			continue;
			}
			// 入库 + 库位转移 ==> 4.入库完成
			@@ -1345,14 +1404,14 @@
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			News.warnNoLog(""+mark+" - 2"+" - 修改成功后复位堆垛机 : 堆垛机号={}",crnThread.getCrnProtocol().getCrnNo());
			News.warnNoLog("" + mark + " - 2" + " - 修改成功后复位堆垛机 : 堆垛机号={}", crnThread.getCrnProtocol().getCrnNo());
			crnThread.setResetFlag(true);
			}
			}

			}
			}
			News.infoNoLog(""+mark+" - 0"+" - 对工作档的完成操作执行完成");
			News.infoNoLog("" + mark + " - 0" + " - 对工作档的完成操作执行完成");
			}

			/**
			@@ -1375,7 +1434,7 @@
			BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
			// 有异常
			if (latest == null) {
			News.warnNoLog(""+mark+" - 1"+" - 开始执行：堆垛机异常信息记录：有任务，有异常");
			News.warnNoLog("" + mark + " - 1" + " - 开始执行：堆垛机异常信息记录：有任务，有异常");
			if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
			WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
			if (wrkMast == null) {
			@@ -1407,7 +1466,7 @@
			"任务中异常" // 备注
			);
			if (!basErrLogService.insert(basErrLog)) {
			News.error(""+mark+" - 2"+" - 堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
			News.error("" + mark + " - 2" + " - 堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
			}
			}
			} else {
			@@ -1417,7 +1476,7 @@
			latest.setUpdateTime(now);
			latest.setStatus(2);
			if (!basErrLogService.updateById(latest)) {
			News.error(""+mark+" - 3"+" - 堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
			News.error("" + mark + " - 3" + " - 堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
			}
			}
			}
			@@ -1426,7 +1485,7 @@
			BasErrLog latest = basErrLogService.findLatest(crn.getId());
			// 有异常
			if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
			News.warnNoLog(""+mark+" - 4"+" - 开始执行：堆垛机异常信息记录：无任务，有异常");
			News.warnNoLog("" + mark + " - 4" + " - 开始执行：堆垛机异常信息记录：无任务，有异常");
			// 记录新异常
			if (latest == null \|\| (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
			@@ -1455,7 +1514,7 @@
			"无任务异常" // 备注
			);
			if (!basErrLogService.insert(basErrLog)) {
			News.error(""+mark+" - 5"+" - 堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
			News.error("" + mark + " - 5" + " - 堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
			}
			}
			// 无异常
			@@ -1466,7 +1525,7 @@
			latest.setUpdateTime(now);
			latest.setStatus(2);
			if (!basErrLogService.updateById(latest)) {
			News.error(""+mark+" - 6"+" - 堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
			News.error("" + mark + " - 6" + " - 堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
			}
			}
			}
			@@ -1474,7 +1533,7 @@
			}

			}
			News.infoNoLog(""+mark+" - 0"+" - 堆垛机异常信息记录执行完成");
			News.infoNoLog("" + mark + " - 0" + " - 堆垛机异常信息记录执行完成");
			}


			@@ -1498,7 +1557,7 @@
			}

			LedThread ledThread = null;
			if (!Cools.isEmpty(emptyInSta.getLed())) {
			if (!Cools.isEmpty(emptyInSta.getLed())) {
			ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, emptyInSta.getLed());
			}

			@@ -1510,8 +1569,14 @@
			&& staProtocol.isPakMk()
			&& staProtocol.isLoading()
			) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行：空栈板初始化入库,叉车入库站放货");

			News.warnNoLog("" + mark + " - 0" + " - 开始执行：空栈板初始化入库,叉车入库站放货");
			// 判断上一个空托入库写入后，线程还读取到，造成重复请求
			List<WrkMast> wrkMastList = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 2)
			.eq("io_type", 10).eq("source_sta_no", emptyInSta.getStaNo()));
			if (!wrkMastList.isEmpty()) {
			log.warn("查询到一个在设备上走任务：{}", wrkMastList.get(0).getWrkNo());
			continue;
			}
			try {
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			@@ -1535,31 +1600,41 @@
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			News.errorNoLog(""+mark+" - 1"+" - 更新plc站点信息失败");
			News.errorNoLog("" + mark + " - 1" + " - 更新plc站点信息失败");
			throw new CoolException("更新plc站点信息失败");
			}

			if (ledThread != null) {
			// 命令集合
			List<LedCommand> commands = new ArrayList<>();
			// 组装命令
			LedCommand ledCommand = new LedCommand();
			ledCommand.setWorkNo(dto.getWorkNo());
			ledCommand.setIoType(1);
			ledCommand.setTitle("全板入库");
			ledCommand.setIoType(10);
			ledCommand.setTitle("空板入库");
			ledCommand.setLocNo(dto.getLocNo());
			ledCommand.setStaNo(dto.getStaNo());
			ledCommand.setBarcode("");
			ArrayList<MatDto> matDtos = new ArrayList<>();
			MatDto matDto = new MatDto();
			matDto.setLocNo(dto.getLocNo());
			matDtos.add(matDto);
			ledCommand.setMatDtos(matDtos);
			commands.add(ledCommand);
			MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, commands));
			if (devp.getId() == 1) {
			// MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(1, commands));
			} else {
			MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, commands));
			}
			// ledThread.errorReset();
			}
			Thread.sleep(1000);
			} else {
			staProtocol.setWorkNo((short)9991);
			staProtocol.setStaNo((short)100);
			staProtocol.setWorkNo((short) 9991);
			staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			News.errorNoLog(""+mark+" - 2"+" - 更新plc站点信息失败");
			News.errorNoLog("" + mark + " - 2" + " - 更新plc站点信息失败");
			throw new CoolException("更新plc站点信息失败");
			}

			@@ -1569,7 +1644,7 @@
			MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(5, errorMsg));
			}
			}
			News.error(""+mark+" - 3"+" - 请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			News.error("" + mark + " - 3" + " - 空板入库请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}
			} catch (Exception e) {
			e.printStackTrace();
			@@ -1577,13 +1652,13 @@
			}

			} else {
			News.errorNoLog(""+mark+" - 4"+" - 站点信息不符合入库条件！！！"+" 自动信号："+staProtocol.isAutoing()+"、可入信号：" + staProtocol.isInEnable()
			+"、空板信号："+ staProtocol.isEmptyMk()+"、工作号：" + staProtocol.getWorkNo()
			+"、锁定标记"+ staProtocol.isPakMk());
			News.errorNoLog("" + mark + " - 4" + " - 站点信息不符合入库条件！！！" + " 自动信号：" + staProtocol.isAutoing() + "、可入信号：" + staProtocol.isInEnable()
			+ "、空板信号：" + staProtocol.isEmptyMk() + "、工作号：" + staProtocol.getWorkNo()
			+ "、锁定标记" + staProtocol.isPakMk());
			}
			}
			}
			News.infoNoLog(""+mark+" - 0"+" - 空栈板初始化入库,叉车入库站放货执行完成");
			News.infoNoLog("" + mark + " - 0" + " - 空栈板初始化入库,叉车入库站放货执行完成");
			}

			/**
			@@ -1599,6 +1674,9 @@
			// 工作档集合
			List<WrkMast> wrkMasts = new ArrayList<>();
			for (Integer staNo : led.getStaArr()) {
			if (staNo == 104 \|\| staNo == 204 \|\| staNo == 304) {
			continue;
			}
			// 获取叉车站点
			StaProtocol staProtocol = devpThread.getStation().get(staNo);
			if (null == staProtocol \|\| null == staProtocol.getWorkNo() \|\| 0 == staProtocol.getWorkNo() \|\| !staProtocol.isLoading()) {
			@@ -1612,7 +1690,7 @@
			if (null == wrkMast) {
			continue;
			}
			News.warnNoLog(""+mark+" - 0"+" - 开始执行:出库 ===>> 工作档信息写入led显示器");
			News.warnNoLog("" + mark + " - 0" + " - 开始执行:出库 ===>> 工作档信息写入led显示器");
			wrkMasts.add(wrkMast);
			// 组装命令
			LedCommand ledCommand = new LedCommand();
			@@ -1643,7 +1721,7 @@
			ledCommand.setEmptyMk(true);
			break;
			default:
			News.error(""+mark+" - 1"+" - 任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
			News.error("" + mark + " - 1" + " - 任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
			break;
			}
			ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
			@@ -1653,7 +1731,7 @@
			// ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
			if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
			List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
			wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getSpecs(),wrkDetl.getBatch(),wrkDetl.getMemo())));
			wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getBatch(), wrkDetl.getMemo())));
			}
			commands.add(ledCommand);
			}
			@@ -1668,14 +1746,14 @@
			if (!commands.isEmpty()) {
			if (led.getId() == 3) {
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
			News.error(""+mark+" - 2"+" - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			News.error("" + mark + " - 2" + " - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			continue;
			} else {
			ledThread.setLedMk(false);
			}
			} else {
			} else if (led.getId() == 1 \|\| led.getId() == 2) {
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
			News.error(""+mark+" - 3"+" - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			News.error("" + mark + " - 3" + " - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			continue;
			} else {
			ledThread.setLedMk(false);
			@@ -1699,7 +1777,7 @@
			wrkMast.setOveMk("Y");
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.errorNoLog(""+mark+" - 4"+" - 更新工作档失败");
			News.errorNoLog("" + mark + " - 4" + " - 更新工作档失败");
			throw new CoolException("更新工作档失败");
			}
			}
			@@ -1713,7 +1791,7 @@
			}

			}
			News.infoNoLog(""+mark+" - 0"+" - 出库 ===>> 工作档信息写入led显示器执行完成");
			News.infoNoLog("" + mark + " - 0" + " - 出库 ===>> 工作档信息写入led显示器执行完成");
			}

			/**
			@@ -1721,7 +1799,7 @@
			*/
			public synchronized void ledReset(Integer mark) {

			News.warnNoLog(""+mark+" - 0"+" - 开始执行:其他 ===>> LED显示器复位，显示默认信息");
			News.warnNoLog("" + mark + " - 0" + " - 开始执行:其他 ===>> LED显示器复位，显示默认信息");
			for (LedSlave led : slaveProperties.getLed()) {

			// 获取输送线plc线程
			@@ -1744,14 +1822,23 @@
			// led显示默认内容
			if (reset && !ledThread.isLedMk()) {
			ledThread.setLedMk(true);
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) {
			News.error(""+mark+" - 1"+" - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			} else {
			if (led.getId() <= 2) {
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
			News.error("" + mark + " - 1" + " - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			} else {

			}
			} else {
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) {
			News.error("" + mark + " - 1" + " - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			} else {

			}
			}

			}
			}
			News.infoNoLog(""+mark+" - 0"+" - 执行完成：其他 ===>> LED显示器复位，显示默认信息");
			News.infoNoLog("" + mark + " - 0" + " - 执行完成：其他 ===>> LED显示器复位，显示默认信息");
			}

			/**
			@@ -1834,10 +1921,10 @@
			* 因双深库位阻塞，对浅库位进行移转（立即执行版)
			* tip：同步
			*/
			private synchronized void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc,Integer mark) {
			private synchronized void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc, Integer mark) {

			try {
			News.warnNoLog(""+mark+"moveLocForDeepLoc"+" - 0"+" - 开始执行:因双深库位阻塞，对浅库位进行移转（立即执行版)");
			News.warnNoLog("" + mark + "moveLocForDeepLoc" + " - 0" + " - 开始执行:因双深库位阻塞，对浅库位进行移转（立即执行版)");
			List<Integer> rows = locMastService.queryDistinctRow(crn.getId());
			LocMast loc = null;
			for (Integer row : rows) {
			@@ -1879,7 +1966,7 @@
			}

			if (null == loc) {
			News.error(""+mark+"moveLocForDeepLoc"+" - 1"+" - 双深库位 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			News.error("" + mark + "moveLocForDeepLoc" + " - 1" + " - 双深库位 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("双深库位 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			}

			@@ -1905,7 +1992,7 @@
			wrkMast.setModiTime(new Date());
			int res = wrkMastMapper.insert(wrkMast);
			if (res == 0) {
			News.errorNoLog(""+mark+"moveLocForDeepLoc"+" - 2"+" - 保存工作档失败");
			News.errorNoLog("" + mark + "moveLocForDeepLoc" + " - 2" + " - 保存工作档失败");
			throw new CoolException("保存工作档失败");
			}
			// 工作档明细保存
			@@ -1920,7 +2007,7 @@
			wrkDetl.setAppeTime(new Date());
			wrkDetl.setModiTime(new Date());
			if (!wrkDetlService.insert(wrkDetl)) {
			News.errorNoLog(""+mark+"moveLocForDeepLoc"+" - 3"+" - 保存工作档明细失败");
			News.errorNoLog("" + mark + "moveLocForDeepLoc" + " - 3" + " - 保存工作档明细失败");
			throw new CoolException("保存工作档明细失败");
			}
			}
			@@ -1930,11 +2017,11 @@
			shallowLoc.setLocSts("R"); // R.出库预约
			shallowLoc.setModiTime(new Date());
			if (!locMastService.updateById(shallowLoc)) {
			News.errorNoLog(""+mark+"moveLocForDeepLoc"+" - 4"+" - 更新源库位状态失败");
			News.errorNoLog("" + mark + "moveLocForDeepLoc" + " - 4" + " - 更新源库位状态失败");
			throw new CoolException("更新源库位状态失败");
			}
			} else {
			News.errorNoLog(""+mark+"moveLocForDeepLoc"+" - 5"+" - 源库位出库失败");
			News.errorNoLog("" + mark + "moveLocForDeepLoc" + " - 5" + " - 源库位出库失败");
			throw new CoolException("源库位出库失败");
			}
			// 修改目标库位状态
			@@ -1942,15 +2029,15 @@
			loc.setLocSts("S"); // S.入库预约
			loc.setModiTime(new Date());
			if (!locMastService.updateById(loc)) {
			News.errorNoLog(""+mark+"moveLocForDeepLoc"+" - 6"+" - 更新目标库位状态失败");
			News.errorNoLog("" + mark + "moveLocForDeepLoc" + " - 6" + " - 更新目标库位状态失败");
			throw new CoolException("更新目标库位状态失败");
			}
			} else {
			News.errorNoLog(""+mark+"moveLocForDeepLoc"+" - 7"+" - 移转失败");
			News.errorNoLog("" + mark + "moveLocForDeepLoc" + " - 7" + " - 移转失败");
			throw new CoolException("移转失败");
			}
			} catch (Exception e) {
			News.error(""+mark+"moveLocForDeepLoc"+" - 8"+" - 双深库位阻塞，对浅库位进行移转失败", e);
			News.error("" + mark + "moveLocForDeepLoc" + " - 8" + " - 双深库位阻塞，对浅库位进行移转失败", e);
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			@@ -1965,7 +2052,9 @@
			if (!crn.getDemo()) {
			continue;
			} // 必须为演示状态

			if (crn.getId() != 4) {
			continue;
			}
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) {
			@@ -2173,18 +2262,18 @@
			public synchronized void outOfDevp(Integer mark) {

			List<WrkMast> wrkMasts = wrkMastMapper.selectPick();
			if (wrkMasts.size()!=0){
			News.warnNoLog(""+mark+" - 0"+" - 开始执行outOfDevp");
			if (wrkMasts.size() != 0) {
			News.warnNoLog("" + mark + " - 0" + " - 开始执行outOfDevp");
			}
			for (WrkMast wrkMast : wrkMasts) {
			if (basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo())) == 0) {
			wrkMast.setCtnNo("Y");
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.error(""+mark+" - 1"+" - 修改{}工作档失败，ctn_no", wrkMast.getWrkNo());
			News.error("" + mark + " - 1" + " - 修改{}工作档失败，ctn_no", wrkMast.getWrkNo());
			}
			}
			}
			News.infoNoLog(""+mark+" - 0"+" - outOfDevp执行完成");
			News.infoNoLog("" + mark + " - 0" + " - outOfDevp执行完成");
			}


			@@ -2218,7 +2307,7 @@
			JSONObject data = (JSONObject) jsonObject.get("data");
			News.info((String) data.get("msg"));
			} else {
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/auto/emptyOut/v1","", response);
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/auto/emptyOut/v1", "", response);
			}
			} catch (Exception e) {
			e.printStackTrace();
			@@ -2266,10 +2355,11 @@
			}

			/**
			* 接收超宽超高没扫到条码报警
			* 接收超宽超高没扫到条码报警
			*
			* @param mark
			*/
			public synchronized void DevpCallThePolice(Integer mark){
			public synchronized void DevpCallThePolice(Integer mark) {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) { //遍历输送线
			// 遍历入库口
			@@ -2277,45 +2367,59 @@
			// 获取入库站信息
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
			if(null != devpThread){
			boolean fig=false;
			for (int i=0;i<8;i++){
			switch (i){
			case 0: if(devpThread.startSignal[i]){
			log.error("前超报警");
			fig=true;
			};
			case 1: if(devpThread.startSignal[i]){
			log.error("后超报警");
			fig=true;
			};
			case 2: if(devpThread.startSignal[i]){
			log.error("高超报警");
			fig=true;
			};
			case 3: if(devpThread.startSignal[i]){
			log.error("左超报警");
			fig=true;
			};
			case 4: if(devpThread.startSignal[i]){
			log.error("右超报警");
			fig=true;
			};
			case 5: if(devpThread.startSignal[i]){
			log.error("超重报警");
			fig=true;
			};
			case 6: if(devpThread.startSignal[i]){
			log.error("未扫到码报警");
			fig=true;
			};
			if (null != devpThread) {
			boolean fig = false;
			for (int i = 0; i < 8; i++) {
			switch (i) {
			case 0:
			if (devpThread.startSignal[i]) {
			log.error("前超报警");
			fig = true;
			}
			;
			case 1:
			if (devpThread.startSignal[i]) {
			log.error("后超报警");
			fig = true;
			}
			;
			case 2:
			if (devpThread.startSignal[i]) {
			log.error("高超报警");
			fig = true;
			}
			;
			case 3:
			if (devpThread.startSignal[i]) {
			log.error("左超报警");
			fig = true;
			}
			;
			case 4:
			if (devpThread.startSignal[i]) {
			log.error("右超报警");
			fig = true;
			}
			;
			case 5:
			if (devpThread.startSignal[i]) {
			log.error("超重报警");
			fig = true;
			}
			;
			case 6:
			if (devpThread.startSignal[i]) {
			log.error("未扫到码报警");
			fig = true;
			}
			;

			}
			}
			//发生报警，退回入库口
			if(fig){
			staProtocol.setWorkNo((short)9991);
			staProtocol.setStaNo((short)100);
			if (fig) {
			staProtocol.setWorkNo((short) 9991);
			staProtocol.setStaNo((short) 100);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			@@ -2324,4 +2428,16 @@
			}
			}

			public void resetOneLed() {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) { //遍历输送线
			if (devp.getId() == 1) {
			// 遍历入库口
			for (DevpSlave.Sta inSta : devp.getInSta()) { // 遍历入库口
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
			}
			}
			}
			}
			}