~luxiaotao1123/zy-wcs.git

			@@ -38,9 +38,9 @@

			public static CrnStatusType process(Integer ioType){
			if (ioType>100) {
			return MACHINE_PAKIN;
			} else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
			return MACHINE_PAKOUT;
			} else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
			return MACHINE_PAKIN;
			} else if (ioType == 3) {
			return MACHINE_SITE_MOVE;
			} else if (ioType == 11) {

			@@ -407,7 +407,7 @@
			log.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			continue;
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staDetl.getCanining().equals("Y")) {
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
			flag = true;
			}
			if (!flag) {
			@@ -667,7 +667,7 @@
			// 工作号
			int workNo = commonService.getWorkNo(0);
			// 检索库位
			StartupDto startupDto = commonService.getLocNo(1, 1, emptyInSta.getStaNo(), null);
			StartupDto startupDto = commonService.getLocNo(1, 10, emptyInSta.getStaNo(), null);

			// 插入工作主档
			WrkMast wrkMast = new WrkMast();

			@@ -101,7 +101,7 @@
			if (Cools.isEmpty(rowLastno)) {
			throw new CoolException("数据异常，请联系管理员");
			}
			if (rowLastno.getWhsType() == 1){
			if (whsType == 1 \|\| whsType == 2){
			int curRow = rowLastno.getCurrentRow();
			int sRow = rowLastno.getsRow();
			int eRow = rowLastno.geteRow();
			@@ -143,18 +143,24 @@

			// 如果没有相近物料，则按规则轮询货架
			if (null == locMast) {
			// 获取目标站所在货架排号
			Shelves shelves = new Shelves(rowCount, crn_qty);
			curRow = shelves.start(curRow);
			if (curRow < 0) {
			throw new CoolException("检索库位失败，请联系管理员");
			// 获取目标站所在货架排号 todo:luxiaotao
			if (curRow == sRow) {
			curRow = eRow;
			} else {
			curRow = sRow;
			}
			for (List<Integer> node : shelves.nodes){
			if (node.contains(curRow)) {
			crnNo = shelves.nodes.indexOf(node) + 1;
			break;
			}
			}
			crnNo = whsType;
			// Shelves shelves = new Shelves(rowCount, crn_qty);
			// curRow = shelves.start(curRow);
			// if (curRow < 0) {
			// throw new CoolException("检索库位失败，请联系管理员");
			// }
			// for (List<Integer> node : shelves.nodes){
			// if (node.contains(curRow)) {
			// crnNo = shelves.nodes.indexOf(node) + 1;
			// break;
			// }
			// }
			}

			basCrnpService.checkSiteStatus(crnNo);

	src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/common/service/CommonService.java	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史