zy-asrs.git - Gitblit

			@@ -129,6 +129,13 @@
			// 目标库位
			LocMast locMast = null;

			// 靠近摆放规则 --- 空托
			locMast = getLocNoStep4(staDescId, locTypeDto);
			if (locMast != null) {
			//找到库位，返回dto
			return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
			}

			//库位规则
			locMast = getLocNoStepRule(matNos, locTypeDto);
			if (locMast != null) {
			@@ -138,13 +145,6 @@

			// 靠近摆放规则 --- 相同订单号, 同天同规格物料
			locMast = getLocNoStep3(staDescId, matNos, locTypeDto);
			if (locMast != null) {
			//找到库位，返回dto
			return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
			}

			// 靠近摆放规则 --- 空托
			locMast = getLocNoStep4(staDescId, locTypeDto);
			if (locMast != null) {
			//找到库位，返回dto
			return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
			@@ -259,7 +259,7 @@
			}
			if (Cools.isEmpty(locMast)){
			List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D"));
			.eq("loc_sts", "O"));
			if (locMasts.size() > 0) {
			for (LocMast loc : locMasts) {
			LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());