zy-asrs.git - Gitblit

			@@ -1,7 +1,6 @@
			package com.zy.asrs.controller;

			import com.core.common.R;
			import com.sun.prism.Image;
			import com.zy.asrs.entity.ImageView;
			import com.zy.asrs.utils.ImagePreviewUtils;
			import com.zy.common.web.BaseController;

			@@ -316,7 +316,7 @@

			// 1.按规则查找库位
			if (Cools.isEmpty(locMast) && crnNo != 0) {
			List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
			List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("loc_type2",locTypeDto.getLocType2()));
			List<LocMast> locMastList = new ArrayList<>();
			locMasts.sort(new Comparator<LocMast>() {
			@Override

	src/main/java/com/zy/asrs/controller/ImagePreviewController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/common/service/CommonService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史