zy-asrs.git - Gitblit

			@@ -95,7 +95,8 @@
			int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
			// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())
			// .last(" wrk_no IN ( SELECT wrk_no FROM asr_wrk_mast WHERE wrk_sts != 15 )"));
			if (countLoc > 0 \|\| countWrk > 0) {

			if (countLoc > 0 \|\| countWrk > 0) {
			throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode());
			}

			@@ -211,9 +211,9 @@

			Integer outSta = staNo.getDevNo();
			//2号堆垛机全板出库站指定为204站，拣料站指定为202
			if(locMast.getCrnNo()==2){
			outSta = ioType == 101 ? 204 : 202;
			}
			// if(locMast.getCrnNo()==2){
			// outSta = ioType == 101 ? 204 : 202;
			// }

			// 获取路径
			StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);

			@@ -100,19 +100,27 @@
			// whsType = getWhsType(sourceStaNo, times);
			StartupDto startupDto = new StartupDto();

			if (sourceStaNo < 200){
			// if (sourceStaNo < 200){
			// whsType = 1;
			// } else if (sourceStaNo > 199 && sourceStaNo < 300){
			// whsType = 2;
			// } else if (sourceStaNo > 299 && sourceStaNo < 400){
			// whsType = 3;
			// } else if (sourceStaNo > 399){
			// whsType = 4;
			// }

			if (sourceStaNo ==101\|\|sourceStaNo==103){
			whsType = 1;
			} else if (sourceStaNo > 199 && sourceStaNo < 300){
			} else if (sourceStaNo ==105\|\|sourceStaNo==107){
			whsType = 2;
			} else if (sourceStaNo > 299 && sourceStaNo < 400){
			whsType = 3;
			} else if (sourceStaNo > 399){
			whsType = 4;
			} else{
			throw new CoolException("站点数据异常，请联系管理员");
			}

			RowLastno rowLastno = rowLastnoService.selectById(whsType);
			if (Cools.isEmpty(rowLastno)) {
			throw new CoolException("数据异常，请联系管理员");
			throw new CoolException("1数据异常，请联系管理员");
			}

			// ===============>>>> 开始执行

	src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/common/service/CommonService.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史