zy-wcs.git - Gitblit

			@@ -8,6 +8,7 @@
			import com.core.common.DateUtils;
			import com.core.common.R;
			import com.core.exception.CoolException;
			import com.zy.asrs.domain.enums.LedErrorAreaType;
			import com.zy.asrs.domain.enums.WorkNoType;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.mapper.*;
			@@ -59,7 +60,10 @@
			// private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
			private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};

			private static final Integer jarMaxLoc = 7;
			// private static final Integer jarMaxLoc1 = 7;
			private static Integer jarMaxLoc = 0;
			// private static Integer signBigTurn = 0;
			// private static Integer signSmallTurn = 0;
			private static final Float jarTemperature = 50F;
			@Autowired
			private CommonService commonService;
			@@ -139,7 +143,7 @@

			if (!Cools.isEmpty(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			if ("00000000".endsWith(barcode) \|\| "NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			continue;
			}
			} else {
			@@ -190,10 +194,7 @@
			// 退回
			if (back) {
			// led 异常显示
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			if (ledThread != null) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg));
			}
			LedErrorThreadUtil.ledErrorThread(errMsg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
			continue;
			}

			@@ -227,12 +228,12 @@
			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
			if (wrkMast != null) {
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo(wrkMast.getStaNo());

			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,238);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			@@ -265,7 +266,7 @@
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());


			barcodeThread.setBarcode("");
			@@ -277,12 +278,212 @@
			staProtocol.setStaNo(dto.getRgvSstaNo());
			}

			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,283);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			} else {
			// led 异常显示
			LedErrorThreadUtil.ledErrorThread("入库请求失败"+jsonObject.getInteger("code"),inSta.getLed(), LedErrorAreaType.ONE_OTHER.getDesc());
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}

			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}

			}


			}
			}

			}
			public synchronized void generateStoreWrkFile464() {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历入库口
			for (DevpSlave.Sta inSta : devp.getInSta464()) {
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();

			if (!Cools.isEmpty(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if ("00000000".endsWith(barcode) \|\| "NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			continue;
			}
			} else {
			continue;
			}

			// 获取入库站信息
			// SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}

			// 尺寸检测异常
			boolean back = false;
			String errMsg = inSta.getStaNo()+"站点：";
			if (staProtocol.isFrontErr()) {
			errMsg = errMsg+"前超限；";
			back = true;
			}
			if (staProtocol.isBackErr()) {
			errMsg = errMsg+"后超限";
			back = true;
			}
			if (staProtocol.isHighErr()) {
			errMsg = errMsg+"高超限";
			back = true;
			}
			if (staProtocol.isLeftErr()) {
			errMsg = errMsg+"左超限";
			back = true;
			}
			if (staProtocol.isRightErr()) {
			errMsg = errMsg+"右超限";
			back = true;
			}
			if (staProtocol.isWeightErr()) {
			errMsg = errMsg+"超重";
			back = true;
			}
			if (staProtocol.isBarcodeErr()) {
			errMsg = errMsg+"扫码失败";
			back = true;
			}
			// 退回
			if (back) {
			// led 异常显示
			LedErrorThreadUtil.ledErrorThread(errMsg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
			continue;
			}

			// 入出库模式判断
			// if ( inSta.getStaNo()==203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) { continue; }
			// if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
			// continue;
			// }

			// 判断是否满足入库条件
			if (staProtocol.isAutoing()
			&& staProtocol.isLoading()
			&& staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk()
			&& staProtocol.getWorkNo() == 0
			&& staProtocol.isPakMk()) {// && !Cools.isEmpty(barcode)) {

			// if(Cools.isEmpty(barcode) \|\| "NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			// //条码为空或者不符合，退库到172站点
			// staProtocol.setWorkNo((short)32222);
			// staProtocol.setStaNo((short)172);
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// if (!result) {
			// throw new CoolException("更新plc站点信息失败");
			// }
			// continue;
			// }

			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
			if (wrkMast != null) {
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo(wrkMast.getStaNo());

			devpThread.setPakMk(staProtocol.getSiteId(), false,422);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			return;
			}
			// // 获取入库通知档
			// List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
			// if (waitPakins.isEmpty()) {
			// log.error("无此入库条码数据。条码号={}", barcode);
			// continue;
			// }

			try {

			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			SearchLocParam param = new SearchLocParam();
			param.setBarcode(barcode);
			param.setIoType(1);
			param.setSourceStaNo(inSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());


			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(dto.getWorkNo());

			if(Cools.isEmpty(dto.getRgvNo()) \|\| dto.getRgvNo() <= 0) {
			staProtocol.setStaNo(607);//607
			} else {//如果存在RGV编号，说明需要RGV接驳，先下发任务到RGV源站
			staProtocol.setStaNo(dto.getRgvSstaNo());
			}

			devpThread.setPakMk(staProtocol.getSiteId(), false,467);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			} else if (jsonObject.getInteger("code").equals(700)){
			SearchLocParam param2 = new SearchLocParam();
			param2.setBarcode(barcode);
			param2.setSourceStaNo(inSta.getStaNo());
			param2.setLocType1(locTypeDto.getLocType1());
			String response2 = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/yx/loc/v464")
			.setJson(JSON.toJSONString(param2))
			.build()
			.doPost();
			JSONObject jsonObject2 = JSON.parseObject(response2);
			if (jsonObject2.getInteger("code").equals(200)) {
			log.info("464紧急站点自动组托成功！！");
			} else {
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/yx/loc/v464", JSON.toJSONString(param), response);

			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

			if (ledThread != null) {
			ErrMsg errMsg1 = new ErrMsg();
			errMsg1.setErrMsg("入库失败!站点号："+inSta.getStaNo());
			errMsg1.setArea("1");
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
			}
			}
			} else {
			// led 异常显示
			LedErrorThreadUtil.ledErrorThread("入库请求失败"+jsonObject.getInteger("code"),inSta.getLed(), LedErrorAreaType.ONE_OTHER.getDesc());
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}

			@@ -317,7 +518,7 @@

			if (!Cools.isEmpty(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			if ("00000000".endsWith(barcode) \|\| "NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			continue;
			}
			} else {
			@@ -336,7 +537,7 @@

			// 尺寸检测异常
			boolean back = false;
			String errMsg = "异常：";
			String errMsg = inSta.getStaNo()+"站点：";
			if (staProtocol.isFrontErr()) {
			errMsg = errMsg+"前超限；";
			back = true;
			@@ -368,10 +569,7 @@
			// 退回
			if (back) {
			// led 异常显示
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			if (ledThread != null) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg));
			}
			LedErrorThreadUtil.ledErrorThread(errMsg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
			continue;
			}

			@@ -399,6 +597,8 @@
			// if (!result) {
			// throw new CoolException("更新plc站点信息失败");
			// }
			String msg =inSta.getStaNo()+"站点条码异常,条码="+barcode;
			LedErrorThreadUtil.ledErrorThread(msg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
			continue;
			}

			@@ -407,12 +607,20 @@
			if (wrkMast111 != null) {
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(wrkMast111.getWrkNo());
			staProtocol.setStaNo(wrkMast111.getStaNo());
			StaProtocol staProtocol1 = new StaProtocol();
			staProtocol1.setSiteId(staProtocol.getSiteId());
			staProtocol1.setWorkNo(wrkMast111.getWrkNo());
			staProtocol1.setStaNo(wrkMast111.getStaNo());

			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			devpThread.setPakMk(staProtocol1.getSiteId(), false,637);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol1));
			if (!result) {
			if (ledThread != null) {
			ErrMsg errMsg1 = new ErrMsg();
			errMsg1.setErrMsg("更新plc站点信息失败!站点号："+inSta.getStaNo());
			errMsg1.setArea("1");
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
			}
			throw new CoolException("更新plc站点信息失败");
			}
			return;
			@@ -422,6 +630,8 @@
			WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
			if (wrkMast != null) {
			log.error("工作档中已存在该站状态为（ 2.设备上走）的数据,工作号={}", wrkMast.getWrkNo());
			String msg ="工作档中已存在"+inSta.getStaNo()+"站点数据,工作号="+wrkMast.getWrkNo();
			LedErrorThreadUtil.ledErrorThread(msg,inSta.getLed(),LedErrorAreaType.TWO_PAKIN.getDesc());
			continue;
			}
			// // 获取入库通知档
			@@ -451,37 +661,45 @@
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

			StaProtocol staProtocol1 = new StaProtocol();
			staProtocol1.setSiteId(staProtocol.getSiteId());

			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol1.setWorkNo(dto.getWorkNo());

			if(Cools.isEmpty(dto.getRgvNo()) \|\| dto.getRgvNo() <= 0) {
			staProtocol.setStaNo(dto.getStaNo());
			staProtocol1.setStaNo(dto.getStaNo());
			} else {//如果存在RGV编号，说明需要RGV接驳，先下发任务到RGV源站
			staProtocol.setStaNo(dto.getRgvSstaNo());
			staProtocol1.setStaNo(dto.getRgvSstaNo());
			}

			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			devpThread.setPakMk(staProtocol1.getSiteId(), false,695);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol1));
			if (!result) {
			LedErrorThreadUtil.ledErrorThread("更新plc站点信息失败!站点号："+inSta.getStaNo(),inSta.getLed(),LedErrorAreaType.ONE_OTHER.getDesc());
			throw new CoolException("更新plc站点信息失败");
			}
			try{
			if (ledThread != null) {
			ErrMsg errMsg1 = new ErrMsg();
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
			}
			} catch (Exception e){
			log.error("入库成功!电视机信息更新失败，小料箱入库！！！request：{}；response：{}",JSON.toJSONString(param), response);
			}
			} else {
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/pair/station/single/loc/v1", JSON.toJSONString(param), response);
			String msg = inSta.getStaNo()+"站点："+jsonObject.getString("msg");
			LedErrorThreadUtil.ledErrorThread(msg,inSta.getLed(), LedErrorAreaType.TWO_PAKIN.getDesc());
			Thread.sleep(1000);
			}

			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}

			}


			}
			}

			}

			/**
			@@ -502,16 +720,7 @@

			if (!Cools.isEmpty(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			continue;
			}
			if ("00000000".equals(barcode)){
			log.error(inSta+"站点，扫码失败，barcode："+barcode);
			// led 异常显示
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			// if (ledThread != null) {
			// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, inSta+"站点，扫码失败，barcode："+barcode));
			// }
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "00000000".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			continue;
			}
			} else {
			@@ -530,7 +739,7 @@

			// 尺寸检测异常
			boolean back = false;
			String errMsg = "异常：";
			String errMsg = inSta.getStaNo()+"站点：";
			if (staProtocol.isFrontErr()) {
			errMsg = errMsg+"前超限；";
			back = true;
			@@ -562,10 +771,7 @@
			// 退回
			if (back) {
			// led 异常显示
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			if (ledThread != null) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg));
			}
			LedErrorThreadUtil.ledErrorThread(errMsg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
			continue;
			}

			@@ -607,12 +813,21 @@
			if (wrkMast != null) {
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo(wrkMast.getStaNo());
			StaProtocol staProtocol1 = new StaProtocol();
			staProtocol1.setWorkNo(wrkMast.getWrkNo());
			staProtocol1.setStaNo(wrkMast.getStaNo());
			staProtocol1.setSiteId(staProtocol.getSiteId());

			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			devpThread.setPakMk(staProtocol1.getSiteId(), false,843);
			log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol1.getSiteId(),staProtocol1.getWorkNo(),barcode);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol1));
			if (!result) {
			if (ledThread != null) {
			ErrMsg errMsg1 = new ErrMsg();
			errMsg1.setErrMsg("更新plc站点信息失败!站点号："+inSta.getStaNo());
			errMsg1.setArea("1");
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
			}
			throw new CoolException("更新plc站点信息失败");
			}
			return;
			@@ -642,44 +857,64 @@
			JSONObject jsonObject = JSON.parseObject(response);
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			StaProtocol staProtocol1 = new StaProtocol();
			staProtocol1.setSiteId(staProtocol.getSiteId());
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol1.setWorkNo(dto.getWorkNo());

			if(Cools.isEmpty(dto.getRgvNo()) \|\| dto.getRgvNo() <= 0) {
			staProtocol.setStaNo(dto.getStaNo());
			staProtocol1.setStaNo(dto.getStaNo());
			} else {//如果存在RGV编号，说明需要RGV接驳，先下发任务到RGV源站
			staProtocol.setStaNo(dto.getRgvSstaNo());
			staProtocol1.setStaNo(dto.getRgvSstaNo());
			}

			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			devpThread.setPakMk(staProtocol1.getSiteId(), false,892);
			log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol1.getStaNo(),staProtocol1.getWorkNo(),barcode);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol1));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			} else {
			SearchLocParam param2 = new SearchLocParam();
			param2.setBarcode(barcode);
			param2.setSourceStaNo(inSta.getStaNo());
			param2.setLocType1(locTypeDto.getLocType1());
			String response2 = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/yx/loc/v33")
			.setJson(JSON.toJSONString(param2))
			.build()
			.doPost();
			JSONObject jsonObject2 = JSON.parseObject(response2);
			if (jsonObject2.getInteger("code").equals(200)) {
			log.info("大料箱自动组托成功！！");
			} else {
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);

			try{
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

			if (ledThread != null) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, "入库失败！"));
			ErrMsg errMsg1 = new ErrMsg();
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
			}
			} catch (Exception e){
			log.error("入库成功!电视机信息更新失败，大料箱入库！！！request：{}；response：{}",JSON.toJSONString(param), response);
			}

			// } else if (jsonObject.getInteger("code").equals(700)){
			// SearchLocParam param2 = new SearchLocParam();
			// param2.setBarcode(barcode);
			// param2.setSourceStaNo(inSta.getStaNo());
			// param2.setLocType1(locTypeDto.getLocType1());
			// String response2 = new HttpHandler.Builder()
			// .setUri(wmsUrl)
			// .setPath("/rpc/pakin/yx/loc/v33")
			// .setJson(JSON.toJSONString(param2))
			// .build()
			// .doPost();
			// JSONObject jsonObject2 = JSON.parseObject(response2);
			// if (jsonObject2.getInteger("code").equals(200)) {
			// log.info("大料箱自动组托成功！！");
			// } else {
			// log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			//
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			//
			// if (ledThread != null) {
			// ErrMsg errMsg1 = new ErrMsg();
			// errMsg1.setErrMsg("入库失败!站点号："+inSta.getStaNo());
			// errMsg1.setArea("1");
			// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
			// }
			// }
			} else {
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			String msg = inSta.getStaNo()+"站点："+jsonObject.getString("msg");
			LedErrorThreadUtil.ledErrorThread(msg,inSta.getLed(),LedErrorAreaType.TWO_PAKIN.getDesc());
			Thread.sleep(1000);
			}

			} catch (Exception e) {
			@@ -733,7 +968,7 @@
			staNo = 147;
			}
			staProtocol.setStaNo(staNo);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,988);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (result) {
			// 更新工作主档
			@@ -841,7 +1076,7 @@
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo(dto.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,1096);
			// ledThread.errorReset();
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			@@ -956,7 +1191,7 @@
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo(dto.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,1211);
			// ledThread.errorReset();
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			@@ -1928,6 +2163,7 @@
			log.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNoOther());
			continue;
			}
			boolean signStanOther81 = false;
			if (staProtocolOther.getWorkNo()!=0){
			WrkMast wrkMastOther = wrkMastMapper.selectPakInStep3(staProtocolOther.getWorkNo());
			if (Cools.isEmpty(wrkMastOther)){
			@@ -2029,29 +2265,33 @@
			return;
			}
			}
			return;
			}
			return;
			signStanOther81 = true;
			crnStation=2;
			}
			StaProtocol staProtocolOther1 = devpThread.getStation().get(crnStn.getStaNoOther1());
			if (staProtocolOther1 == null) {
			continue;
			} else {
			staProtocolOther1 = staProtocolOther1.clone();
			}
			if (!signStanOther81){
			StaProtocol staProtocolOther1 = devpThread.getStation().get(crnStn.getStaNoOther1());
			if (staProtocolOther1 == null) {
			continue;
			} else {
			staProtocolOther1 = staProtocolOther1.clone();
			}

			if (staProtocolOther1.isAutoing() && staProtocolOther1.getWorkNo()!=0){
			return;
			}
			if (staProtocolOther1.isAutoing() \|\| staProtocolOther1.getWorkNo()!=0){
			return;
			}


			StaProtocol staProtocolOther2 = devpThread.getStation().get(crnStn.getStaNoOther2());
			if (staProtocolOther2 == null) {
			continue;
			} else {
			staProtocolOther2 = staProtocolOther2.clone();
			}
			if (staProtocolOther2.isAutoing() && staProtocolOther2.getWorkNo()!=0){
			return;
			StaProtocol staProtocolOther2 = devpThread.getStation().get(crnStn.getStaNoOther2());
			if (staProtocolOther2 == null) {
			continue;
			} else {
			staProtocolOther2 = staProtocolOther2.clone();
			}
			if (staProtocolOther2.isAutoing() \|\| staProtocolOther2.getWorkNo()!=0){
			return;
			}
			}
			crnStation = 2;
			// 命令下发区 --------------------------------------------------------------------------
			@@ -2070,7 +2310,7 @@
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo(wrkMast.getStaNo());

			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,2325);

			if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(99, crnCommand.getCrnNo()-2))) {
			log.error("输送线锁定命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), crnCommand.getCrnNo()-2);
			@@ -2534,6 +2774,11 @@
			public synchronized void locToCrnStn1(CrnSlave slave, CrnProtocol crnProtocol, Integer crnStation) {
			List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
			for (WrkMast wrkMast : wrkMasts) {
			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			break;
			// return;
			}
			if (wrkMast == null) {
			continue;
			}
			@@ -2840,6 +3085,10 @@
			if (wrkMast == null) {
			continue;
			}
			// if (wrkMast.getStaNoSign().equals(signBigTurn)){
			// continue;
			// }


			crnStation = crnStation1;

			@@ -2854,18 +3103,44 @@
			continue;
			}

			if (wrkMast.booleanStaNoSign()){
			RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("LineUp"+wrkMast.getStaNo());
			if (Cools.isEmpty(rgvOneSign)){
			continue;
			}
			if (rgvOneSign.getRgvOneSign()>=2){
			continue;
			}
			// int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
			// if (wrkCount>=12){
			// continue;
			// }
			// RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
			// if (Cools.isEmpty(bigTurn)){
			// continue;
			// }
			// if (bigTurn.getRgvOneSign()>13){
			// continue;
			// }
			// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
			// StaProtocol staProtocolEnt = devpThread.getStation().get(wrkMast.getStaNoBying());
			// if (staProtocolEnt.isLoading() \|\| staProtocolEnt.getWorkNo()!=0){
			// continue;
			// }
			}

			// 工作档状态判断
			if (wrkMast.getIoType() < 100 \|\| wrkMast.getSourceStaNo() == null) {
			log.error("查询工作档数据不符合条件--入出类型/站点, 工作号={}，源库位={}，入出类型={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
			continue;
			}
			//退库模式跳过118、119出库任务
			if (wrkMast.getStaNo()==118 \|\| wrkMast.getStaNo()==119){
			RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("oneSign");
			if (Cools.isEmpty(rgvOneSign) \|\| rgvOneSign.getRgvOneSign()==1){
			continue;
			}
			}
			// //退库模式跳过118、119出库任务
			// if (wrkMast.getStaNo()==118 \|\| wrkMast.getStaNo()==119){
			// RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("oneSign");
			// if (Cools.isEmpty(rgvOneSign) \|\| rgvOneSign.getRgvOneSign()==1){
			// continue;
			// }
			// }
			// 获取源库位信息
			LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
			if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) {
			@@ -3072,6 +3347,10 @@
			// }
			}
			}
			// signBigTurn++;
			// if (signBigTurn > 2){
			// signBigTurn = 0;
			// }

			}

			@@ -3748,16 +4027,31 @@
			} else {
			staProtocol = staProtocol.clone();
			}
			if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==607 && staProtocol.getWorkNo()>20000 && staProtocol.isLoading() && staProtocol.isAutoing()){
			if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==0 && staProtocol.getWorkNo()==0
			&& staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()){
			String barcode = staProtocol.getBarcode();
			if (!Cools.isEmpty(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			continue;
			}
			} else {
			continue;
			}
			try {
			BasDevp basDevp = basDevpService.selectById(staProtocol.getStaNo());
			BasDevp basDevp = basDevpService.selectById(emptyInSta.getStaNo());
			if (basDevp.getReportSign()==0){
			WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
			if (!Cools.isEmpty(wrkMast)){
			continue;
			}
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			SearchLocParam param = new SearchLocParam();
			param.setIoType(10);
			param.setSourceStaNo(emptyInSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			param.setBarcode(barcode);
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			@@ -3768,16 +4062,16 @@
			if (jsonObject.getInteger("code").equals(200)) {
			basDevp.setReportSign(1);
			basDevpService.updateById(basDevp);
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol.setStaNo(607);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(5, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			// StartupDto dto = jsonObject.getObject("data", StartupDto.class);
			//
			// // 更新站点信息且下发plc命令
			// staProtocol.setWorkNo(dto.getWorkNo());
			// staProtocol.setStaNo(607);
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(5, staProtocol));
			// if (!result) {
			// throw new CoolException("更新plc站点信息失败");
			// }
			} else {
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}
			@@ -3787,8 +4081,7 @@
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			return;
			}

			} else
			// 站点条件判断
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			&& staProtocol.isEmptyMk() && ((staProtocol.getWorkNo() > 32222 && staProtocol.getWorkNo() <= 63333) \|\| staProtocol.getWorkNo()==0) && staProtocol.isPakMk()) {
			@@ -3813,7 +4106,7 @@
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol.setStaNo(dto.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,4087);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			@@ -3876,7 +4169,7 @@
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol.setStaNo(dto.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,4150);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			@@ -3939,7 +4232,7 @@
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol.setStaNo(dto.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(staProtocol.getSiteId(), false,4213);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			@@ -4836,12 +5129,17 @@
			break;
			}
			BasJar basJar = basJarMapper.selectById(jarSlave.getId());
			int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 11));
			BasJar basJarOther = basJarMapper.selectById(jarSlave.getJarOtherId());
			jarMaxLoc = basJar.getJarCount();
			if (jarMaxLoc == 0 \|\| basJarOther.getJarCount() == 0) {
			break;
			}
			int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 6));
			if (count>0){
			break;
			}
			if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)!=0){
			if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)==7){
			if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(), 3).equals(basJarOther.getJarCount())){
			JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
			JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
			if (jarOtherProtocol == null) {
			@@ -4927,7 +5225,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			return false;
			}
			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -4957,7 +5255,7 @@
			//自动、空闲、右门关闭、 Other左门关闭
			if (jarProtocol.isAutoing() && jarProtocol.jarErr==0
			&& jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0){
			if (jarProtocol.statusType != JarStatusType.SOS){
			if (jarProtocol.statusType != JarStatusType.SOS && jarProtocol.statusType != JarStatusType.SOS2){
			log.error("Jar任务创建===》执行===>行={}",4537);
			BasJarMast basJarMast = new BasJarMast(basJar, wrkMast, jarLocDigit);
			basJarMast.setJarEnterStaNo(staNo);//入硫化罐站点
			@@ -5049,6 +5347,8 @@
			signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//冷却槽取输送线
			default:
			jarWrkMastExecuteGenerateSte(signExecute,sign);//小车移动
			// signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//冷却槽取输送线

			}
			if (!signExecute[0] && !signExecute[1]){
			//Ste移动
			@@ -5304,7 +5604,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			return false;
			}
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			return false;
			}
			if (jarProtocol.getJarTemperature()>jarTemperature){
			@@ -5382,7 +5682,7 @@
			List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
			add(4);
			}});
			if (basJarMastList.size() != jarMaxLoc){
			if (basJarMastList.isEmpty()){
			return false;
			}

			@@ -5412,7 +5712,7 @@
			return false;
			}

			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -5425,13 +5725,20 @@
			log.error("{}号硫化罐查询设备档案无信息！！！",jarProtocol.getJarNo());
			return false;
			}
			if (!basJar.getJarCount().equals(jarMaxLoc)){
			log.error("{}号硫化罐查询设备库存数异常！！！库存待入数：{}",jarProtocol.getJarNo(),basJar.getJarCount());
			jarMaxLoc = basJar.getJarCount();
			if (jarMaxLoc == 0) {
			return false;
			}
			// if (!basJar.getJarCount().equals(jarMaxLoc)){
			// log.error("{}号硫化罐查询设备库存数异常！！！库存待入数：{}",jarProtocol.getJarNo(),basJar.getJarCount());
			// return false;
			// }
			if (basJarMastList.size() != jarMaxLoc){
			return false;
			}

			//门作业无
			if (jarProtocol.isAutoing() && jarProtocol.statusType != JarStatusType.SOS && jarProtocol.jarErr==0
			if (jarProtocol.isAutoing() && jarProtocol.statusType != JarStatusType.SOS && jarProtocol.statusType!= JarStatusType.SOS2 && jarProtocol.jarErr==0
			&& jarProtocol.isRightDoor() && jarProtocol.isLeftDoor()
			&& jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0){
			//关进料门
			@@ -5463,14 +5770,9 @@
			List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
			add(6);
			}});
			if (basJarMastList.size() != jarMaxLoc){
			if (basJarMastList.isEmpty()){
			return false;
			}
			// if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0
			// && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7
			// && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=14){
			// return false;
			// }

			BasJarMast basJarMastSign = basJarMastList.get(0);
			if (Cools.isEmpty(basJarMastSign)){
			@@ -5499,7 +5801,7 @@
			return false;
			}

			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -5512,6 +5814,13 @@
			log.error("{}号硫化罐查询设备档案无信息！！！",jarProtocol.getJarNo());
			return false;
			}
			jarMaxLoc = basJar.getJarCount();
			if (jarMaxLoc == 0) {
			return false;
			}
			if (basJarMastList.size() != jarMaxLoc){
			return false;
			}

			//门作业无
			if (jarProtocol.isAutoing() && jarProtocol.statusType == JarStatusType.WAITING2 && jarProtocol.jarErr==0
			@@ -5522,6 +5831,15 @@
			log.error("JarWrkMastExecute任务创建===>执行异常===》异常数据：BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMastSign));
			}
			return true;
			} else if (jarProtocol.isAutoing() && jarProtocol.statusType != JarStatusType.SOS && jarProtocol.statusType != JarStatusType.SOS2
			&& jarProtocol.statusType != JarStatusType.WAITING2 && jarProtocol.jarErr==0
			&& jarProtocol.isLeftDoor() && jarProtocol.isRightDoor()
			&& jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0){
			Integer integer = basJarMastService.updateStatus(jarProtocol.getJarNo(), 6, 8);
			if (basJarMastList.size()!=integer){
			log.error("{}号硫化罐硫化完成后开门完成修改硫化档案状态结果数量不一致！！！查询资料数量={}，更新返回数量={}",jarProtocol.getJarNo(),basJarMastList.size(),integer);
			}
			return true;
			}
			return false;
			} else {
			@@ -5543,6 +5861,12 @@
			if (wrkMastExecuteService.getWrkMastExecuteByJarIdCount(jarSlave.getId())!=0){
			return false;
			}
			List<BasJarMast> basJarMastList1 = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getJarOtherId(), new ArrayList<Integer>() {{
			add(0);add(1);add(2);add(3);
			}});
			if (!basJarMastList1.isEmpty()){
			return false;
			}
			List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
			add(8);
			}});
			@@ -5552,12 +5876,6 @@
			List<BasJarMast> basJarMastList10 = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
			add(10);
			}});
			if (basJarMastList10.size()==jarMaxLoc){
			return false;
			}
			if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=7){
			return false;
			}

			BasJarMast jarMastByJarIdMin = basJarMastService.getJarMastByJarIdMin(jarSlave.getId(),8,8);
			if (Cools.isEmpty(jarMastByJarIdMin)){
			@@ -5590,7 +5908,7 @@
			return false;
			}

			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -5601,21 +5919,49 @@
			return false;
			}

			//临时
			if (basJar.getJarCode()==1){
			JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
			JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
			if (jarOtherProtocol == null) {
			return false;
			}

			if (!jarOtherProtocol.isAutoing() \|\| jarOtherProtocol.jarErr!=0
			\|\| !jarOtherProtocol.isLeftDoor() \|\| !jarOtherProtocol.isRightDoor()
			\|\| jarOtherProtocol.leftDoorOpen==1 \|\| jarOtherProtocol.leftDoorClose==1 \|\| jarOtherProtocol.rightDoorOpen==1 \|\| jarOtherProtocol.rightDoorClose==1){
			log.error("{}号硫化罐查询设备不满足前往冷却池条件，代号2硫化罐门没开！！！",jarOtherProtocol.getJarNo());
			return false;
			}
			jarMaxLoc = basJar.getJarCount();
			if (jarMaxLoc == 0) {
			return false;
			}
			if (basJarMastList10.size()==jarMaxLoc){
			return false;
			}

			BasJar basJarOther = basJarMapper.selectById(jarSlave.getJarOtherId());
			if (Cools.isEmpty(basJarOther)){
			log.error("{}号硫化罐查询设备档案无信息！！！",jarSlave.getJarOtherId());
			return false;
			}

			if (basJarOther.getJarCount() == 0) {
			return false;
			}

			List<BasJarMast> basJarMastListOther = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getJarOtherId(), new ArrayList<Integer>() {{
			add(8);
			}});
			if (!basJarMastListOther.isEmpty() && basJarMastListOther.size() < basJarOther.getJarCount()){
			return false;
			}
			if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && !basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(), 4).equals(basJarOther.getJarCount() )){
			return false;
			}

			// //临时
			// if (basJar.getJarCode()==1){
			// JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
			// JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
			// if (jarOtherProtocol == null) {
			// return false;
			// }
			//
			// if (!jarOtherProtocol.isAutoing() \|\| jarOtherProtocol.jarErr!=0
			// \|\| !jarOtherProtocol.isLeftDoor() \|\| !jarOtherProtocol.isRightDoor()
			// \|\| jarOtherProtocol.leftDoorOpen==1 \|\| jarOtherProtocol.leftDoorClose==1 \|\| jarOtherProtocol.rightDoorOpen==1 \|\| jarOtherProtocol.rightDoorClose==1){
			// log.error("{}号硫化罐查询设备不满足前往冷却池条件，代号2硫化罐门没开！！！",jarOtherProtocol.getJarNo());
			// return false;
			// }
			// }

			//门作业无
			// if (jarProtocol.isAutoing() && jarProtocol.statusType == JarStatusType.WAITING4 && jarProtocol.jarErr==0
			@@ -5758,7 +6104,7 @@
			return false;
			}
			if (steProtocol.getMode() != (short)1) {
			log.error(steNo + "号小车离线，无法操作");
			// log.error(steNo + "号小车离线，无法操作");
			return false;
			}
			if (steProtocol.getChargeStatus()!=0){
			@@ -5813,7 +6159,7 @@
			return false;
			}
			if (steProtocol.getMode() != (short)1) {
			log.error(steNo + "号小车离线，无法操作");
			// log.error(steNo + "号小车离线，无法操作");
			return false;
			}
			if (steProtocol.getCharge()<31.0F && chargeSign){
			@@ -6130,7 +6476,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			return false;
			}
			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -6258,7 +6604,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			return false;
			}
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -6386,7 +6732,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			return false;
			}
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -6502,7 +6848,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			return false;
			}
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.WAITING2) \|\| jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -6618,7 +6964,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			return false;
			}
			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -6754,7 +7100,7 @@
			return false;
			}

			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -7226,7 +7572,7 @@
			return false;
			}

			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			return false;
			}
			@@ -7265,89 +7611,124 @@
			if (staProtocolRGVOther == null) {
			return false;
			}

			if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){ //临时
			// if ( staProtocolRGVOther.rgvBoolean(1)){
			if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
			//移走 == > 2
			if (!jarRgvMoveTake(wrkMastExecute,2)){
			log.error("平衡车RGV命令下发失败，rgv号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			return true;
			Integer[] steJarNoAB = SteAndJarUtil.getSteJarNoAB(wrkMastExecute.getJarId());
			boolean signOther = false;
			for(Integer jarNoOther : steJarNoAB){
			// 获取硫化罐信息
			JarThread jarThreadOther = (JarThread) SlaveConnection.get(SlaveType.Jar, jarNoOther);
			JarProtocol jarProtocolOther = jarThreadOther.getJarProtocol();
			if (jarProtocolOther == null) {
			continue;
			}
			//门作业无
			//自动、空闲、
			if (jarProtocolOther.modeType != JarModeType.AUTO){
			continue;
			}

			if (jarProtocolOther.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			// log.error("{}号硫化罐查询设备正在硫化中，任务异常！！！",jarProtocol.getJarNo());
			continue;
			}
			if (jarProtocolOther.getJarTemperature()>jarTemperature){
			// log.error("{}号硫化罐查询设备温度过高，等待降温....！！！",jarProtocol.getJarNo());
			continue;
			}
			BasJar basJarOther = basJarMapper.selectById(jarProtocolOther.getJarNo());
			if (Cools.isEmpty(basJarOther)){
			// log.error("{}号硫化罐查询设备档案无信息！！！",jarProtocol.getJarNo());
			continue;
			}
			if (jarProtocol.isAutoing() && jarProtocol.jarErr==0 && jarProtocol.isLeftDoor() && jarProtocol.isRightDoor()
			&& jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0
			){
			log.error("10：A=>B\\11：B=>A==>任务下发===>行={}",6558);
			if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocol.getJarNo())){
			//判断小车状态
			if (wrkMastExecute.getIoType()==10){//10：A=>B
			if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE,true)){
			//调车 == > 移动
			if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false,wrkMastExecute.getJarId())){
			log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(3);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("穿梭板Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			} else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE,false)){
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(4);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("穿梭板Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			}
			} else {//11:B=>A
			if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE,false)){
			//调车 == > 移动
			if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_MOVE_14,false,wrkMastExecute.getJarId())){
			log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(3);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("穿梭板Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			} else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE,false)){
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(4);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("穿梭板Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			}
			}

			} else {
			//调车 == > endRow
			if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
			jarProtocol = jarProtocolOther;
			signOther = true;
			break;
			}
			}
			if (signOther){
			if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){ //临时
			if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
			//移走 == > 2
			if (!jarRgvMoveTake(wrkMastExecute,2)){
			log.error("平衡车RGV命令下发失败，rgv号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(2);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("硫化罐Jar命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			return true;
			}
			return true;
			//门作业无
			//自动、空闲、
			if (jarProtocol.isAutoing() && jarProtocol.jarErr==0 && jarProtocol.isLeftDoor() && jarProtocol.isRightDoor()
			&& jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0
			){
			log.error("10：A=>B\\11：B=>A==>任务下发===>行={}",6558);
			if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocol.getJarNo())){
			//判断小车状态
			if (wrkMastExecute.getIoType()==10){//10：A=>B
			if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE,true)){
			//调车 == > 移动
			if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false,jarProtocol.getJarNo())){
			log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(3);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("穿梭板Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			} else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE,false)){
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(4);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("穿梭板Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			}
			} else {//11:B=>A
			if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE,false)){
			//调车 == > 移动
			if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_MOVE_14,false,jarProtocol.getJarNo())){
			log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(3);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("穿梭板Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			} else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE,false)){
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(4);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("穿梭板Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			}
			}

			} else {
			//调车 == > endRow
			if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(jarProtocol.getJarNo()))){
			log.error("平衡车RGV命令下发失败，rgv号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			wrkMastExecute.setWrkType(1);
			wrkMastExecute.setWrkSts(2);
			if (!wrkMastExecuteService.updateById(wrkMastExecute)){
			log.error("硫化罐Jar命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
			wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
			}
			}
			return true;
			}
			return false;
			} else {
			log.error("jarWrkMastExecuteActionExecute1===>执行异常===》RGV不满足条件，等待===》异常数据：BasJar:"+ JSON.toJSONString(basJar.getEnterRgvNo())+";WrkMastExecute:"+JSON.toJSONString(wrkMastExecute));
			return false;
			}
			return false;
			} else {
			log.error("jarWrkMastExecuteActionExecute1===>执行异常===》RGV不满足条件，等待===》异常数据：BasJar:"+ JSON.toJSONString(basJar.getEnterRgvNo())+";WrkMastExecute:"+JSON.toJSONString(wrkMastExecute));
			return false;
			}

			} catch (Exception e){
			log.error("jarWrkMastExecuteActionExecute1任务执行下发异常==》wrkMastExecute={},异常原因={}",wrkMastExecute,e.getMessage());
			}
			@@ -7521,26 +7902,18 @@
			try{
			switch (sign){
			case 1:
			case 5:
			case 9:
			if (jarWrkMastExecuteGenerateSteComplete(sign)){
			break;
			}
			case 2:
			case 6:
			case 10:
			if (jarWrkMastExecuteGenerateJarComplete(sign)){
			break;
			}
			case 3:
			case 7:
			case 11:
			if (jarWrkMastExecuteGenerateRgvComplete1(sign)){
			break;
			}
			case 4:
			case 8:
			case 12:
			if (jarWrkMastExecuteGenerateRgvComplete2(sign)){
			break;
			}
			@@ -7713,10 +8086,10 @@
			&& jarProtocol.leftDoorOpen!=1 && jarProtocol.leftDoorOpen!=3
			&& jarProtocol.rightDoorOpen!=1 && jarProtocol.rightDoorOpen!=3
			&& (jarProtocol.leftDoorOpen==2 \|\| jarProtocol.rightDoorOpen==2)){
			if (jarProtocol.getJarTemperature()>jarTemperature){
			log.error("{}号硫化罐查询设备温度过高，等待降温....！！！",jarProtocol.getJarNo());
			return false;
			}
			// if (jarProtocol.getJarTemperature()>jarTemperature){
			// log.error("{}号硫化罐查询设备温度过高，等待降温....！！！",jarProtocol.getJarNo());
			// return false;
			// }
			WrkMastExecute wrkMastExecuteSou = new WrkMastExecute();
			wrkMastExecuteSou.setWrkSts(3);
			List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecuteSou);
			@@ -7753,7 +8126,7 @@
			&& (jarProtocol.leftDoorClose==2 \|\| jarProtocol.rightDoorClose==2)){
			if (jarProtocol.getJarTemperature()>jarTemperature){
			log.error("{}号硫化罐查询设备温度过高，等待降温....！！！",jarProtocol.getJarNo());
			return false;
			continue;
			}
			WrkMastExecute wrkMastExecuteSou = new WrkMastExecute();
			wrkMastExecuteSou.setWrkSts(3);
			@@ -8059,7 +8432,14 @@
			continue;
			}
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null \|\| steProtocol.getChargeStatus()!=0) {
			if (steProtocol == null) {
			continue;
			}
			if (Cools.isEmpty(steProtocol.getChargeStatus())) {
			log.error("{}号小车，充电状态信息异常，小车信息：{}",steProtocol.getSteNo(),steProtocol.toString());
			continue;
			}
			if (steProtocol.getChargeStatus()!=0) {
			continue;
			}
			WrkMastExecute wrkMastExecuteByCharge = wrkMastExecuteService.getWrkMastExecuteByCharge(steSlave.getId());
			@@ -8076,6 +8456,9 @@
			add(5);
			add(11);
			add(17);
			add(99);
			add(100);
			add(999);
			}});
			if(!basJarMastList.isEmpty()){
			continue;
			@@ -8126,7 +8509,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			continue;
			}
			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			continue;
			}
			if (jarProtocol.getJarTemperature()>jarTemperature){
			@@ -8173,7 +8556,14 @@
			continue;
			}
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null \|\| steProtocol.getChargeStatus()!=1) {
			if (steProtocol == null) {
			continue;
			}
			if (Cools.isEmpty(steProtocol.getChargeStatus())) {
			log.error("{}号小车，充电状态信息异常，小车信息：{}",steProtocol.getSteNo(),steProtocol.toString());
			continue;
			}
			if (steProtocol.getChargeStatus()!=1) {
			continue;
			}

			@@ -8183,6 +8573,9 @@
			add(5);
			add(11);
			add(17);
			add(99);
			add(100);
			add(999);
			}});
			if(basJarMastList.isEmpty()){
			if (wrkMastExecuteService.selectNoStartCharge(steSlave.getId())==0){
			@@ -8207,7 +8600,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			continue;
			}
			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			continue;
			}
			if (jarProtocol.getJarTemperature()>jarTemperature){
			@@ -8252,6 +8645,11 @@
			log.error("穿梭板Ste命令下发失败，ste号={},任务数据={}",
			wrkMastExecuteByCharge.getSteId(), JSON.toJSONString(wrkMastExecuteByCharge));
			}
			try{
			Thread.sleep(1000);
			} catch (Exception e){

			}
			wrkMastExecuteByCharge.setWrkType(2);
			wrkMastExecuteByCharge.setWrkSts(100);
			if (!wrkMastExecuteService.updateById(wrkMastExecuteByCharge)){
			@@ -8276,17 +8674,76 @@
			if (staNo1!=0){
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
			StaProtocol staProtocol607 = devpThread.getStation().get(607);
			if (staProtocol607.getWorkNo()<9001 && staProtocol607.getWorkNo()!=0 && staProtocol607.isLoading() && staProtocol607.isAutoing() && staProtocol607.getStaNo() == 607){
			staProtocol607.setStaNo(staNo1);
			boolean result2 = MessageQueue.offer(SlaveType.Devp, 2, new Task(5, staProtocol607));
			String barcode = staProtocol607.getBarcode();
			if (!Cools.isEmpty(barcode)) {
			// log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| !CodeDetectionUtil.barcodeDetection(barcode)) {
			return;
			}
			} else {
			return;
			}
			if (staProtocol607.getWorkNo()==0 && staProtocol607.isLoading() && staProtocol607.isAutoing()
			&& staProtocol607.getStaNo() == 0 && staProtocol607.isInEnable()){
			WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
			if (!Cools.isEmpty(wrkMast)){
			staProtocol607.setWorkNo(wrkMast.getWrkNo());
			staProtocol607.setStaNo(staNo1);
			boolean result2 = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocol607));
			}
			}
			} else {

			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, 1);

			if (ledThread != null) {
			ErrMsg errMsg1 = new ErrMsg();
			errMsg1.setErrMsg("分配硫化罐===>目标站点号："+staNo1);
			errMsg1.setArea("1");
			MessageQueue.offer(SlaveType.Led, 1, new Task(5, errMsg1));
			} try {
			Thread.sleep(500);
			} catch (Exception e){

			}
			}

			// try{
			// for (int idi = 1;idi<5;idi++){
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, idi);
			//
			// if (ledThread != null) {
			// ErrMsg errMsg1 = new ErrMsg();
			// errMsg1.setErrMsg("测试："+idi);
			// errMsg1.setArea("1");
			// MessageQueue.offer(SlaveType.Led, idi, new Task(5, errMsg1));
			// } try {
			// Thread.sleep(500);
			// } catch (Exception e){
			//
			// }
			// }
			// LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);
			//
			// if (ledThread3 != null) {
			// ErrMsg errMsg1 = new ErrMsg();
			// errMsg1.setErrMsg("测试测试测试测试测试测试测试测试测试测试测试测试测试："+3);
			// errMsg1.setArea("1");
			// MessageQueue.offer(SlaveType.Led, 3, new Task(5, errMsg1));
			// } try {
			// Thread.sleep(500);
			// } catch (Exception e){
			//
			// }
			// } catch (Exception e){ }


			}
			public synchronized Integer jarGetStartStaNo(Integer staNo) {
			try {
			int[] jarNos=new int[]{3,1,4,2};//(607分配硫化罐)
			ArrayList<Integer> staNos = new ArrayList<Integer>() {{
			add(607);add(608);add(609);add(610);add(611);add(612);
			add(608);add(609);add(610);add(611);add(612);
			add(613);add(614);add(615);add(616);add(617);add(618);
			add(619);add(620);add(621);add(622);
			}};
			@@ -8302,6 +8759,16 @@
			add(4);
			}});
			if (basJarMastList.isEmpty()){
			continue;
			}
			BasJar basJar = basJarMapper.selectById(jarNo);
			if (Cools.isEmpty(basJar)){
			log.error("{}号硫化罐查询设备档案无信息！！！",jarNo);
			continue;
			}

			jarMaxLoc = basJar.getJarCount();
			if (jarMaxLoc == 0) {
			continue;
			}
			if (basJarMastList.size()>0 && basJarMastList.size()<jarMaxLoc){
			@@ -8353,7 +8820,7 @@
			if (jarProtocol.modeType != JarModeType.AUTO){
			continue;
			}
			if (jarProtocol.statusType .equals(JarStatusType.SOS)){
			if (jarProtocol.statusType .equals(JarStatusType.SOS) \|\| jarProtocol.statusType .equals(JarStatusType.SOS2)){
			continue;
			}
			if (jarProtocol.getJarTemperature()>jarTemperature){
			@@ -8366,6 +8833,10 @@
			log.error("{}号硫化罐查询设备档案无信息！！！",jarProtocol.getJarNo());
			continue;
			}
			jarMaxLoc = basJar.getJarCount();
			if (jarMaxLoc == 0) {
			continue;
			}
			List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarNo, new ArrayList<Integer>() {{
			add(0);
			add(1);
			@@ -8373,13 +8844,16 @@
			add(3);
			add(4);
			}});
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);

			Integer count = basJarMastList.size();
			ArrayList<Integer> wrkNoList = new ArrayList<>();

			for (Integer staNoEnt : staNos){
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
			StaProtocol staProtocolEnt = devpThread.getStation().get(staNoEnt);
			if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){
			if (staProtocolEnt == null \|\| (staProtocolEnt.isLoading() && staProtocolEnt.getWorkNo()==0)){
			// log.error("站点异常,计数加一，站点号："+staNoEnt);
			count++;
			} else if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){
			if (staProtocolEnt.getStaNo().equals(basJar.getEntStaNo$())){
			count++;
			wrkNoList.add(staProtocolEnt.getWorkNo());