zy-wcs.git - Gitblit

			@@ -7,7 +7,6 @@
			import com.core.common.R;
			import com.core.exception.CoolException;
			import com.zy.asrs.controller.CrnController;
			import com.zy.asrs.controller.OpenController;
			import com.zy.asrs.controller.SiteController;
			import com.zy.asrs.domain.enums.TaskStatusType;
			import com.zy.asrs.domain.enums.WorkNoType;
			@@ -15,7 +14,6 @@
			import com.zy.asrs.entity.*;
			import com.zy.asrs.entity.param.Result;
			import com.zy.asrs.entity.param.StorageEscalationParam;
			import com.zy.asrs.entity.param.TaskOverToWms;
			import com.zy.asrs.mapper.*;
			import com.zy.asrs.service.*;
			import com.zy.asrs.utils.CommandUtils;
			@@ -30,14 +28,12 @@
			import com.zy.core.model.CrnSlave;
			import com.zy.core.model.DevpSlave;
			import com.zy.core.model.Task;
			import com.zy.core.model.command.CommandPackage;
			import com.zy.core.model.command.CrnCommand;
			import com.zy.core.model.protocol.CrnProtocol;
			import com.zy.core.model.protocol.StaProtocol;
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.thread.BarcodeThread;
			import com.zy.core.thread.SiemensDevpThread;
			import com.zy.system.entity.Config;
			import com.zy.system.service.ConfigService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -94,7 +90,10 @@
			private ApiLogService apiLogService;
			@Autowired
			private CommonService commonService;

			@Value("${wms.count}")
			private Integer maxCount;
			@Autowired
			private WrkMastService wrkMastService;
			@Value("${wms.url}")
			private String wmsUrl;
			@Value("${wms.inboundTaskApplyPath}")
			@@ -107,7 +106,6 @@
			private CrnController crnController;
			@Autowired
			private SiteController siteController;


			public synchronized void generateStoreWrkFile1() throws IOException, InterruptedException {
			try {
			@@ -205,7 +203,7 @@
			staProtocol.setStaNo((short)107);
			}else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
			staProtocol.setStaNo((short)109);
			}else{
			}else if (staProtocol.getWorkNo()>=9876 && staProtocol.getWorkNo() <= 9900){
			staProtocol.setStaNo((short)110);
			}
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			@@ -239,7 +237,9 @@
			JSONObject jsonObject1 = JSON.parseObject(response);
			Boolean bool = false;
			if(jsonObject1.get("ReturnStatus").equals(0)){
			taskWrk.setStatus(2);//派发任务
			bool = true;
			taskWrkService.updateById(taskWrk);
			}
			apiLogService.save("wcs开始入库任务上报wms"
			, wmsUrl + TaskExecCallback
			@@ -720,6 +720,7 @@
			continue;
			}


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

			// int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//获取入库工作号
			// taskWrk.setWrkNo(workNo);//工作号
			taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//派发状态
			// taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//派发状态
			taskWrk.setAssignTime(new Date());//派发时间
			taskWrk.setWrkSts(3);//工作状态 3.吊车入库
			taskWrk.setCrnNo(staDesc.getCrnNo());//堆垛机号
			@@ -845,6 +846,12 @@
			if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) \|\| crnProtocol.getTaskNo() != 0) {
			break;
			}
			int storeCount = basDevpService.getStoreCount();
			if(storeCount >= maxCount){
			log.error("输送线暂存数达到上限{}",storeCount);
			break;
			}


			// 已经存在吊车执行任务时，则过滤
			if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
			@@ -863,36 +870,6 @@
			command.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			command.setCommand((short) 1);

			if(Cools.isEmpty(taskWrk.getMarkStart())\|\|taskWrk.getMarkStart()==0){
			HashMap<String, Object> hashMap = new HashMap<>();
			hashMap.put("TaskNo",taskWrk.getTaskNo());
			String response = "";
			try {
			//开始上报,出库任务开始时，WCS回调WMS
			response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath(taskStatusFeedbackPath)
			.setJson(JSON.toJSONString(hashMap))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			Boolean bool = false;
			if(jsonObject.get("ReturnStatus").equals(0)){
			bool = true;
			taskWrk.setMarkStart(1);
			}
			apiLogService.save("wcs开始任务上报wms"
			, wmsUrl + TaskExecCallback
			, null
			, "127.0.0.1"
			, JSON.toJSONString(hashMap)
			, response
			, bool
			);
			} catch (Exception e) {
			}
			}

			if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command), false)) {
			log.error("堆垛机命令生成失败，堆垛机号={}，任务数据={}", taskWrk.getCrnNo(), JSON.toJSON(command));
			throw new CoolException("堆垛机命令生成失败");
			@@ -901,7 +878,6 @@
			// 修改工作档状态 11.生成出库ID => 12.吊车出库中
			Date now = new Date();
			taskWrk.setWrkSts(12);
			taskWrk.setStatus(2);
			taskWrk.setModiTime(now);
			if (taskWrkMapper.updateById(taskWrk) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			@@ -1006,15 +982,15 @@
			// 修改工作档状态 11.生成出库ID => 12.吊车出库中
			Date now = new Date();
			taskWrk.setWrkSts(12);
			taskWrk.setStatus(2);
			taskWrk.setModiTime(now);
			if (taskWrkMapper.updateById(taskWrk) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			}
			String response = "";
			Boolean bool=false;
			HashMap<String, Object> headParam = new HashMap<>();
			headParam.put("TaskNo", taskWrk.getTaskNo());
			try {
			HashMap<String, Object> headParam = new HashMap<>();
			headParam.put("TaskNo", taskWrk.getTaskNo());
			String response;
			response = new HttpHandler.Builder()
			// .setHeaders(headParam)
			.setUri(wmsUrl)
			@@ -1023,17 +999,24 @@
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			if(jsonObject.get("ReturnStatus").equals(0)){
			bool = true;
			taskWrk.setStatus(2);
			taskWrkMapper.updateById(taskWrk);
			}

			} catch (Exception e) {
			log.error("wcs派发移库库任务上报wms失败", taskWrk);
			// throw new CoolException("wcs派发移库库任务上报wms失败");
			}finally {
			apiLogService.save("wcs派发移库任务上报wms"
			, wmsUrl + taskStatusFeedbackPath
			, null
			, "127.0.0.1"
			, JSON.toJSONString(headParam)
			, response
			, true
			, bool
			);
			} catch (Exception e) {
			log.error("wcs派发移库库任务上报wms失败", taskWrk);
			// throw new CoolException("wcs派发移库库任务上报wms失败");
			}

			}
			@@ -1283,85 +1266,26 @@
			}
			}

			//自动派发任务
			public synchronized void autoDistribute() {
			Config config = configService.selectByCode("autoDistribute");
			if (config == null) {
			return;
			}

			if (config.getValue().equals("false")) {//判断是否开启自动派发任务
			return;
			}

			for (TaskWrk taskWrk : taskWrkService.selectReceive()) {

			try {
			taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
			} catch (CoolException e) {
			log.info(e.getMessage());
			}
			}
			}

			//agv取放货任务完成
			public synchronized void autoCompleteAGV() {
			List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
			try {
			Thread.sleep(500);
			} catch (Exception e) {

			}

			for (BasDevp basDevp : basDevps) {
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
			StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			if (basDevp.getWrkNo() != 0) {
			if (basDevp.getAgvTargetPick() != 0) {//取货
			staProtocol.setAgvTypeSign((short) 0);
			staProtocol.setStaNo(basDevp.getDevNo().shortValue());
			MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
			}
			boolean sign = true;
			if (basDevp.getAgvTargetPlace() != 0) {
			sign = false;
			basDevp.setAgvTargetPlace(0);
			basDevpService.updateById(basDevp);
			staProtocol.setAgvTypeSign((short) 3);//1
			staProtocol.setStaNo(basDevp.getDevNo().shortValue());
			MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
			}
			} else {
			if (basDevp.getAgvTargetPlace() != 0) {
			if (basDevp.getLoading().equals("Y")) {
			staProtocol.setAgvTypeSign((short) 1);
			staProtocol.setStaNo(basDevp.getDevNo().shortValue());
			MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
			} else {
			log.error("AGV放货完成但输送线无物，复位信号 ===>> [staNo:{}] [basDevp:{}]", basDevp.getDevNo(), basDevp);
			basDevp.setAgvTargetPlace(0);
			basDevpService.updateById(basDevp);
			staProtocol.setAgvTypeSign((short) 3);//1
			staProtocol.setStaNo(basDevp.getDevNo().shortValue());
			MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
			}

			}
			if (basDevp.getAgvTargetPick() != 0) {
			basDevp.setAgvTargetPick(0);
			basDevpService.updateById(basDevp);
			staProtocol.setAgvTypeSign((short) 2);//0
			staProtocol.setStaNo(basDevp.getDevNo().shortValue());
			MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
			}
			}
			}
			}
			// //自动派发任务
			// public synchronized void autoDistribute() {
			// Config config = configService.selectByCode("autoDistribute");
			// if (config == null) {
			// return;
			// }
			//
			// if (config.getValue().equals("false")) {//判断是否开启自动派发任务
			// return;
			// }
			//
			// for (TaskWrk taskWrk : taskWrkService.selectReceive()) {
			//
			// try {
			// taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
			// } catch (CoolException e) {
			// log.info(e.getMessage());
			// }
			// }
			// }

			public synchronized void autoCompleteTask() {
			List<TaskWrk> taskWrks = taskWrkMapper.selectWorkingTask();
			@@ -1412,71 +1336,6 @@
			}
			}


			public synchronized String CrnStartRunning(TaskWrk taskWrk) {
			String tasktype = null;
			switch (taskWrk.getIoType()) {
			case 1:
			tasktype = "RK";
			break;
			case 2:
			tasktype = "CK";
			break;
			case 3:
			tasktype = "YK";
			break;
			default:
			tasktype = "未知";
			}
			Map<String, Object> map = new HashMap<>();
			map.put("x-api-key", "7a15b5db-29b6-552c-8cff-0cfec3756da2");
			TaskOverToWms taskOverToWms = new TaskOverToWms();
			taskOverToWms.setFeedbackFrom("WCS"); //来源
			taskOverToWms.setWarehouseId("1688469798893297665"); //仓库标识
			taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //任务号
			taskOverToWms.setTaskType(tasktype); // 任务类型
			taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 容器编码
			if (taskWrk.getIoType() == 1 \|\| taskWrk.getIoType() == 3) {
			taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //设备编码
			taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //目标库位
			} else if (taskWrk.getIoType() == 2) {
			Map<Integer, String> map1 = new HashMap<>();
			map1.put(102, "J-1101");
			map1.put(106, "J-1103");
			map1.put(110, "J-1105");
			map1.put(114, "J-1107");
			map1.put(118, "J-1109");
			map1.put(122, "J-1111");
			map1.put(305, "H-1101");
			map1.put(405, "G-1101");
			taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //设备编码
			taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //源库位
			}

			taskOverToWms.setTaskStatus("executing"); //任务状态
			String response = null;
			try {
			response = new HttpHandler.Builder()
			.setHeaders(map)
			.setUri(wmsUrl)
			.setPath("wcsManager/wcsInterface/taskStatusFeedback")
			.setJson(JSON.toJSONString(taskOverToWms))
			.build()
			.doPost();
			} catch (Exception e) {
			log.error("堆垛机任务完成，请求wms任务完成接口失败");
			}
			apiLogService.save("堆垛机开始运行"
			, wmsUrl + "wcsManager/wcsInterface/taskStatusFeedback"
			, null
			, "127.0.0.1"
			, JSON.toJSONString(taskOverToWms)
			, response
			, true
			);
			return response;
			}

			private TaskWrk createTask1(Result result, String barcode) {
			String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn());

			@@ -1486,7 +1345,7 @@
			int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//获取入库工作号
			taskWrk.setTaskNo(result.getTaskNo());//任务号
			taskWrk.setWrkNo(workNo1);
			taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//任务状态：派发
			taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态：接收
			taskWrk.setCreateTime(now);
			taskWrk.setIoType(1);//任务类型
			taskWrk.setIoPri(13);//优先级