zy-wcs.git - Gitblit

			@@ -13,25 +13,25 @@
			import com.zy.asrs.mapper.*;
			import com.zy.asrs.service.*;
			import com.zy.asrs.utils.CommandUtils;
			import com.zy.asrs.utils.RouteUtils;
			import com.zy.asrs.utils.TrackRangeUtils;
			import com.zy.asrs.utils.Utils;
			import com.zy.common.model.MatDto;
			import com.zy.common.service.CommonService;
			import com.zy.common.utils.CollectionUtils;
			import com.zy.common.utils.HttpHandler;
			import com.zy.core.CrnThread;
			import com.zy.core.DevpThread;
			import com.zy.core.cache.MessageQueue;
			import com.zy.core.cache.RgvStatusCache;
			import com.zy.core.cache.SlaveConnection;
			import com.zy.core.cache.*;
			import com.zy.core.enums.*;
			import com.zy.core.model.CrnSlave;
			import com.zy.core.model.DevpSlave;
			import com.zy.core.model.RgvSlave;
			import com.zy.core.model.Task;
			import com.zy.core.model.*;
			import com.zy.core.model.command.CrnCommand;
			import com.zy.core.model.protocol.CrnProtocol;
			import com.zy.core.model.protocol.RgvProtocol;
			import com.zy.core.model.protocol.StaProtocol;
			import com.zy.core.model.command.LedCommand;
			import com.zy.core.model.protocol.*;
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.thread.BarcodeThread;
			import com.zy.core.thread.LedThread;
			import com.zy.core.thread.RgvThread;
			import com.zy.core.thread.SiemensDevpThread;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -42,6 +42,8 @@

			import java.io.IOException;
			import java.util.*;
			import java.util.concurrent.ConcurrentHashMap;
			import java.util.stream.Collectors;

			/**
			* 立体仓库WCS系统主流程业务
			@@ -80,6 +82,8 @@
			private CommonService commonService;
			@Autowired
			private CrnController crnController;
			@Autowired
			private BasDevpPositionService basDevpPositionService;

			@Value("${wms.url}")
			private String wmsUrl;
			@@ -99,6 +103,9 @@

			@Value("${constant-parameters.trackProportion}")
			private Long trackProportion;

			@Value("${constant-parameters.avoidDistance}")
			private Long avoidDistance;

			public void generateStoreWrkFile() {
			try {
			@@ -150,13 +157,13 @@
			}
			// 退回
			if (back) {
			if (stano == inSta.getBackSta().shortValue()){
			if (stano == inSta.getBackSta().shortValue()) {
			continue;
			}
			if (workNo == 0 && stano == 0){
			if (workNo == 0 && stano == 0) {
			continue;
			}
			if (!staProtocol.isPakMk()){
			if (!staProtocol.isPakMk()) {
			continue;
			}
			// News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
			@@ -175,27 +182,30 @@
			// 判断是否满足入库条件
			if (staProtocol.isAutoing() && staProtocol.isLoading()
			&& staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk() && (workNo == 9991 )
			&& staProtocol.isPakMk()) {
			&& !staProtocol.isEmptyMk() && (workNo == 0 \|\| (workNo>9000 && workNo<10000))
			&& staProtocol.isPakMk()
			&& staProtocol.isPakMkWalk()
			) {
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
			if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
			// 请求wms接口，获取工作号和目标库位
			ToWmsDTO toWmsDTO = new ToWmsDTO(barcode,staProtocol.getSiteId(),staProtocol.isHigh() ? 2 : 1);
			TaskWrk taskWrk1=taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode",barcode));
			if(!Cools.isEmpty(taskWrk1)){
			log.info("托盘码："+barcode+"任务档存在");
			if (taskWrk1.getIoType()==1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())){
			ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, 0);
			TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
			if (!Cools.isEmpty(taskWrk1)) {
			log.info("托盘码：" + barcode + "任务档存在");
			if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("crn_no", taskWrk1.getCrnNo()).eq("type_no",1).eq("stn_no",staProtocol.getSiteId()));
			if (Cools.isEmpty(staDesc)){
			log.info("托盘码："+barcode+"任务档存在");
			.eq("CRN_NO", taskWrk1.getCrnNo()).eq("TYPE_NO", 1).eq("STN_NO", staProtocol.getSiteId()));

			if (Cools.isEmpty(staDesc)) {
			log.info("托盘码：" + barcode + "任务档存在");
			return;
			}else {
			} else {
			staProtocol.setWorkNo(taskWrk1.getWrkNo());
			staProtocol.setStaNo(staDesc.getCrnStn());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			@@ -204,9 +214,9 @@
			return;
			}
			HashMap<String, Object> headParam = new HashMap<>();
			headParam.put("Content-Type","application/json");
			headParam.put("Content-Type", "application/json");
			String response;
			try{
			try {
			response = new HttpHandler.Builder()
			// .setHeaders(headParam)
			.setUri(wmsUrl)
			@@ -214,140 +224,54 @@
			.setJson(JSON.toJSONString(toWmsDTO))
			.build()
			.doPost();
			}catch (Exception e){
			} catch (Exception e) {
			log.error("请求入库调用接口失败");
			log.error("异常信息打印："+e);
			try{
			log.error("异常信息打印：" + e);
			try {
			BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
			if (Cools.isEmpty(basDevp)){
			log.error("站点号异常"+inSta.getStaNo());
			} else if (basDevp.getStaErr()!=0){
			if (Cools.isEmpty(basDevp)) {
			log.error("站点号异常" + inSta.getStaNo());
			} else if (basDevp.getStaErr() != 0) {
			basDevp.setStaErr(2);
			basDevpService.updateById(basDevp);
			}
			}catch (Exception e1){
			} catch (Exception e1) {
			// 退回
			log.error("扫码检测程序异常"+inSta.getStaNo()+"异常信息"+e1);
			log.error("扫码检测程序异常" + inSta.getStaNo() + "异常信息" + e1);
			}
			staProtocol.setWorkNo(9999);
			staProtocol.setStaNo(inSta.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
			// if (taskWrk != null) {
			// taskWrk.setMemo(errMsg);//将错误码存入备注字段进行展示
			// taskWrkMapper.updateById(taskWrk);
			// }
			continue;
			}

			JSONObject jsonObject = JSON.parseObject(response);
			apiLogService.save("wms请求入库货位接口"
			,wmsUrl+inboundTaskApplyPath
			,null
			,"127.0.0.1"
			,JSON.toJSONString(toWmsDTO)
			,response
			,true
			, wmsUrl + inboundTaskApplyPath
			, null
			, "127.0.0.1"
			, JSON.toJSONString(toWmsDTO)
			, response
			, true
			);
			log.info("入库请求参数{}" + JSON.toJSONString(toWmsDTO));
			log.info("入库请求返回参数{}" + JSON.toJSONString(response));
			if (jsonObject.getInteger("code").equals(200) && !Cools.isEmpty(jsonObject.get("data").toString())) {
			GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
			try{
			BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
			if (Cools.isEmpty(basDevp)){
			log.error("站点号异常1"+inSta.getStaNo());
			throw new CoolException("站点号异常1,未查询到站点信息"+inSta.getStaNo());
			}
			Integer staNoCrnNo = Utils.StaNoCrnNo(inSta.getStaNo());
			if (staNoCrnNo==0){
			basDevp.setStaErr(1);
			basDevpService.updateById(basDevp);
			log.error("站点号异常2"+inSta.getStaNo());
			throw new CoolException("站点号异常2,站点号不存在"+inSta.getStaNo());
			}else {
			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("crn_no", staNoCrnNo.longValue())
			.eq("loc_no", getWmsDto.getLocNo()));
			if (Cools.isEmpty(locMast)){
			basDevp.setStaErr(1);
			basDevpService.updateById(basDevp);
			log.error("站点号异常3"+inSta.getStaNo());
			throw new CoolException("站点号异常3：此巷道不存在目标库位"+inSta.getStaNo());
			}
			}
			} catch (Exception e){
			// log.error("扫码检测程序异常"+inSta.getStaNo()+"异常信息"+e);
			if (jsonObject.getInteger("code").equals(200)) {
			try {
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			} catch (Exception e) {
			// 退回
			log.error("扫码检测程序异常"+inSta.getStaNo()+errMsg);
			log.error("扫码检测程序异常,异常信息"+e);
			log.error("扫码检测程序异常" + inSta.getStaNo() + errMsg);
			log.error("扫码检测程序异常,异常信息" + e);

			staProtocol.setWorkNo(9999);
			staProtocol.setStaNo(inSta.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
			// if (taskWrk != null) {
			// taskWrk.setMemo(errMsg);//将错误码存入备注字段进行展示
			// taskWrkMapper.updateById(taskWrk);
			// }
			continue;
			}
			//查看该库位是否为空库位
			LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts","O")
			.eq("loc_no",getWmsDto.getLocNo()));
			if(Cools.isEmpty(locMast)){
			try{
			HashMap<String, Object> headParam1 = new HashMap<>();
			headParam1.put("taskNo",getWmsDto.getTaskNo());
			headParam1.put("status",6);
			headParam1.put("ioType",1);
			headParam1.put("barcode",barcode);
			String response2;
			response2 = new HttpHandler.Builder()
			// .setHeaders(headParam)
			.setUri(wmsUrl)
			.setPath(taskStatusFeedbackPath)
			.setJson(JSON.toJSONString(headParam1))
			.build()
			.doPost();
			JSONObject jsonObject1 = JSON.parseObject(response2);
			apiLogService.save("wcs派发库位==》不为空《==上报wms"
			,wmsUrl+taskStatusFeedbackPath
			,null
			,"127.0.0.1"
			,JSON.toJSONString(headParam1)
			,response
			,true
			);
			}catch (Exception e){
			log.error("wcs派发库位==》不为空《==上报wms", getWmsDto.getWrkNo());
			throw new CoolException("wcs派发入库任务上报wms失败,派发库位==》不为空《==，异常信息："+e);
			}
			}

			// 创新一个入库工作档
			TaskWrk taskWrk = taskWrkService.selectByTaskNo(getWmsDto.getWrkNo());
			if(Cools.isEmpty(taskWrk)) {
			taskWrk = createTask(getWmsDto,barcode);
			if (Cools.isEmpty(taskWrk)){
			log.error("库位异常，库位号：{}", getWmsDto.getTargetLocationCode());
			}else {
			taskWrkService.insert(taskWrk);
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).eq("stn_no",staProtocol.getSiteId()));
			staProtocol.setWorkNo(taskWrk.getWrkNo());
			staProtocol.setStaNo(staDesc.getCrnStn());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			}

			}else {
			continue;
			}

			} else {
			// 退回
			log.error("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
			@@ -374,16 +298,284 @@
			}
			}

			public void generateStoreWrkFileIsEmptyMk() {
			try {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历入库口
			for (DevpSlave.Sta inSta : devp.getInSta()) {
			// 获取入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			Integer workNo = staProtocol.getWorkNo();
			Integer stano = staProtocol.getStaNo();

			// 尺寸检测异常
			boolean back = false;
			String errMsg = "";
			if (staProtocol.isFrontErr()) {
			errMsg = "前超限";
			back = true;
			}
			if (!back && staProtocol.isBackErr()) {
			errMsg = "后超限";
			back = true;
			}
			if (!back && staProtocol.isHighErr()) {
			errMsg = "高超限";
			back = true;
			}
			if (!back && staProtocol.isLeftErr()) {
			errMsg = "左超限";
			back = true;
			}
			if (!back && staProtocol.isRightErr()) {
			errMsg = "右超限";
			back = true;
			}
			if (!back && staProtocol.isWeightErr()) {
			errMsg = "超重";
			back = true;
			}
			// 退回
			if (back) {
			if (stano == inSta.getBackSta().shortValue()) {
			continue;
			}
			if (workNo == 0 && stano == 0) {
			continue;
			}
			if (!staProtocol.isPakMk()) {
			continue;
			}
			// News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
			staProtocol.setWorkNo(workNo);
			staProtocol.setStaNo(inSta.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
			if (taskWrk != null) {
			taskWrk.setMemo(errMsg);//将错误码存入备注字段进行展示
			taskWrk.setModiTime(new Date());
			taskWrkMapper.updateById(taskWrk);
			}
			continue;
			}
			// 判断是否满足入库条件
			if (staProtocol.isAutoing() && staProtocol.isLoading()
			&& staProtocol.isInEnable()
			&& staProtocol.isEmptyMk() && (workNo == 0 \|\| (workNo>9000 && workNo<10000))
			&& staProtocol.isPakMk()
			&& staProtocol.isPakMkWalk()
			) {
			// 请求wms接口，获取工作号和目标库位
			ToWmsDTO toWmsDTO = new ToWmsDTO("", staProtocol.getSiteId(), 1);

			HashMap<String, Object> headParam = new HashMap<>();
			headParam.put("Content-Type", "application/json");
			String response;
			try {
			response = new HttpHandler.Builder()
			// .setHeaders(headParam)
			.setUri(wmsUrl)
			.setPath(inboundTaskApplyPath)
			.setJson(JSON.toJSONString(toWmsDTO))
			.build()
			.doPost();
			} catch (Exception e) {
			log.error("请求入库调用接口失败");
			log.error("异常信息打印：" + e);
			try {
			BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
			if (Cools.isEmpty(basDevp)) {
			log.error("站点号异常" + inSta.getStaNo());
			} else if (basDevp.getStaErr() != 0) {
			basDevp.setStaErr(2);
			basDevpService.updateById(basDevp);
			}
			} catch (Exception e1) {
			// 退回
			log.error("扫码检测程序异常" + inSta.getStaNo() + "异常信息" + e1);
			}
			staProtocol.setWorkNo(9999);
			staProtocol.setStaNo(inSta.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			continue;
			}

			JSONObject jsonObject = JSON.parseObject(response);
			apiLogService.save("wms请求入库货位接口"
			, wmsUrl + inboundTaskApplyPath
			, null
			, "127.0.0.1"
			, JSON.toJSONString(toWmsDTO)
			, response
			, true
			);
			log.info("入库请求参数{}" + JSON.toJSONString(toWmsDTO));
			log.info("入库请求返回参数{}" + JSON.toJSONString(response));
			if (jsonObject.getInteger("code").equals(200)) {
			try {
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			} catch (Exception e) {
			// log.error("扫码检测程序异常"+inSta.getStaNo()+"异常信息"+e);
			// 退回
			log.error("扫码检测程序异常" + inSta.getStaNo() + errMsg);
			log.error("扫码检测程序异常,异常信息" + e);

			staProtocol.setWorkNo(9999);
			staProtocol.setStaNo(inSta.getStaNo());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			} else {
			continue;
			}
			}
			}
			}
			} catch (Exception e) {
			log.error("generateStoreWrkFile e", e);
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}


			public void generateStoreWrkFileWalk() {
			try {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历入库口
			for (DevpSlave.Sta inSta : devp.getInWalkSta()) {
			// 获取入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			Integer workNo = staProtocol.getWorkNo();

			// 判断是否满足入库条件
			if (staProtocol.isAutoing() && staProtocol.isLoading()
			&& staProtocol.isInEnable() && (workNo == 0 \|\| (workNo>9000 && workNo<10000))
			&& staProtocol.isPakMkWalk()
			) {
			if (inSta.isBarcodeSign()){
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
			// 请求wms接口，获取工作号和目标库位
			ToWmsDTO toWmsDTO = new ToWmsDTO(barcode, staProtocol.getSiteId(), 0);
			TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));

			if (!Cools.isEmpty(taskWrk1)) {
			log.info("托盘码：" + barcode + "任务档存在");
			if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("CRN_NO", taskWrk1.getCrnNo()).eq("TYPE_NO", 1).eq("STN_NO", staProtocol.getSiteId()));

			if (Cools.isEmpty(staDesc)) {
			log.info("托盘码：" + barcode + "任务档存在");
			return;
			} else {
			staProtocol.setWorkNo(taskWrk1.getWrkNo());
			staProtocol.setStaNo(staDesc.getCrnStn());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			}
			return;
			}
			} else {
			TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>());

			if (!Cools.isEmpty(taskWrk1)) {
			if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("CRN_NO", taskWrk1.getCrnNo()).eq("TYPE_NO", 1).eq("STN_NO", staProtocol.getSiteId()));

			if (Cools.isEmpty(staDesc)) {
			return;
			} else {
			staProtocol.setWorkNo(taskWrk1.getWrkNo());
			staProtocol.setStaNo(staDesc.getCrnStn());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			}
			return;
			}
			}
			} else {
			TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>());

			if (!Cools.isEmpty(taskWrk1)) {
			if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("CRN_NO", taskWrk1.getCrnNo()).eq("TYPE_NO", 1).eq("STN_NO", staProtocol.getSiteId()));

			if (Cools.isEmpty(staDesc)) {
			return;
			} else {
			staProtocol.setWorkNo(taskWrk1.getWrkNo());
			staProtocol.setStaNo(staDesc.getCrnStn());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			}
			return;
			}
			}
			}


			}
			}
			} catch (Exception e) {
			log.error("generateStoreWrkFile e", e);
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}

			/**
			* 堆垛机站出库到出库站
			*/
			public void crnStnToOutStn() {
			for (CrnSlave crnSlave : slaveProperties.getCrn()) {

			// 获取堆垛机信息
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) {
			continue;
			}
			BasCrnp basCrnp = basCrnpService.selectById(crnSlave.getId());
			if (basCrnp == null) {
			log.error("{}号堆垛机尚未在数据库进行维护！", crnSlave.getId());
			continue;
			}
			if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
			for (CrnSlave crnOther : slaveProperties.getCrn()) {
			if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
			crnSlave.updateCrnInStn(crnOther);
			}
			}
			}
			// 遍历堆垛机出库站
			for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
			for (StaDesc staDesc : staDescs){
			try{

			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("CRN_NO", crnProtocol.getLaneNo()).eq("CRN_STN", crnStn.getStaNo()));
			for (StaDesc staDesc : staDescs) {
			try {
			// 获取堆垛机出库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
			@@ -394,37 +586,37 @@
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getStaNo() == 0)) {
			// 查询工作档
			TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
			TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnProtocol.getLaneNo(), staDesc.getStnNo().toString());
			if (taskWrk == null) {
			continue;
			}
			log.info("下发输送线任务：taskWrk:"+JSON.toJSONString(taskWrk));
			log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
			// R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
			staProtocol.setWorkNo(taskWrk.getWrkNo());
			staProtocol.setStaNo(staDesc.getCrnStn());
			boolean offer = false;
			try{
			try {
			offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
			}catch (Exception e){
			log.error("下发输送线任务失败：异常:"+e);
			log.error("下发输送线任务失败：异常:offer:"+offer);
			} catch (Exception e) {
			log.error("下发输送线任务失败：异常:" + e);
			log.error("下发输送线任务失败：异常:offer:" + offer);
			}
			// JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
			if (offer){
			log.info("下发输送线任务成功：taskWrk:"+JSON.toJSONString(taskWrk));
			if (offer) {
			log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
			Date now = new Date();
			taskWrk.setStatus(5);
			taskWrk.setWrkSts(14);
			taskWrk.setModiTime(now);
			taskWrk.setCompleteTime(now);
			taskWrkService.updateById(taskWrk);
			}else {
			log.error("下发输送线任务失败：taskWrk:"+JSON.toJSONString(taskWrk));
			} else {
			log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
			// log.error("下发输送线任务失败：异常信息:"+JSON.toJSONString(r));
			}
			}
			}catch (Exception e){
			log.error("出库到出库站异常:异常信息："+e);
			} catch (Exception e) {
			log.error("出库到出库站异常:异常信息：" + e);
			}
			}

			@@ -440,11 +632,21 @@
			// 获取堆垛机信息
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { continue; }
			if (crnProtocol == null) {
			continue;
			}
			BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
			if (basCrnp == null) {
			log.error("{}号堆垛机尚未在数据库进行维护！", crn.getId());
			continue;
			}

			if (!crn.getId().equals(crnProtocol.getLaneNo())) {
			for (CrnSlave crnOther : slaveProperties.getCrn()) {
			if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
			crn.updateCrnInStn(crnOther);
			}
			}
			}

			// 库位移转
			@@ -483,7 +685,8 @@
			*/
			public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol) throws IOException {
			for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("CRN_NO", crnProtocol.getLaneNo()).eq("CRN_STN", crnStn.getStaNo()));

			for (StaDesc staDesc : staDescs) {
			boolean flag = false;
			// 获取堆垛机入库站信息
			@@ -501,7 +704,7 @@
			continue;
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
			&& staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
			&& staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
			flag = true;
			}
			if (!flag) {
			@@ -509,8 +712,8 @@
			}

			// 获取工作状态为2（设备上走）的入库工作档
			TaskWrk taskWrk = taskWrkMapper.selectPakIn(slave.getId(), staProtocol.getWorkNo().intValue(), staDesc.getStnNo().toString());
			if(null == taskWrk) {
			TaskWrk taskWrk = taskWrkMapper.selectPakIn(crnProtocol.getLaneNo(), staProtocol.getWorkNo().intValue(), staDesc.getStnNo().toString());
			if (null == taskWrk) {
			continue;
			}

			@@ -520,7 +723,7 @@
			}

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

			@@ -568,7 +771,8 @@

			// 命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(staDesc.getCrnNo()); // 堆垛机编号
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setCrnNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
			crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			@@ -578,23 +782,23 @@
			crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 目标库位列
			crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 目标库位层
			crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 目标库位排
			crnCommand.setCommand((short)1);
			if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand),false)) {
			crnCommand.setCommand((short) 1);
			if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
			log.error("堆垛机命令生成失败，堆垛机号={}，任务数据={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
			throw new CoolException("堆垛机命令生成失败");
			}else{
			try{
			} else {
			try {
			taskWrkService.updateById(taskWrk);
			}catch (Exception e){
			} catch (Exception e) {
			log.error("修改工作档状态 2.设备上走 => 3.吊车入库中失败！！，工作号={}", taskWrk.getWrkNo());
			log.error("修改工作档状态 2.设备上走 => 3.吊车入库中失败！！，异常："+e);
			log.error("修改工作档状态 2.设备上走 => 3.吊车入库中失败！！，异常：" + e);
			}
			try{
			try {
			HashMap<String, Object> headParam = new HashMap<>();
			headParam.put("taskNo",taskWrk.getTaskNo());
			headParam.put("status",taskWrk.getStatus());
			headParam.put("ioType",taskWrk.getIoType());
			headParam.put("barcode",taskWrk.getBarcode());
			headParam.put("taskNo", taskWrk.getTaskNo());
			headParam.put("status", taskWrk.getStatus());
			headParam.put("ioType", taskWrk.getIoType());
			headParam.put("barcode", taskWrk.getBarcode());
			String response;
			response = new HttpHandler.Builder()
			// .setHeaders(headParam)
			@@ -605,14 +809,14 @@
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			apiLogService.save("wcs派发入库任务上报wms"
			,wmsUrl+taskStatusFeedbackPath
			,null
			,"127.0.0.1"
			,JSON.toJSONString(headParam)
			,response
			,true
			, wmsUrl + taskStatusFeedbackPath
			, null
			, "127.0.0.1"
			, JSON.toJSONString(headParam)
			, response
			, true
			);
			} catch (Exception e){
			} catch (Exception e) {
			log.error("wcs派发入库任务上报wms失败", JSON.toJSONString(taskWrk));
			// throw new CoolException("wcs派发入库任务上报wms失败");
			}
			@@ -628,17 +832,17 @@
			* 出库 ===>> 库位到堆垛机站
			* 2022-06-09 TQS修改，查询工作档LIST，遍历下发，防止第一个任务堵塞出库
			*/
			public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(slave.getId(), null);
			if (taskWrksInitial.size()==0){
			public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
			List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(crnProtocol.getLaneNo(), null);
			if (taskWrksInitial.size() == 0) {
			return;
			}
			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
			for (StaDesc staDesc : staDescs){
			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("CRN_NO", crnProtocol.getLaneNo()).eq("CRN_STN", crnStn.getStaNo()));
			for (StaDesc staDesc : staDescs) {
			// 获取工作状态为11（生成出库ID）的出库工作档
			List<TaskWrk> taskWrks = taskWrkMapper.selectPakOut(slave.getId(),staDesc.getStnNo().toString());
			for (TaskWrk taskWrk : taskWrks){
			List<TaskWrk> taskWrks = taskWrkMapper.selectPakOut(crnProtocol.getLaneNo(), staDesc.getStnNo().toString());
			for (TaskWrk taskWrk : taskWrks) {
			if (taskWrk == null) {
			continue;
			}
			@@ -664,7 +868,7 @@
			}

			// 判断堆垛机出库站状态
			if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
			if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
			&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
			// 命令下发区 --------------------------------------------------------------------------

			@@ -674,12 +878,13 @@
			}

			// 已经存在吊车执行任务时，则过滤
			if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
			if (taskWrkMapper.selectCrnWorking(crnProtocol.getLaneNo()) != null) {
			break;
			}

			CrnCommand command = new CrnCommand();
			command.setCrnNo(taskWrk.getCrnNo()); // 堆垛机编号
			command.setCrnNo(slave.getId()); // 堆垛机编号
			command.setLaneNo(crnProtocol.getLaneNo()); // 堆垛机编号
			command.setTaskNo(taskWrk.getWrkNo().shortValue()); // 工作号
			command.setAckFinish((short) 0); // 任务完成确认位
			command.setTaskMode(CrnTaskModeType.PAKIN); // 任务模式
			@@ -689,12 +894,12 @@
			command.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			command.setDestinationPosY(crnStn.getBay().shortValue()); // 目标库位列
			command.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			command.setCommand((short)1);
			if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command),false)) {
			log.error("堆垛机命令生成失败，堆垛机号={}，任务数据={}", taskWrk.getCrnNo(), JSON.toJSON(command));
			command.setCommand((short) 1);
			if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command), false)) {
			log.error("堆垛机命令生成失败，堆垛机号={}，巷道={}，任务数据={}", slave.getId(), taskWrk.getCrnNo(), JSON.toJSON(command));
			throw new CoolException("堆垛机命令生成失败");
			}else{
			try{
			} else {
			try {
			// 修改工作档状态 11.生成出库ID => 12.吊车出库中
			Date now = new Date();
			taskWrk.setWrkSts(12);
			@@ -704,16 +909,16 @@
			if (taskWrkMapper.updateById(taskWrk) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			}
			}catch (Exception e){
			} catch (Exception e) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，异常："+e);
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，异常：" + e);
			}
			try{
			try {
			HashMap<String, Object> headParam = new HashMap<>();
			headParam.put("taskNo",taskWrk.getTaskNo());
			headParam.put("status",taskWrk.getStatus());
			headParam.put("ioType",taskWrk.getIoType());
			headParam.put("barcode",taskWrk.getBarcode());
			headParam.put("taskNo", taskWrk.getTaskNo());
			headParam.put("status", taskWrk.getStatus());
			headParam.put("ioType", taskWrk.getIoType());
			headParam.put("barcode", taskWrk.getBarcode());
			String response;
			response = new HttpHandler.Builder()
			// .setHeaders(headParam)
			@@ -724,14 +929,14 @@
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			apiLogService.save("wcs派发出库任务上报wms"
			,wmsUrl+taskStatusFeedbackPath
			,null
			,"127.0.0.1"
			,JSON.toJSONString(headParam)
			,response
			,true
			, wmsUrl + taskStatusFeedbackPath
			, null
			, "127.0.0.1"
			, JSON.toJSONString(headParam)
			, response
			, true
			);
			}catch (Exception e){
			} catch (Exception e) {
			log.error("wcs派发出库任务上报wms失败", JSON.toJSONString(taskWrk));
			// throw new CoolException("wcs派发入库任务上报wms失败");
			}
			@@ -745,16 +950,16 @@
			/**
			* 库位移转
			*/
			public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol) {
			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			// 获取工作状态为11（生成出库ID）的移库工作档
			List<TaskWrk> taskWrks = taskWrkMapper.selectList(
			new EntityWrapper<TaskWrk>()
			.eq("CRN_NO",slave.getId())
			.eq("WRK_STS",11)
			.eq("IO_TYPE",3)
			.orderBy("IO_PRI",false));
			for (TaskWrk taskWrk : taskWrks){
			.eq("CRN_NO", crnProtocol.getLaneNo())
			.eq("WRK_STS", 11)
			.eq("IO_TYPE", 3)
			.orderBy("IO_PRI", false));
			for (TaskWrk taskWrk : taskWrks) {

			// 双深库位且浅库位有货，则需先对浅库位进行库位移转
			// if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
			@@ -770,7 +975,7 @@
			}

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

			@@ -786,11 +991,10 @@
			// 命令下发区 --------------------------------------------------------------------------




			// 1.堆垛机开始移动
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setLaneNo(crnProtocol.getLaneNo()); // 堆垛机编号
			crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			@@ -801,7 +1005,7 @@
			crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 目标库位列
			crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 目标库位层
			crnCommand.setCommand((short) 1);
			if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand),false)) {
			if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 11.生成出库ID => 12.吊车出库中
			@@ -813,12 +1017,12 @@
			if (taskWrkMapper.updateById(taskWrk) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			}
			try{
			try {
			HashMap<String, Object> headParam = new HashMap<>();
			headParam.put("taskNo",taskWrk.getTaskNo());
			headParam.put("status",taskWrk.getStatus());
			headParam.put("ioType",taskWrk.getIoType());
			headParam.put("barcode",taskWrk.getBarcode());
			headParam.put("taskNo", taskWrk.getTaskNo());
			headParam.put("status", taskWrk.getStatus());
			headParam.put("ioType", taskWrk.getIoType());
			headParam.put("barcode", taskWrk.getBarcode());
			String response;
			response = new HttpHandler.Builder()
			// .setHeaders(headParam)
			@@ -829,14 +1033,14 @@
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			apiLogService.save("wcs派发移库任务上报wms"
			,wmsUrl+taskStatusFeedbackPath
			,null
			,"127.0.0.1"
			,JSON.toJSONString(headParam)
			,response
			,true
			, wmsUrl + taskStatusFeedbackPath
			, null
			, "127.0.0.1"
			, JSON.toJSONString(headParam)
			, response
			, true
			);
			}catch (Exception e){
			} catch (Exception e) {
			log.error("wcs派发移库库任务上报wms失败", taskWrk);
			// throw new CoolException("wcs派发移库库任务上报wms失败");
			}
			@@ -856,25 +1060,35 @@
			// 获取堆垛机信息
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { continue; }
			if (crnProtocol == null) {
			continue;
			}

			if (!crn.getId().equals(crnProtocol.getLaneNo())) {
			for (CrnSlave crnOther : slaveProperties.getCrn()) {
			if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
			crn.updateCrnInStn(crnOther);
			}
			}
			}

			// 状态：等待确认并且任务完成位 = 1
			if (!Cools.isEmpty(crnProtocol.getTaskFinish()) && crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
			//获取入库待确认工作档
			TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
			if (Cools.isEmpty(taskWrk)&&crnProtocol.getTaskNo() !=999) {
			log.error("堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
			TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crnProtocol.getLaneNo(), crnProtocol.getTaskNo().intValue());
			if (Cools.isEmpty(taskWrk) && crnProtocol.getTaskNo() != 999) {
			log.error("堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，巷道号={}，工作号={}", crn.getId(), crnProtocol.getLaneNo(), crnProtocol.getTaskNo());
			continue;
			}
			Thread.sleep(300);
			//确认完成信号
			CrnOperatorParam crnOperatorParam=new CrnOperatorParam();
			CrnOperatorParam crnOperatorParam = new CrnOperatorParam();
			crnOperatorParam.setCrnNo(crn.getId());
			Date now = new Date();

			crnController.crnTaskComplete(crnOperatorParam);
			if(!Cools.isEmpty(taskWrk)){
			if(taskWrk.getIoType()==1 && taskWrk.getWrkSts()==3){
			if (!Cools.isEmpty(taskWrk)) {
			if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 3) {
			taskWrk.setWrkSts(4);//入库完成
			taskWrk.setStatus(5);//完结
			//更新库位状态
			@@ -884,7 +1098,7 @@
			locMast.setModiTime(now);
			locMast.setModiUser(9999L);
			locMastService.updateById(locMast);
			}else if(taskWrk.getIoType()==2&&taskWrk.getWrkSts()==12){
			} else if (taskWrk.getIoType() == 2 && taskWrk.getWrkSts() == 12) {
			taskWrk.setWrkSts(13);//出库完成
			taskWrk.setStatus(5);//完结
			//更新库位状态
			@@ -894,7 +1108,7 @@
			locMast.setModiTime(now);
			locMast.setModiUser(9999L);
			locMastService.updateById(locMast);
			}else if(taskWrk.getIoType()==3&&taskWrk.getWrkSts()==12){
			} else if (taskWrk.getIoType() == 3 && taskWrk.getWrkSts() == 12) {
			taskWrk.setWrkSts(4);//入库完成
			taskWrk.setStatus(5);//完结
			//更新库位状态
			@@ -917,12 +1131,12 @@
			taskWrkService.updateById(taskWrk);


			try{
			try {
			HashMap<String, Object> headParam = new HashMap<>();
			headParam.put("taskNo",taskWrk.getTaskNo());
			headParam.put("status",taskWrk.getStatus());
			headParam.put("ioType",taskWrk.getIoType());
			headParam.put("barcode",taskWrk.getBarcode());
			headParam.put("taskNo", taskWrk.getTaskNo());
			headParam.put("status", taskWrk.getStatus());
			headParam.put("ioType", taskWrk.getIoType());
			headParam.put("barcode", taskWrk.getBarcode());
			String response;
			log.error("wcs完结任务上报wms==》", headParam);

			@@ -939,14 +1153,14 @@
			// log.error("wcs完结任务上报wms==》", jsonObject);

			apiLogService.save("wcs派发入库任务上报wms"
			,wmsUrl+taskStatusFeedbackPath
			,null
			,"127.0.0.1"
			,JSON.toJSONString(headParam)
			,response
			,true
			, wmsUrl + taskStatusFeedbackPath
			, null
			, "127.0.0.1"
			, JSON.toJSONString(headParam)
			, response
			, true
			);
			}catch (Exception e){
			} catch (Exception e) {
			log.error("wcs完结任务上报wms失败", taskWrk);
			log.error("wcs完结任务上报wms失败,报错信息：", e);
			// throw new CoolException("wcs派发入库任务上报wms失败");
			@@ -960,7 +1174,7 @@
			/**
			* 堆垛机异常信息记录
			*/
			public void recCrnErr(){
			public void recCrnErr() {
			Date now = new Date();
			for (CrnSlave crn : slaveProperties.getCrn()) {
			// 获取堆垛机信息
			@@ -982,7 +1196,7 @@
			continue;
			}
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
			String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
			BasErrLog basErrLog = new BasErrLog(
			null, // 编号
			wrkMast.getWrkNo(), // 工作号
			@@ -1029,7 +1243,7 @@
			// 记录新异常
			if (latest == null \|\| (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
			String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
			BasErrLog basErrLog = new BasErrLog(
			null, // 编号
			null, // 工作号
			@@ -1044,7 +1258,7 @@
			null, // 源站
			null, // 源库位
			null, // 条码
			(int)crnProtocol.getAlarm(), // 异常码
			(int) crnProtocol.getAlarm(), // 异常码
			errName, // 异常
			1, // 异常情况
			now, // 添加时间
			@@ -1075,9 +1289,9 @@
			}
			}

			private TaskWrk createTask(GetWmsDto dto, String barcode){
			private TaskWrk createTask(GetWmsDto dto, String barcode) {
			String wcsLocNo = dto.getLocNo();
			if(Cools.isEmpty(wcsLocNo)){
			if (Cools.isEmpty(wcsLocNo)) {
			return null;
			}
			Date now = new Date();
			@@ -1097,7 +1311,7 @@
			taskWrk.setCrnNo(locMast.getCrnNo());
			taskWrk.setTargetPoint(wcsLocNo);
			taskWrk.setStartPoint(dto.getStaNo().toString());
			if(taskWrk.getIoType() == 1){
			if (taskWrk.getIoType() == 1) {
			taskWrk.setWrkSts(2);
			if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
			taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
			@@ -1106,70 +1320,441 @@
			return taskWrk;
			}

			public boolean deviceDetection(RgvSlave slave){
			public String rgvOtherTaskWrk(RgvSlave slave) {

			RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, slave.getOtherId());
			TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache();
			ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol();
			if (!allTaskProtocol.isEmpty()) {
			for (TaskProtocol taskProtocol : allTaskProtocol.values()) {
			if (taskProtocol.getTaskNo() != 0) {
			return taskProtocol.getTaskNo().toString();
			}
			}
			}
			return "无";

			}

			public boolean rgvDetection(RgvSlave slave) {
			RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
			if (rgvProtocol == null) {
			RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());

			if (rgvProtocol == null \|\| rgvTaskProtocol == null) {
			return false;
			}
			if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) \|\| rgvProtocol.getRgvPos().equals(0L)
			if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) \|\| rgvProtocol.getRgvPos().equals(0L) \|\| rgvTaskProtocol.getAvoid() == -1 \|\| rgvProtocol.getRgvPosDestination() == 0L
			\|\| (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
			return false;
			}
			RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
			RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());

			if (rgvProtocolOther == null) {
			return false;
			}
			if (rgvProtocolOther.statusEnable){
			if (!rgvProtocolOther.getModeType().equals(RgvModeType.AUTO) \|\| rgvProtocolOther.getRgvPos().equals(0L)) {
			if (rgvProtocolOther.statusEnable) {
			if (!rgvProtocolOther.getModeType().equals(RgvModeType.AUTO) \|\| rgvProtocolOther.getRgvPos().equals(0L) \|\| rgvTaskProtocolOther.getAvoid() == -1 \|\| rgvProtocolOther.getRgvPosDestination() == 0L) {
			return false;
			}
			}
			return true;
			}

			public boolean rgvOtherStatusEnable(RgvSlave slave){
			public TaskWrk deviceDetection(RgvSlave.RgvStn inSta) {

			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, inSta.getDevpPlcId());
			StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
			if (staProtocol == null) {
			return null;
			}
			// 判断是否满足取货条件
			if (staProtocol.isAutoing()
			// && staProtocol.isLoading()
			&& staProtocol.getWorkNo() != 0) {
			TaskWrk taskWrk = taskWrkService.selectByTaskNo(staProtocol.getWorkNo().toString());
			if (taskWrk != null) {
			return taskWrk;
			}
			}
			return null;
			}

			public boolean rgvOtherStatusEnable(RgvSlave slave) {
			RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
			if (rgvProtocolOther == null) {
			return true;
			}
			if (rgvProtocolOther.statusEnable){
			if (rgvProtocolOther.statusEnable) {
			// if (!rgvProtocolOther.getModeType().equals(RgvModeType.AUTO) \|\| rgvProtocolOther.getRgvPos().equals(0L)) {
			return true;
			return true;
			// }
			}
			return false;
			}


			private void sc(){


			// 根据输送线plc遍历
			public synchronized void taskStart() {
			for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
			if (!deviceDetection(rgvSlave)){
			try {
			if (rgvDetection(rgvSlave)) {
			String taskNoNow = rgvOtherTaskWrk(rgvSlave);
			List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<BasDevpPosition>().orderBy("PLC_POSITION", true));
			boolean itSmall = new TrackRangeUtils().IsItSmall(rgvSlave);
			if (basDevpPositions.isEmpty()) {
			log.error("获取所有站点信息异常");
			continue;
			}
			List<TaskWrk> taskWrkList = new ArrayList<>();
			List<Integer> staList = new ArrayList<>();
			for (RgvSlave.RgvStn inSta : rgvSlave.getRgvInSta()) {
			TaskWrk taskWrk = deviceDetection(inSta);
			if (taskWrk != null) {
			if (taskWrk.getTaskNo().equals(taskNoNow)) continue;
			taskWrkList.add(taskWrk);
			staList.add(inSta.getStaNo());
			}
			}

			if (taskWrkList.isEmpty() \|\| staList.isEmpty()) continue;

			boolean sign = false;

			if (rgvOtherStatusEnable(rgvSlave)) {
			//分成上下两部分任务
			List<Integer>[] avoidRange = RouteUtils.gradeRange(staList, basDevpPositions, itSmall);
			List<Integer> rangeListSou = avoidRange[itSmall ? 0 : 1];
			List<Integer> rangeListSouOther = avoidRange[itSmall ? 1 : 0];
			//就近排序
			RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(rgvSlave.getId());
			List<Integer> rangeList = RouteUtils.SortNearby(rangeListSou, rgvProtocol.RgvPos, basDevpPositions);
			List<Integer> rangeListOther = RouteUtils.SortNearby(rangeListSouOther, rgvProtocol.RgvPos, basDevpPositions);

			//所属部分就进取货

			//筛选范围内任务
			//就近排序
			//筛选在范围任务
			Long[][] avoidedRange = new TrackRangeUtils().avoidRangeArr(rgvSlave, trackEntireLength, trackBenchmark, avoidDistance);
			List<Integer> belongToRange = RouteUtils.SortNearby(RouteUtils.belongToRange(rangeList, avoidedRange[0], basDevpPositions), rgvProtocol.RgvPos, basDevpPositions);

			for (Integer staNoNow : belongToRange) {
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
			if (rgvStn.getStaNo().equals(staNoNow)) {
			TaskWrk taskWrk = deviceDetection(rgvStn);
			if (taskWrk != null) {
			BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", taskWrk.getTargetPointConvert()));
			if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
			sign = taskGenerate(rgvSlave, rgvStn, 0);
			}
			}
			break;
			}
			}
			if (sign) {
			break;
			}
			}
			if (!sign) {
			// 筛选范围内取货任务
			for (Integer staNoNow : belongToRange) {
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
			if (rgvStn.getStaNo().equals(staNoNow)) {
			sign = taskGenerate(rgvSlave, rgvStn, 0);
			break;
			}
			}
			if (sign) {
			break;
			}
			}
			}

			if (!sign) {
			for (Integer staNoNow : rangeList) {
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
			if (rgvStn.getStaNo().equals(staNoNow)) {
			TaskWrk taskWrk = deviceDetection(rgvStn);
			if (taskWrk != null) {
			BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", taskWrk.getTargetPointConvert()));
			if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
			sign = taskGenerate(rgvSlave, rgvStn, 0);
			}
			}
			break;
			}
			}
			if (sign) {
			break;
			}
			}
			}
			if (!sign) {
			// 半边区域内取货任务
			for (Integer staNoNow : rangeList) {
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
			if (rgvStn.getStaNo().equals(staNoNow)) {
			sign = taskGenerate(rgvSlave, rgvStn, 0);
			break;
			}
			}
			if (sign) {
			break;
			}
			}
			}
			if (!sign) {
			// 半边区域内放货任务
			for (Integer staNoNow : rangeListOther) {
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
			if (rgvStn.getStaNo().equals(staNoNow)) {
			TaskWrk taskWrk = deviceDetection(rgvStn);
			if (taskWrk != null) {
			BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", taskWrk.getTargetPointConvert()));
			if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
			sign = taskGenerate(rgvSlave, rgvStn, 0);
			}
			}
			break;
			}
			}
			if (sign) {
			break;
			}
			}
			}
			} else {
			//可用区域就近取货
			//就近排序
			RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(rgvSlave.getId());
			List<Integer> rangeList = RouteUtils.SortNearby(staList, rgvProtocol.RgvPos, basDevpPositions);
			// 半边区域内取货任务
			for (Integer staNoNow : rangeList) {
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
			if (rgvStn.getStaNo().equals(staNoNow)) {
			sign = taskGenerate(rgvSlave, rgvStn, 0);
			break;
			}
			}
			if (sign) {
			break;
			}
			}
			}
			}
			} catch (Exception e) {
			log.error("任务生成失败===》异常信息：{}", e.getMessage());
			}
			}
			}

			//获取起点与终点对象
			public RgvSlave.RgvStn getRgvStnNow(RgvSlave rgvSlave, Integer staNo) {
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
			if (rgvStn.getStaNo().equals(staNo)) {
			return rgvStn;
			}
			}
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvOutSta()) {
			if (rgvStn.getStaNo().equals(staNo)) {
			return rgvStn;
			}
			}
			return null;
			}

			//获取起点与终点对象
			public RgvSlave.RgvStn[] getRgvStnAll(RgvSlave rgvSlave, Integer souSta, Integer endSta) {
			RgvSlave.RgvStn[] rgvStns = new RgvSlave.RgvStn[2];
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
			if (rgvStn.getStaNo().equals(souSta)) {
			rgvStns[0] = rgvStn;
			}
			}
			for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvOutSta()) {
			if (rgvStn.getStaNo().equals(endSta)) {
			rgvStns[1] = rgvStn;
			}
			}
			return rgvStns;
			}

			public boolean taskGenerate(RgvSlave rgvSlave, RgvSlave.RgvStn rgvStn, Integer sign) {
			try {
			RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
			TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache();

			TaskProtocol issuedTake = new TaskProtocol();
			TaskProtocol issuedPut = new TaskProtocol();
			try {
			ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol();
			if (allTaskProtocol.size() > 0) {
			return false;
			}
			TaskWrk taskWrk = deviceDetection(rgvStn);
			if (taskWrk == null) {
			return false;
			}
			Integer targetPointConvert = taskWrk.getTargetPointConvert();
			if (targetPointConvert == null) {
			return false;
			}
			RgvSlave.RgvStn rgvStnEnd = getRgvStnNow(rgvSlave, targetPointConvert);
			if (rgvStnEnd == null) {
			return false;
			}

			BasDevpPosition basDevpPositionSou = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", rgvStn.getStaNo()));
			BasDevpPosition basDevpPositionEnd = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", targetPointConvert));
			//执行
			issuedTake.setTaskNo(Long.valueOf(taskWrk.getTaskNo()));
			issuedTake.setTaskStatus(1);
			issuedTake.setTaskNoDirection(issuedTake.gettaskNoDirection$(issuedTake.getTaskNo(), issuedTake.getTaskStatus()));
			issuedTake.setTargetPosition(basDevpPositionSou.getPlcPosition());
			issuedTake.setIsRunning(1);
			issuedTake.setDirection(rgvStn.isDirection());


			issuedPut.setTaskNo(Long.valueOf(taskWrk.getTaskNo()));
			issuedPut.setTaskStatus(2);
			issuedPut.setTaskNoDirection(issuedPut.gettaskNoDirection$(issuedPut.getTaskNo(), issuedPut.getTaskStatus()));
			issuedPut.setTargetPosition(basDevpPositionEnd.getPlcPosition());
			issuedPut.setIsRunning(1);
			issuedPut.setDirection(rgvStnEnd.isDirection());
			} catch (Exception e) {
			log.error("任务生成失败issued1===》异常信息：{}", e.getMessage());
			return false;
			}

			switch (sign) {
			case 1:
			taskProtocolCache.updateTaskProtocol(issuedTake);
			break;
			case 2:
			taskProtocolCache.updateTaskProtocol(issuedPut);
			break;
			default:
			taskProtocolCache.updateTaskProtocol(issuedTake);
			taskProtocolCache.updateTaskProtocol(issuedPut);
			break;
			}
			} catch (Exception e) {
			log.error("任务生成失败issued2===》异常信息：{}", e.getMessage());
			}
			return true;
			}

			/**
			* 出库 ===>> 工作档信息写入led显示器
			*/
			public synchronized void ledExecute(Integer mark) {

			for (LedSlave led : slaveProperties.getLed()) {
			// 获取输送线plc线程
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
			// 命令集合
			List<LedCommand> commands = new ArrayList<>();
			// 工作档集合
			List<WrkMast> wrkMasts = new ArrayList<>();
			for (Integer staNo : led.getStaArr()) {
			// 获取叉车站点
			StaProtocol staProtocol = devpThread.getStation().get(staNo);
			if (null == staProtocol \|\| null == staProtocol.getWorkNo() \|\| 0 == staProtocol.getWorkNo() \|\| !staProtocol.isLoading()) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			// 获取工作档数据
			LedCommand ledCommand = new LedCommand();

			//
			// ledCommand.setWorkNo(wrkMast.getWrkNo());
			// ledCommand.setIoType(wrkMast.getIoType());
			// ledCommand.setTitle("空板出库");
			// ledCommand.setEmptyMk(true);
			// ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
			// ledCommand.setLocNo(wrkMast.getLocNo());
			// ledCommand.setStaNo(wrkMast.getStaNo());
			MatDto matDto = new MatDto();
			ledCommand.getMatDtos().add(matDto);
			commands.add(ledCommand);
			}
			Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
			// 获取LED线程
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
			// 相同工作号集合则过滤
			if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
			continue;
			}
			RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(rgvSlave.getId());

			RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(rgvSlave.getOtherId());

			//求出当前车可运行范围
			Long[] farthestPoint = new Long[]{0L,0L};
			if (!rgvProtocolOther.statusEnable){
			farthestPoint = new Long[]{0L,0L};
			} else {
			if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)){

			// 命令下发 -------------------------------------------------------------------------------
			if (!commands.isEmpty()) {
			if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
			// News.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
			continue;
			}else {
			ledThread.setLedMk(false);
			}
			}

			try {
			// 修改主档led标记
			for (WrkMast wrkMast : wrkMasts) {
			wrkMast.setOveMk("Y");
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			// News.errorNoLog(""+mark+" - 4"+" - 更新工作档失败");
			throw new CoolException("更新工作档失败");
			}
			}

			// 遍历入库口
			for (RgvSlave.RgvStn inSta : rgvSlave.getRgvInSStn()) {
			// 更新线程当前工作号集合
			ledThread.setWorkNos(workNos);

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

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

			/**
			* 其他 ===>> LED显示器复位，显示默认信息
			*/
			public synchronized void ledReset(Integer mark) {

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

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

			}
			}
			}

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


			}