wms-master.git - Gitblit

			@@ -15,7 +15,7 @@
			import com.vincent.rsf.server.manager.service.*;
			import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
			import com.vincent.rsf.server.system.constant.SerialRuleCode;
			import com.vincent.rsf.server.system.enums.LocStsType;
			import com.vincent.rsf.server.manager.enums.LocStsType;
			import com.vincent.rsf.server.system.utils.SerialRuleUtils;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.BeanUtils;
			@@ -74,7 +74,7 @@
			task.setTaskStatus(TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id);
			taskService.updateById(task);

			basStation.setUseStatus(StaUseStatusType.TYPE_O.type);
			basStation.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
			basStation.setBarcode(null);
			basStationService.updateById(basStation);

			@@ -164,8 +164,8 @@
			String targetSite, String sourceSiteNo, Long loginUserId) {
			Task task = new Task();
			task.setTaskCode(ruleCode)
			.setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
			.setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
			.setTaskStatus(TaskStsType.GENERATE_IN.id)
			.setTaskType(TaskType.TASK_TYPE_IN.type)
			.setWarehType(WarehType.WAREHOUSE_TYPE_CRN.id)
			.setTargLoc(targetLoc)
			.setBarcode(barcode)
			@@ -327,6 +327,7 @@
			// locNo.setWorkNo(ruleCode);
			// return locNo;
			// }
			@Override
			public InTaskMsgDto getLocNo(TaskInParam param) {
			String matnr = null;
			String batch = null;
			@@ -361,6 +362,9 @@
			case "SXC": //四向库
			break;
			case "CTU": //ctu
			dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
			break;
			default:
			dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
			break;
			}
			@@ -488,7 +492,7 @@
			if ((ioType == 1 && deviceBind.getBeSimilar().equals("1"))) {
			//相似物料打开，判断深库位有没有货，没货就放深库位，有货就不操作
			Loc locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
			.eq(Loc::getRow, shallowLoc)
			.eq(Loc::getCode, shallowLoc)
			.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
			.eq(Loc::getAreaId, area)
			);
			@@ -557,7 +561,7 @@
			//查询当前库位类型空库位小于5个则locmast = null
			List<Loc> locTypeLocMasts = locService.list(new LambdaQueryWrapper<Loc>()
			.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
			.eq(Loc::getDeviceNo, deviceNo)
			.eq(Loc::getChannel, deviceNo)
			.eq(Loc::getType, locTypeDto.getLocType1())
			.eq(Loc::getAreaId, area)
			);