zy-asrs.git - Gitblit

			@@ -251,7 +251,12 @@
			for (StockOutParam.LocDetl paramLocDetl : stockOutParam.getLocDetls()) {
			LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
			.eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
			if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
			if (null != one) {
			if(!"合格".equals(one.getThreeCode())) {
			throw new CoolException(one.getModel() + "卷不合格:" + one.getThreeCode() );
			}
			locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
			}
			}
			if (!locDetlDtos.isEmpty()) {
			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));

			@@ -187,7 +187,12 @@
			LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
			.eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
			// selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
			if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
			if (null != one) {
			if(!"合格".equals(one.getThreeCode())) {
			throw new CoolException(one.getModel() + "卷不合格:" + one.getThreeCode() );
			}
			locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
			}
			// }
			}
			if (!locDetlDtos.isEmpty()) {

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