zy-asrs.git - Gitblit

			@@ -1008,7 +1008,7 @@
			List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", param.getLocNo()));

			List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();

			String barcode = null;
			// 修改数量
			Iterator<AgvLocDetl> iterator = locDetls.iterator();
			while (iterator.hasNext()) {
			@@ -1095,6 +1095,7 @@
			locDetl.setThreeCode(adjust.getThreeCode());
			locDetl.setDeadTime(adjust.getDeadTime());
			locDetl.setSuppCode(adjust.getSuppCode());
			barcode = adjust.getSuppCode();
			if (!agvLocDetlService.insert(locDetl)) {
			throw new CoolException("添加" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码库存明细失败");
			}
			@@ -1127,6 +1128,7 @@
			if (locMast.getLocSts().equals("D") \|\| locMast.getLocSts().equals("O")) {
			if (count > 0) {
			locMast.setLocSts("F");
			locMast.setBarcode(barcode);
			}
			}
			locMast.setModiUser(userId);

			@@ -60,14 +60,14 @@
			* @param floor
			* @return
			*/
			public AgvLocMast getLocNoRuleByFloor(int type, Integer floor) {
			public AgvLocMast getLocNoRuleByFloor6(int type, Integer floor) {
			try {
			EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
			wrapper.eq("loc_sts", "O").eq("loc_type1", type);
			if (floor == 4) {
			wrapper.orderBy("lev1", false).orderBy("row1", true);
			wrapper.eq("floor", 1).eq("lev1", 2).orderBy("bay1", false);
			} else {
			wrapper.orderBy("lev1", true);
			wrapper.orderBy("floor", false).orderBy("lev1", true);
			}
			List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
			for (AgvLocMast agvLocMast : agvLocMasts) {

			@@ -134,7 +134,7 @@
			// } else {
			// //不动这个逻辑
			if (type == 6) {
			locMast = locUtils.getLocNoRuleByFloor(type, floor);
			locMast = locUtils.getLocNoRuleByFloor6(type, floor);
			} else {
			locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
			}
			@@ -352,7 +352,7 @@
			try {
			EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
			wrapper.eq("loc_sts", "O").eq("loc_type1", type);
			wrapper.eq("floor", floor).eq("lev1", lev1);
			wrapper.eq("floor", floor).eq("lev1", lev1).orderBy("bay1", true);

			List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
			for (AgvLocMast agvLocMast : agvLocMasts) {

	src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/utils/LocUtils.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/common/service/AgvCommonService.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史