zy-wcs.git - Gitblit

			@@ -171,7 +171,12 @@
			&& staProtocol.isPakMk() && staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995) { // 9990-9992空托，9993-9995 满托，9999回退
			if(Cools.isEmpty(barcode) \|\| "NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "00000000".equals(barcode)) {
			News.info("{}条码扫描错误：{}",barcodeThread.getSlave().getId(),barcode);
			continue;
			staProtocol.setWorkNo(wrkNo);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, "条码扫描错误"));
			return;
			}
			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
			@@ -266,7 +271,8 @@
			staProtocol = staProtocol.clone();
			}

			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9999) {
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()
			&& staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行");
			WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
			if (wrkMast == null) {
			@@ -281,16 +287,16 @@
			// 获取目标站
			Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
			.eq("type_no", wrkMast.getIoType() - 50)
			.eq("stn_no", pickSta.getStaNo()) // 作业站点 = 拣料出库的目标站
			.eq("stn_no", wrkMast.getSourceStaNo()) // 作业站点 = 拣料出库的目标站
			.eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
			StaDesc staDesc = staDescService.selectOne(wrapper);
			if (Cools.isEmpty(staDesc)) {
			News.error(""+mark+" - 2"+" - 入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
			staProtocol.setWorkNo(wrkNo);
			staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1));
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发4："+wrkNo+","+(pickSta.getStaNo().shortValue()-(short)1));
			log.error("输送线下发4："+wrkNo+","+pickSta.getBackSta());
			//LED
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			// led 异常显示
			@@ -318,7 +324,7 @@
			wrkMast.setIoTime(now);
			wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
			wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
			wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
			wrkMast.setSourceStaNo(staProtocol.getSiteId()); // 源站
			wrkMast.setStaNo(staNo); // 目标站
			wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
			wrkMast.setSourceLocNo(""); // 源库位清空
			@@ -1495,7 +1501,7 @@
			wrkMast.setCrnNo(crn.getId());
			wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 源库位
			wrkMast.setLocNo(loc.getLocNo()); // 目标库位
			wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 满板
			wrkMast.setFullPlt(shallowLoc.getLocSts().equals("F") ? "Y" : "N"); // 满板
			wrkMast.setPicking("N"); // 拣料
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 空板

			@@ -139,18 +139,23 @@
			barcode: ${wcs-slave.barcode[1].id}
			backSta: 204
			led: ${wcs-slave.led[1].id}
			# # 拣料入库口1
			# pickSta[0]:
			# staNo: 104
			# barcode: ${wcs-slave.barcode[0].id}
			# backSta: 103
			# led: ${wcs-slave.led[1].id}
			# # 拣料入库口2
			# pickSta[1]:
			# staNo: 106
			# barcode: ${wcs-slave.barcode[1].id}
			# backSta: 105
			# led: ${wcs-slave.led[2].id}
			# 拣料入库口1
			pickSta[0]:
			staNo: 201
			barcode: ${wcs-slave.barcode[0].id}
			backSta: 202
			led: ${wcs-slave.led[0].id}
			# 拣料入库口2
			pickSta[1]:
			staNo: 205
			barcode: ${wcs-slave.barcode[2].id}
			led: ${wcs-slave.led[2].id}
			# 拣料入库口3
			pickSta[2]:
			staNo: 203
			barcode: ${wcs-slave.barcode[1].id}
			led: ${wcs-slave.led[1].id}
			backSta: 204
			# 出库口1
			outSta[0]:
			staNo: 204

	src/main/java/com/zy/core/MainProcess.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/service/impl/MainServiceImpl.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/application.yml	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -41,7 +41,7 @@
			}

			// 拣料、并板、盘点再入库
			// mainService.stnToCrnStnPick(3);
			mainService.stnToCrnStnPick(3);

			// 入库 ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
			mainService.generateStoreWrkFile(); // 组托