zy-wcs.git - Gitblit

			@@ -113,13 +113,15 @@
			private CrnController crnController;
			@Autowired
			private SiteController siteController;
			@Autowired
			private TaskWrkLogService taskWrkLogService;

			/**
			* 堆垛机演示 ===>> 库位移转
			*/
			public synchronized void crnDemoOfLocMove1() {
			try {
			List <BasCrnp> basCrnps =basCrnpService.selectList(new EntityWrapper<BasCrnp>());
			List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>());
			for (BasCrnp crn : basCrnps) {
			if (!crn.getEmpIn().equals("1")) {
			continue;
			@@ -131,7 +133,7 @@
			if (crnProtocol == null) {
			continue;
			}
			TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("crn_no",crn.getCrnNo()).eq("io_type",3));
			TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("crn_no", crn.getCrnNo()).eq("io_type", 3));
			if (taskWrk1 != null) {
			continue;
			}
			@@ -141,7 +143,7 @@

			LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getCrnNo());

			LocMast loc = locMastService.queryDemoLoc(crn.getCrnNo(),sourceLoc.getLocType1());
			LocMast loc = locMastService.queryDemoLoc(crn.getCrnNo(), sourceLoc.getLocType1());
			if (null == sourceLoc \|\| null == loc) {
			continue;
			}
			@@ -152,7 +154,7 @@
			// 保存工作档
			TaskWrk taskWrk = new TaskWrk();
			taskWrk.setWrkNo(workNo);
			taskWrk.setTaskNo(workNo+"");//任务号
			taskWrk.setTaskNo(workNo + "");//任务号
			taskWrk.setWrkSts(11); // 工作状态：11.生成出库ID
			taskWrk.setIoType(3); // 入出库状态： 3.库格移载
			taskWrk.setIoPri(13);
			@@ -164,7 +166,7 @@
			int res = taskWrkMapper.insert(taskWrk);
			if (res == 0) {
			throw new CoolException("保存工作档失败");
			}else {
			} else {
			loc.setCtnKind(1);
			locMastService.updateById(loc);
			}
			@@ -362,12 +364,13 @@
			storageEscalationParam.setWCSStatus(1);
			storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
			}
			log.info("组托入库={}", storageEscalationParam);
			storageEscalationParam.setBoxNo(BoxNo);
			//是否满板 1满板 0空板
			storageEscalationParam.setStaType(staProtocol.isEmptyMk()? 0:1);
			storageEscalationParam.setStaType(staProtocol.isEmptyMk() ? 0 : 1);
			//库位类型 1高库位 0低库位
			storageEscalationParam.setLocType(staProtocol.isHigh()? 1:0);
			storageEscalationParam.setLocType(staProtocol.isHigh() ? 1 : 0);
			storageEscalationParam.setTerminalNo(staProtocol.getSiteId());
			log.info("组托入库={}", storageEscalationParam);
			String response = "";
			Boolean success = false;
			try {
			@@ -389,7 +392,7 @@
			// 创新一个入库工作档
			TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
			if (Cools.isEmpty(taskWrk)) {
			taskWrk = createTask1(result, BoxNo);
			taskWrk = createTask1(result, BoxNo,staProtocol.getSiteId());
			if (Cools.isEmpty(taskWrk)) {
			log.error("库位异常，库位号：={}", taskWrk.getOriginTargetPoint());
			} else {
			@@ -442,6 +445,153 @@
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			}
			} 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);
			}
			} finally {
			apiLogService.save("wms请求入库货位接口"
			, wmsUrl + inboundTaskApplyPath
			, null
			, "127.0.0.1"
			, JSON.toJSONString(storageEscalationParam)
			, response
			, success
			);
			}
			log.info("入库请求参数=" + JSON.toJSONString(BoxNo));
			log.info("入库请求返回参数=" + JSON.toJSONString(response));
			}
			}
			}
			} catch (Exception e) {
			log.error("generateStoreWrkFile e", e);
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}

			//拣料回库
			public synchronized void PickingAndReturningToTheWarehouse() throws IOException, InterruptedException {
			try {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历入库口
			for (DevpSlave.Sta inSta : devp.getPickSta()) {
			StorageEscalationParam storageEscalationParam = new StorageEscalationParam();
			// 获取入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			Short workNo = staProtocol.getWorkNo();
			// 判断是否满足入库条件
			if (staProtocol.isAutoing() && staProtocol.isLoading()
			&& staProtocol.isInEnable()
			&& staProtocol.isPakMk()) {
			// 获取条码扫描仪信息
			String BoxNo = "";
			if(!staProtocol.isEmptyMk()&&staProtocol.getWorkNo()<9990){
			TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("task_no", workNo));

			if (!Cools.isEmpty(taskWrk1)) {
			BoxNo = taskWrk1.getBarcode();
			} else {
			TaskWrkLog taskWrkLog = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("task_no", workNo).orderBy("modi_time", false));
			if (taskWrkLog != null) {
			BoxNo = taskWrkLog.getBarcode();
			}
			}
			}
			log.info("组托入库={}", storageEscalationParam);
			storageEscalationParam.setBoxNo(BoxNo);
			//是否满板 1满板 0空板
			storageEscalationParam.setStaType(staProtocol.isEmptyMk() ? 0 : 1);
			//库位类型 1高库位 0低库位
			storageEscalationParam.setLocType(staProtocol.isHigh() ? 1 : 0);
			storageEscalationParam.setTerminalNo(staProtocol.getSiteId());
			String response = "";
			Boolean success = false;
			try {
			response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath(inboundTaskApplyPath)
			.setJson(JSON.toJSONString(storageEscalationParam))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);

			if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
			Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
			// 创新一个入库工作档
			TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
			if (Cools.isEmpty(taskWrk)) {
			taskWrk = createTask1(result, BoxNo,staProtocol.getSiteId());
			if (Cools.isEmpty(taskWrk)) {
			log.error("库位异常，库位号：={}", taskWrk.getOriginTargetPoint());
			} 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().shortValue());
			staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			HashMap<String, Object> hashMap = new HashMap<>();
			hashMap.put("TaskNo", taskWrk.getTaskNo());
			try {
			//开始上报,任务开始时，WCS回调WMS
			response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath(taskStatusFeedbackPath)
			.setJson(JSON.toJSONString(hashMap))
			.build()
			.doPost();
			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
			, null
			, "127.0.0.1"
			, JSON.toJSONString(hashMap)
			, response
			, bool
			);
			} catch (Exception e) {

			}
			}
			} else {
			staProtocol.setWorkNo((short) 9991);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}

			} else {
			staProtocol.setWorkNo((short) 9991);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}

			} catch (Exception e) {
			log.error("请求入库调用接口失败");
			log.error("异常信息打印：" + e);
			@@ -968,18 +1118,9 @@

			LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
			//判断其库位是否为深库位，如果为深库位找其浅库位是都有货
			if (locMast.getRow1() == 1 \|\| locMast.getRow1() == 5) {
			if (locMast.getRow1() == 8 \|\| locMast.getRow1() == 5) {
			LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("row1", (locMast.getRow1() + 1))
			.eq("bay1", locMast.getBay1())
			.eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
			if (!Cools.isEmpty(locMast1)) {
			log.info(locMast.getLocNo() + "出深库位，浅库位有货");
			continue;
			}
			} else if (locMast.getRow1() == 4 \|\| locMast.getRow1() == 8) {
			LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("row1", (locMast.getRow1() - 1))
			.eq("bay1", locMast.getBay1())
			.eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
			if (!Cools.isEmpty(locMast1)) {
			@@ -1013,11 +1154,11 @@
			if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) \|\| crnProtocol.getTaskNo() != 0) {
			break;
			}
			int storeCount = basDevpService.getStoreCount();
			if (storeCount >= maxCount) {
			log.error("输送线暂存数达到上限{}", storeCount);
			break;
			}
			// int storeCount = basDevpService.getStoreCount();
			// if (storeCount >= maxCount) {
			// log.error("输送线暂存数达到上限{}", storeCount);
			// break;
			// }


			// 已经存在吊车执行任务时，则过滤
			@@ -1627,7 +1768,7 @@
			return response;
			}

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


			@@ -1644,12 +1785,9 @@
			LocMast locMast = locMastService.selectByLocNo(locNo);
			taskWrk.setCrnNo(locMast.getCrnNo());
			taskWrk.setTargetPoint(locNo);
			taskWrk.setStartPoint("116");
			if (result.getAlley().equals("1")) {
			taskWrk.setCrnNo(1);
			} else {
			taskWrk.setCrnNo(2);
			}
			taskWrk.setStartPoint(staNo+"");
			taskWrk.setCrnNo(Integer.valueOf(result.getAlley()));//堆垛机号

			if (taskWrk.getIoType() == 1) {
			taskWrk.setWrkSts(2);
			if (!Cools.isEmpty(taskWrk.getTargetPoint())) {