zy-asrs.git - Gitblit

			@@ -239,7 +239,7 @@
			if (agvWrkMast == null) {
			agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode));
			if (agvWrkMast != null && agvWrkMast.getWrkSts() != 205) {
			return R.error("工作档状态不对");
			return R.error("工作档状态不对,还在搬运中");
			}
			return R.error("工作档不存在");
			}

			@@ -227,7 +227,9 @@
			updateAgvLocMast(agvLocMastService.selectById(sourceLocNo), locSts);
			//更新目标站点状态
			//locSts = ioType == 101 ? "S" : "Q";
			updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo), "S");
			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(targetLocNo);
			agvBasDevp.setBarcode("");
			updateAgvBasDevp(agvBasDevp, "S");

			});
			}
			@@ -1555,9 +1557,6 @@
			private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts) {
			if (!Cools.isEmpty(agvBasDevp)) {
			agvBasDevp.setLocSts(locSts);
			if (locSts.equals("S")) {
			agvBasDevp.setBarcode("");
			}
			agvBasDevpService.updateById(agvBasDevp);
			}
			}

	src/main/java/com/zy/asrs/controller/AgvBasDevpController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史