zy-asrs.git - Gitblit

			@@ -5,11 +5,14 @@
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.core.common.Cools;
			import com.core.common.SnowflakeIdWorker;
			import com.core.exception.CoolException;
			import com.zy.asrs.constant.AsrsConstants;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.entity.param.LocDetlAdjustParam;
			import com.zy.asrs.entity.param.StockOutParam;
			import com.zy.asrs.service.*;
			import com.zy.asrs.utils.OrderUtils;
			import com.zy.asrs.utils.Utils;
			import com.zy.common.model.LocDto;
			import com.zy.common.model.OrderDto;
			@@ -30,6 +33,7 @@
			import java.util.Iterator;
			import java.util.List;
			import java.util.concurrent.atomic.AtomicBoolean;
			import java.util.concurrent.atomic.AtomicReference;

			/**
			* Created by vincent on 2020/6/11
			@@ -73,6 +77,12 @@
			private WrkMastExecuteService wrkMastExecuteService;
			@Autowired
			private ConfigService configService;
			@Autowired
			private SnowflakeIdWorker snowflakeIdWorker;
			@Autowired
			private FlowLogService flowLogService;
			@Autowired
			private LocDetlServiceImpl locDetlService;


			/*
			@@ -85,30 +95,30 @@
			Date now = new Date();

			agvBasDevpList.forEach(agvBasDevp -> {
			if(Cools.isEmpty(agvBasDevp.getBarcode())){
			if (Cools.isEmpty(agvBasDevp.getBarcode())) {
			throw new CoolException("选中的站点中含有未绑定货架的站点，请重新选择");
			}

			if(!"F".equals(agvBasDevp.getLocSts())){
			if (!"F".equals(agvBasDevp.getLocSts())) {
			throw new CoolException("选中的站点中含有货位状态不为F.在库的站点，请重新选择");
			}

			List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevp.getBarcode()));

			//检索库位，选择合适的库位
			AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor(),false,false);
			AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(), agvBasDevp.getFloor(), false, false);
			//生成工作档
			AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2());
			AgvWrkMast wrkMast = createWrkMast(1, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), agvBasDevp.getBarcode(), now, userId, agvBasDevp.getLocType2(), agvLocMast.getPltType());
			//标记是否为输送线入库
			wrkMast.setMk(isConveyor ? "Y" : "N");
			//生成工作档明细
			agvWaitPakinList.forEach(wp -> {
			createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
			createWrkDetlReWrite(wp.getMatnr(), wrkMast.getWrkNo(), wp.getOrderNo(), wp.getBatch(), wp.getAnfme(), wp.getSuppCode(), now, userId, wp.getThreeCode(), wp.getDeadTime(), wp.getProcessSts());
			});
			//更新源站点信息
			updateAgvBasDevp(agvBasDevp,"R");
			updateAgvBasDevp(agvBasDevp, "R");
			//更新目标库位状态
			updateAgvLocMast(agvLocMast,"S");
			updateAgvLocMast(agvLocMast, "S");

			});

			@@ -137,12 +147,13 @@
			//String barcode = agvLocDetls.get(0).getSuppCode();
			String containerCode = taskDto.getLocDtos().get(0).getContainerCode();


			AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo);
			//判断是否全板出库
			int ioType = isPakOut(sourceLocNo,taskDto) ? 101 : 103;
			int ioType = isPakOut(sourceLocNo, taskDto) ? 101 : 103;
			//生成工作档
			AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
			AgvWrkMast wrkMast = createWrkMast(ioType, wrkSts, sourceLocNo, targetLocNo, containerCode, now, userId, Short.valueOf(containerCode.substring(0, 2)), agvLocMast.getPltType());
			//生成工作档明细
			long flowId = snowflakeIdWorker.nextId();
			taskDto.getLocDtos().forEach(locDto -> {
			if (!BaseController.isJSON(locDto.getOrderNo())) {
			//明细档所需参数
			@@ -157,7 +168,37 @@
			locDto.getCsocode(),
			locDto.getIsoseq(),
			locDto.getProcessSts());
			}else {
			//OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
			// AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
			// 流水 -- 新增订单明细
			// FlowLog flowLog = new FlowLog();
			// flowLog.setFid(String.valueOf(flowId));
			// flowLog.setSpare2(wrkMast.getWrkNo().toString());
			// flowLog.setLocNo(wrkMast.getSourceLocNo());
			// flowLog.setSpare1(containerCode);
			// flowLog.setOpType(4L);
			// flowLog.setOrderNo(locDto.getOrderNo());
			// flowLog.setThreeCode(locDto.getCsocode());
			// flowLog.setMatnr(locDto.getMatnr());
			// flowLog.setMaktx(locDto.getMaktx());
			// flowLog.setOrderPrevious(orderDetl.getAnfme());
			// flowLog.setOrderCurrent(orderDetl.getAnfme());
			// flowLog.setOrderChanged(0.0);
			//
			// flowLog.setQtyPrevious(orderDetl.getQty());
			// flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
			// flowLog.setQtyChanged(locDto.getAnfme());
			//
			// flowLog.setLocPrevious(locDetl.getAnfme());
			// flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
			// flowLog.setLocChanged(locDto.getAnfme());
			// flowLog.setUserId(userId);
			// flowLog.setAppeTime(now);
			// if (!flowLogService.insert(flowLog)) {
			// throw new CoolException("同步半成品调拨单流水记录失败");
			// }

			} else {
			List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
			orderDtoList.forEach(orderDto -> {
			//明细档所需参数
			@@ -175,6 +216,7 @@
			});
			}


			//修改订单信息
			modifyOrderDetl(locDto, userId);
			});
			@@ -182,10 +224,12 @@
			// modifyOrderDetl(taskDto.getLocDtos().get(0), userId);
			//更新源站点信息
			String locSts = ioType == 101 ? "R" : "P";
			updateAgvLocMast(agvLocMastService.selectById(sourceLocNo),locSts);
			updateAgvLocMast(agvLocMastService.selectById(sourceLocNo), locSts);
			//更新目标站点状态
			//locSts = ioType == 101 ? "S" : "Q";
			updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo),"S");
			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(targetLocNo);
			agvBasDevp.setBarcode("");
			updateAgvBasDevp(agvBasDevp, "S");

			});
			}
			@@ -211,12 +255,13 @@
			//String barcode = agvLocDetls.get(0).getSuppCode();
			String containerCode = taskDto.getLocDtos().get(0).getContainerCode();


			AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo);
			//判断是否全板出库
			int ioType = 107;
			//生成工作档
			AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
			AgvWrkMast wrkMast = createWrkMast(ioType, wrkSts, sourceLocNo, targetLocNo, containerCode, now, userId, Short.valueOf(containerCode.substring(0, 2)), agvLocMast.getPltType());
			//生成工作档明细
			long flowId = snowflakeIdWorker.nextId();
			taskDto.getLocDtos().forEach(locDto -> {
			if (!BaseController.isJSON(locDto.getOrderNo())) {
			//明细档所需参数
			@@ -231,7 +276,36 @@
			locDto.getCsocode(),
			locDto.getIsoseq(),
			locDto.getProcessSts());
			}else {
			OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
			AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());

			// FlowLog flowLog = new FlowLog();
			// flowLog.setFid(String.valueOf(flowId));
			// flowLog.setSpare2(wrkMast.getWrkNo().toString());
			// flowLog.setLocNo(wrkMast.getSourceLocNo());
			// flowLog.setSpare1(containerCode);
			// flowLog.setOpType(6L);
			// flowLog.setOrderNo(locDto.getOrderNo());
			// flowLog.setThreeCode(locDto.getCsocode());
			// flowLog.setMatnr(locDto.getMatnr());
			// flowLog.setMaktx(locDto.getMaktx());
			// flowLog.setOrderPrevious(orderDetl.getAnfme());
			// flowLog.setOrderCurrent(orderDetl.getAnfme());
			// flowLog.setOrderChanged(0.0);
			//
			// flowLog.setQtyPrevious(orderDetl.getQty());
			// flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
			// flowLog.setQtyChanged(locDto.getAnfme());
			//
			// flowLog.setLocPrevious(locDetl.getAnfme());
			// flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
			// flowLog.setLocChanged(locDto.getAnfme());
			// flowLog.setUserId(userId);
			// flowLog.setAppeTime(now);
			// if (!flowLogService.insert(flowLog)) {
			// throw new CoolException("同步半成品调拨单流水记录失败");
			// }
			} else {
			List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
			orderDtoList.forEach(orderDto -> {
			//明细档所需参数
			@@ -256,17 +330,17 @@
			// modifyOrderDetl(taskDto.getLocDtos().get(0), userId);
			//更新源站点信息
			String locSts = "R";
			updateAgvLocMast(agvLocMastService.selectById(sourceLocNo),locSts);
			updateAgvLocMast(agvLocMastService.selectById(sourceLocNo), locSts);
			//更新目标站点状态
			//locSts = ioType == 101 ? "S" : "Q";
			updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo),"S",Short.valueOf(containerCode.substring(0,2)),containerCode);
			updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo), "S", Short.valueOf(containerCode.substring(0, 2)), containerCode);

			});
			}

			//拣料入库
			@Transactional
			public void pickIn(List<AgvWrkMast> agvWrkMastList){
			public void pickIn(List<AgvWrkMast> agvWrkMastList) {
			Date now = new Date();
			agvWrkMastList.forEach(agvWrkMast -> {

			@@ -284,12 +358,21 @@
			String locNo = agvWrkMast.getLocNo();
			agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo());
			agvWrkMast.setSourceLocNo(locNo);
			agvWrkMast.setModiTime(new Date());
			agvWrkMast.setModiTime(now);
			agvWrkMast.setIoTime(now);
			agvWrkMast.setLogErrMemo("createWaitPainWrkMastStart");
			agvWrkMastService.updateById(agvWrkMast);

			List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
			for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {
			agvWrkDetl.setIoTime(now);
			boolean bl = agvWrkDetlService.update(agvWrkDetl, new EntityWrapper<AgvWrkDetl>()
			.eq("wrk_no", agvWrkDetl.getWrkNo())
			.eq("matnr", agvWrkDetl.getMatnr())
			.eq("order_no", agvWrkDetl.getOrderNo())
			.eq("three_code", agvWrkDetl.getThreeCode()));
			// .eq("dead_time",agvWrkDetl.getDeadTime()));
			}
			AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
			//List<AgvLocDetl> agvLocDetlList = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocMast.getLocNo()));
			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(agvWrkMast.getSourceLocNo());
			@@ -309,9 +392,9 @@
			// });
			//}
			//修改库位信息
			updateAgvLocMast(agvLocMast,"Q");
			updateAgvLocMast(agvLocMast, "Q");
			//修改站点信息
			updateAgvBasDevp(agvBasDevp,"R");
			updateAgvBasDevp(agvBasDevp, "R");

			});
			}
			@@ -325,11 +408,11 @@

			List<TaskDto> taskDtos = new ArrayList<>();
			param.getLocDetls().forEach(locDetl -> {
			LocDto locDto = new LocDto(locDetl.getLocNo(),locDetl.getCount(),locDetl.getMatnr(),locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),locDetl.getSuppCode(), locDetl.getProcessSts());
			TaskDto taskDto = new TaskDto(locDetl.getLocNo(),station,locDto);
			if(TaskDto.has(taskDtos,taskDto)){
			TaskDto.find(taskDtos,taskDto).getLocDtos().add(locDto);
			}else {
			LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getCount(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), locDetl.getSuppCode(), locDetl.getProcessSts());
			TaskDto taskDto = new TaskDto(locDetl.getLocNo(), station, locDto);
			if (TaskDto.has(taskDtos, taskDto)) {
			TaskDto.find(taskDtos, taskDto).getLocDtos().add(locDto);
			} else {
			taskDtos.add(taskDto);
			}
			});
			@@ -339,14 +422,14 @@

			//判断是否有重复料想的工作当
			AgvWrkMast agvWrkMastList = agvWrkMastService.selectByContainerCode(taskDto.getLocDtos().get(0).getContainerCode());
			if(!Cools.isEmpty(agvWrkMastList)){
			if (!Cools.isEmpty(agvWrkMastList)) {
			return;
			}

			int containerType = getContainerTypeByloc(taskDto.getLocNo());

			//生成工作档
			AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType);
			AgvWrkMast wrkMast = createWrkMast(107, 21L, taskDto.getLocNo(), taskDto.getAgvStaNo(), taskDto.getLocDtos().get(0).getContainerCode(), now, userId, containerType, null);
			//生成工作档明细
			taskDto.getLocDtos().forEach(locDto -> {
			//明细档所需参数
			@@ -362,10 +445,10 @@
			locDto.getIsoseq(),
			locDto.getProcessSts());
			});
			updateAgvLocMast(agvLocMastService.selectById(wrkMast.getSourceLocNo()),"P");
			updateAgvLocMast(agvLocMastService.selectById(wrkMast.getSourceLocNo()), "P");
			//更新目标站点状态
			//locSts = ioType == 101 ? "S" : "Q";
			updateAgvBasDevp(agvBasDevpService.selectById(wrkMast.getLocNo()),"S");
			updateAgvBasDevp(agvBasDevpService.selectById(wrkMast.getLocNo()), "S");
			});

			}
			@@ -379,42 +462,30 @@
			AgvLocMast targetLocMast = agvLocMastService.selectById(targetLocNo);
			AgvLocDetl sourceLocDetl = agvLocDetlService.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", sourceLocMast.getLocNo()));

			if(!sourceLocMast.getLocSts().equals("F")){
			throw new CoolException(sourceLocMast.getLocNo() + "源库位出库失败，状态："+sourceLocMast.getLocSts$());
			if (!sourceLocMast.getLocSts().equals("F")) {
			throw new CoolException(sourceLocMast.getLocNo() + "源库位出库失败，状态：" + sourceLocMast.getLocSts$());
			}
			if(!targetLocMast.getLocSts().equals("O")){
			throw new CoolException("移转失败，目标库位状态："+targetLocMast.getLocSts$());
			if (!targetLocMast.getLocSts().equals("O")) {
			throw new CoolException("移转失败，目标库位状态：" + targetLocMast.getLocSts$());
			}

			Date now = new Date();

			//生成移库工作档
			AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo));
			AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId, getContainerTypeByloc(sourceLocNo), targetLocMast.getPltType());
			//生成工作党明细
			createWrkDetlReWrite(
			sourceLocDetl.getMatnr(),
			wrkMast.getWrkNo(),
			null,
			sourceLocDetl.getBatch(),
			sourceLocDetl.getAnfme(),
			sourceLocDetl.getZpallet(),
			now,
			userId,
			sourceLocDetl.getThreeCode(),
			sourceLocDetl.getDeadTime(),
			sourceLocDetl.getProcessSts()
			);
			createWrkDetlReWrite(sourceLocDetl.getMatnr(), wrkMast.getWrkNo(), null, sourceLocDetl.getBatch(), sourceLocDetl.getAnfme(), sourceLocDetl.getZpallet(), now, userId, sourceLocDetl.getThreeCode(), sourceLocDetl.getDeadTime(), sourceLocDetl.getProcessSts());
			//修改目标库位状态
			updateAgvLocMast(targetLocMast,"S");
			updateAgvLocMast(targetLocMast, "S");
			//修改原库位状态
			updateAgvLocMast(sourceLocMast,"R");
			updateAgvLocMast(sourceLocMast, "R");
			}

			/*
			入库
			*/
			@Transactional
			public String emptyPlateIn(String station,String containerCode,Short containerType, Long userId, boolean emptyAutoIn) {
			public String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn) {

			Date now = new Date();

			@@ -422,7 +493,7 @@

			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
			if (Cools.isEmpty(agvBasDevp)) {
			throw new CoolException("暂无"+ station + "站点");
			throw new CoolException("暂无" + station + "站点");
			}
			int br = 0;
			if (containerType == 21 && agvBasDevp.getFloor() == 2) {
			@@ -441,6 +512,9 @@
			case 30:
			br = 3;
			break;
			case 31:
			br = 6;
			break;
			case 40:
			br = 5;
			break;
			@@ -449,8 +523,9 @@
			br = 2;
			}
			if (agvBasDevp.getLocType1() != br) {
			throw new CoolException("站点异常！");
			throw new CoolException("站点类型和货架类型不符！");
			}
			AtomicReference<String> factory = new AtomicReference<>();
			if (containerType == 40) {
			locType = 5;
			} else if (containerType == 21 && agvBasDevp.getFloor() == 3) {
			@@ -459,17 +534,19 @@
			locType = 2;
			} else if (containerType == 30) {
			locType = 3;
			} else if (containerType == 31) {
			locType = 6;
			} else {
			locType = agvBasDevp.getLocType1();
			}

			if(!Cools.eq(agvBasDevp.getBarcode(),containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn){
			throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts()+",无法进行入库");
			if (!Cools.eq(agvBasDevp.getBarcode(), containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn) {
			throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts() + ",无法进行入库");
			}

			//查询工作档
			AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
			if(!Cools.isEmpty(agvWrkMast) && !emptyAutoIn){
			if (!Cools.isEmpty(agvWrkMast) && !emptyAutoIn) {
			throw new CoolException("当前货架已有入库任务，无法进行入库");
			}

			@@ -484,9 +561,10 @@

			//查询入库通知档
			List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
			if(!Cools.isEmpty(agvWaitPakinList)){
			if (!Cools.isEmpty(agvWaitPakinList)) {
			AtomicBoolean isCurrLev = new AtomicBoolean(false);
			agvWaitPakinList.forEach(agvWaitPakin -> {
			factory.set(OrderUtils.getFactory(agvWaitPakin.getThreeCode()));
			if (!Cools.isEmpty(agvWaitPakin.getProcessSts())) {
			if (agvWaitPakin.getProcessSts() == 1) {
			isCurrLev.set(true);
			@@ -498,52 +576,369 @@
			Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks"));
			if (Cools.isEmpty(config)) {
			if (isCurrLev.get()) {
			agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			} else {
			agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
			}
			} else {
			List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
			if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
			agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
			if (station.endsWith("F4") && locType == 3) {
			agvLocMast = agvCommonService.getLocNoOnXiSuer(locType, 1);
			} else {
			if (isCurrLev.get()) {
			agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
			List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
			if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			} else {
			agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
			if (isCurrLev.get()) {
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			} else {
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
			}
			//agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
			}
			//agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
			}
			}

			String devNo = agvBasDevp.getDevNo();
			String locNo = agvLocMast.getLocNo();


			//生成工作档
			AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType);
			AgvWrkMast wrkMast = createWrkMast(1, 201L, devNo, locNo, containerCode, now, userId, containerType, agvLocMast.getPltType());
			//生成工作档明细
			long flowId = snowflakeIdWorker.nextId();
			agvWaitPakinList.forEach(wp -> {
			createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
			createWrkDetlReWrite(wp.getMatnr(), wrkMast.getWrkNo(), wp.getOrderNo(), wp.getBatch(), wp.getAnfme(), wp.getSuppCode(), now, userId, wp.getThreeCode(), wp.getDeadTime(), wp.getProcessSts());
			});
			//修改入库通知档状态
			agvWaitPakinService.updateIoStatus(containerCode,"Y");
			agvWaitPakinService.updateIoStatus(containerCode, "Y");
			//更新源站点状态
			updateAgvBasDevp(agvBasDevp,"R",containerType);
			}else {
			updateAgvBasDevp(agvBasDevp, "R", containerType);
			} else {
			//查询工作档
			AgvWrkMast agvWrkMast1 = agvWrkMastService.selectByContainerCode(containerCode);
			if (!Cools.isEmpty(agvWrkMast1)) {
			throw new CoolException("当前货架已有入库任务，无法进行入库");
			}
			agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), true, true);
			// 生成工作档 10.空板入库
			createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType);
			createWrkMast(10, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), containerCode, now, userId, containerType, agvLocMast.getPltType());
			//更新源站点状态
			updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);
			updateAgvBasDevp(agvBasDevp, "R", containerType, containerCode);
			}

			//更新目标库位状态和信息
			updateAgvLocMast(agvLocMast,"S");
			updateAgvLocMast(agvLocMast, "S");
			return agvLocMast.getLocNo();
			}

			/*
			入库
			*/
			@Transactional
			public String emptyPlateInV2(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn, String code) {

			Date now = new Date();

			Short locType = 0;

			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
			if (Cools.isEmpty(agvBasDevp)) {
			throw new CoolException("暂无" + station + "站点");
			}
			int br = 0;
			if (containerType == 21 && agvBasDevp.getFloor() == 2) {
			containerType = 20;
			}
			switch (containerType) {
			case 10:
			br = 1;
			break;
			case 20:
			br = 2;
			break;
			case 21:
			br = 4;
			break;
			case 30:
			br = 3;
			break;
			case 31:
			br = 6;
			break;
			case 40:
			br = 5;
			break;
			}
			if (br == 4 && agvBasDevp.getLocType1() == 2) {
			br = 2;
			}
			if (agvBasDevp.getLocType1() != br) {
			throw new CoolException("站点类型和货架类型不符！");
			}
			AtomicReference<String> factory = new AtomicReference<>();
			if (containerType == 40) {
			locType = 5;
			} else if (containerType == 21 && agvBasDevp.getFloor() == 3) {
			locType = 4;
			} else if (containerType == 20 && agvBasDevp.getFloor() == 3) {
			locType = 2;
			} else if (containerType == 30) {
			locType = 3;
			} else if (containerType == 31) {
			locType = 6;
			} else {
			locType = agvBasDevp.getLocType1();
			}

			if (!Cools.eq(agvBasDevp.getBarcode(), containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn) {
			throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts() + ",无法进行入库");
			}

			//查询工作档
			AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
			if (!Cools.isEmpty(agvWrkMast) && !emptyAutoIn) {
			throw new CoolException("当前货架已有入库任务，无法进行入库");
			}

			//检索库位，选择合适的库位
			AgvLocMast agvLocMast = new AgvLocMast();

			//查询库存
			AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
			if (!Cools.isEmpty(locMast)) {
			throw new CoolException("当前货架已在库存中，无法进行入库");
			}

			//查询入库通知档
			List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
			if (!Cools.isEmpty(agvWaitPakinList)) {
			AtomicBoolean isCurrLev = new AtomicBoolean(false);
			agvWaitPakinList.forEach(agvWaitPakin -> {
			factory.set(OrderUtils.getFactory(agvWaitPakin.getThreeCode()));
			if (!Cools.isEmpty(agvWaitPakin.getProcessSts())) {
			if (agvWaitPakin.getProcessSts() == 1) {
			isCurrLev.set(true);
			}
			}
			});


			// Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks"));
			// if (Cools.isEmpty(config)) {
			// if (isCurrLev.get()) {
			// agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			// } else {
			// agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
			// }
			// } else {
			// List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
			// if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
			// agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			// } else {
			// if (isCurrLev.get()) {
			// agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			// } else {
			// agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
			// }
			// //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
			// }
			// }
			// 预留20个库位
			agvLocMast = agvCommonService.getLocByLocRule20(3, 1, code, false);


			String devNo = agvBasDevp.getDevNo();
			String locNo = agvLocMast.getLocNo();
			String ctnNo = null;
			// 打标记，若库位不够，入库到别的楼层，那么需要跨层移库
			if (!Cools.isEmpty(code)) {
			if (agvLocMast.getLev1() == 1 && code.equals(AsrsConstants.ERCHANG)) {
			ctnNo = "2";
			} else if (agvLocMast.getLev1() == 2 && code.equals(AsrsConstants.SANCHANG)) {
			ctnNo = "1";
			}
			}
			//生成工作档
			AgvWrkMast wrkMast = createWrkMastV2(1, 201L, devNo, locNo, containerCode, now, userId, containerType, agvLocMast.getPltType(), ctnNo);
			//生成工作档明细
			long flowId = snowflakeIdWorker.nextId();
			agvWaitPakinList.forEach(wp -> {
			createWrkDetlReWrite(wp.getMatnr(), wrkMast.getWrkNo(), wp.getOrderNo(), wp.getBatch(), wp.getAnfme(), wp.getSuppCode(), now, userId, wp.getThreeCode(), wp.getDeadTime(), wp.getProcessSts());
			});
			//修改入库通知档状态
			agvWaitPakinService.updateIoStatus(containerCode, "Y");
			//更新源站点状态
			updateAgvBasDevp(agvBasDevp, "R", containerType);
			} else {
			//查询工作档
			AgvWrkMast agvWrkMast1 = agvWrkMastService.selectByContainerCode(containerCode);
			if (!Cools.isEmpty(agvWrkMast1)) {
			throw new CoolException("当前货架已有入库任务，无法进行入库");
			}
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), true, true);
			// 生成工作档 10.空板入库
			createWrkMast(10, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), containerCode, now, userId, containerType, agvLocMast.getPltType());
			//更新源站点状态
			updateAgvBasDevp(agvBasDevp, "R", containerType, containerCode);
			}

			//更新目标库位状态和信息
			updateAgvLocMast(agvLocMast, "S");
			return agvLocMast.getLocNo();
			}

			/*
			入库
			*/
			@Transactional
			public String emptyPlateInV3(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn) {

			Date now = new Date();

			Short locType = 0;

			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
			if (Cools.isEmpty(agvBasDevp)) {
			throw new CoolException("暂无" + station + "站点");
			}
			int br = 0;
			if (containerType == 21 && agvBasDevp.getFloor() == 2) {
			containerType = 20;
			}
			switch (containerType) {
			case 10:
			br = 1;
			break;
			case 20:
			br = 2;
			break;
			case 21:
			br = 4;
			break;
			case 30:
			br = 3;
			break;
			case 31:
			br = 6;
			break;
			case 40:
			br = 5;
			break;
			}
			if (br == 4 && agvBasDevp.getLocType1() == 2) {
			br = 2;
			}
			if (agvBasDevp.getLocType1() != br) {
			throw new CoolException("站点类型和货架类型不符！");
			}
			AtomicReference<String> factory = new AtomicReference<>();
			if (containerType == 40) {
			locType = 5;
			} else if (containerType == 21 && agvBasDevp.getFloor() == 3) {
			locType = 4;
			} else if (containerType == 20 && agvBasDevp.getFloor() == 3) {
			locType = 2;
			} else if (containerType == 30) {
			locType = 3;
			} else if (containerType == 31) {
			locType = 6;
			} else {
			locType = agvBasDevp.getLocType1();
			}

			if (!Cools.eq(agvBasDevp.getBarcode(), containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn) {
			throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts() + ",无法进行入库");
			}

			//查询工作档
			AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
			if (!Cools.isEmpty(agvWrkMast) && !emptyAutoIn) {
			throw new CoolException("当前货架已有入库任务，无法进行入库");
			}

			//检索库位，选择合适的库位
			AgvLocMast agvLocMast = new AgvLocMast();

			//查询库存
			AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
			if (!Cools.isEmpty(locMast)) {
			throw new CoolException("当前货架已在库存中，无法进行入库");
			}

			//查询入库通知档
			List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
			if (!Cools.isEmpty(agvWaitPakinList)) {
			AtomicBoolean isCurrLev = new AtomicBoolean(false);
			agvWaitPakinList.forEach(agvWaitPakin -> {
			factory.set(OrderUtils.getFactory(agvWaitPakin.getThreeCode()));
			if (!Cools.isEmpty(agvWaitPakin.getProcessSts())) {
			if (agvWaitPakin.getProcessSts() == 1) {
			isCurrLev.set(true);
			}
			}
			});


			Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks"));
			if (Cools.isEmpty(config)) {
			if (isCurrLev.get()) {
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			} else {
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
			}
			} else {
			if (station.endsWith("F4") && locType == 3) {
			agvLocMast = agvCommonService.getLocNoOnXiSuer(locType, 1);
			} else if (locType == 6) {
			agvLocMast = agvCommonService.getLocNoOnXiSuer20(locType, 1);
			} else {
			List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
			if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			} else {
			if (isCurrLev.get()) {
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
			} else {
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
			}
			//agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
			}
			}
			}
			if (agvLocMast == null) {
			throw new CoolException("没有该类型的空库位了");
			}

			String devNo = agvBasDevp.getDevNo();
			String locNo = agvLocMast.getLocNo();


			//生成工作档
			AgvWrkMast wrkMast = createWrkMast(1, 201L, devNo, locNo, containerCode, now, userId, containerType, agvLocMast.getPltType());
			//生成工作档明细
			long flowId = snowflakeIdWorker.nextId();
			agvWaitPakinList.forEach(wp -> {
			createWrkDetlReWrite(wp.getMatnr(), wrkMast.getWrkNo(), wp.getOrderNo(), wp.getBatch(), wp.getAnfme(), wp.getSuppCode(), now, userId, wp.getThreeCode(), wp.getDeadTime(), wp.getProcessSts());
			});
			//修改入库通知档状态
			agvWaitPakinService.updateIoStatus(containerCode, "Y");
			//更新源站点状态
			updateAgvBasDevp(agvBasDevp, "R", containerType);
			} else {
			//查询工作档
			AgvWrkMast agvWrkMast1 = agvWrkMastService.selectByContainerCode(containerCode);
			if (!Cools.isEmpty(agvWrkMast1)) {
			throw new CoolException("当前货架已有入库任务，无法进行入库");
			}
			agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), true, true);
			// 生成工作档 10.空板入库
			createWrkMast(10, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), containerCode, now, userId, containerType, agvLocMast.getPltType());
			//更新源站点状态
			updateAgvBasDevp(agvBasDevp, "R", containerType, containerCode);
			}

			//更新目标库位状态和信息
			updateAgvLocMast(agvLocMast, "S");
			return agvLocMast.getLocNo();
			}

			@@ -556,29 +951,45 @@

			// 站点检测
			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
			if(!agvBasDevp.getLocSts().equals("O")){
			throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts()+",无法进行空板出库");
			if (Cools.isEmpty(agvBasDevp)) {
			throw new CoolException("站点信息不存在");
			}
			if (!agvBasDevp.getLocSts().equals("O")) {
			throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts() + ",无法进行空板出库");
			}
			AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvBasDevp.getDevNo()));
			if (!Cools.isEmpty(agvWrkMast)) {
			throw new CoolException("有货架在往站点搬运" + agvBasDevp.getDevNo() + ",无法进行空板出库");
			}
			AgvLocMast agvLocMast = null;
			if (station.startsWith("XI") && station.endsWith("F4") && containerType == 30) {
			agvLocMast = agvLocMastService.select30EmptyZpallet();
			} else {
			//寻找相应类型的空货架
			Integer floor = agvBasDevp.getFloor();
			if (floor == 4) {
			floor = 1;
			}
			agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, floor);
			if (containerType == 0) {
			//空板自动出库，根据站点类型选择
			agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());

			}
			}

			//寻找相应类型的空货架
			AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType,agvBasDevp.getFloor());
			if(containerType == 0){
			//空板自动出库，根据站点类型选择
			agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());

			}

			if (Cools.isEmpty(agvLocMast)) {
			throw new CoolException("暂无当前出库站点类型的空货架！");
			}
			//生成工作档
			createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType);
			createWrkMast(110, 21L, agvLocMast.getLocNo(), agvBasDevp.getDevNo(), agvLocMast.getBarcode(), now, userId, containerType, agvLocMast.getPltType());

			//修改源库位状态
			updateAgvLocMast(agvLocMast,"R");
			updateAgvLocMast(agvLocMast, "R");

			//修改站点状态
			updateAgvBasDevp(agvBasDevp,"S",(short)containerType,agvLocMast.getBarcode());
			updateAgvBasDevp(agvBasDevp, "S", (short) containerType, agvLocMast.getBarcode());

			}

			@@ -597,7 +1008,7 @@
			List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", param.getLocNo()));

			List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();

			String barcode = null;
			// 修改数量
			Iterator<AgvLocDetl> iterator = locDetls.iterator();
			while (iterator.hasNext()) {
			@@ -606,12 +1017,14 @@
			Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();
			while (iterator1.hasNext()) {
			LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();
			if (adjust.getCount() == 0) { continue; }
			if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch()) && Cools.eq(locDetl.getSuppCode(),adjust.getSuppCode()) && Cools.eq(locDetl.getThreeCode(),adjust.getThreeCode()) && Cools.eq(locDetl.getDeadTime(),adjust.getDeadTime())) {
			if (adjust.getCount() == 0) {
			continue;
			}
			if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch()) && Cools.eq(locDetl.getSuppCode(), adjust.getSuppCode()) && Cools.eq(locDetl.getThreeCode(), adjust.getThreeCode()) && Cools.eq(locDetl.getDeadTime(), adjust.getDeadTime())) {
			if (!locDetl.getAnfme().equals(adjust.getCount()) \|\| !locDetl.getProcessSts().equals(adjust.getProcessSts())) {
			// todo 盘点记录
			// 修改库存
			if (!agvLocDetlService.updateAnfmeProcess(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),adjust.getProcessSts())) {
			if (!agvLocDetlService.updateAnfmeProcess(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), adjust.getProcessSts())) {
			throw new CoolException(locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码修改数量失败");
			}
			// 保存调整记录
			@@ -619,6 +1032,7 @@
			adjDetl.setLocNo(locDetl.getLocNo());
			adjDetl.setMatnr(locDetl.getMatnr());
			adjDetl.setBatch(locDetl.getBatch());
			adjDetl.setMaktx(locDetl.getMaktx());
			adjDetl.setOriQty(locDetl.getAnfme());
			adjDetl.setAdjQty(adjust.getCount());
			adjDetl.setModiTime(now);
			@@ -642,7 +1056,7 @@
			// 删除库存
			for (AgvLocDetl locDetl : locDetls) {
			// todo 盘点记录
			if (!agvLocDetlService.updateAnfmeProcess(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),locDetl.getProcessSts())) {
			if (!agvLocDetlService.updateAnfmeProcess(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), locDetl.getProcessSts())) {
			throw new CoolException("删除" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码库存明细失败");
			}
			// 保存调整记录
			@@ -650,6 +1064,7 @@
			adjDetl.setLocNo(locDetl.getLocNo());
			adjDetl.setMatnr(locDetl.getMatnr());
			adjDetl.setBatch(locDetl.getBatch());
			adjDetl.setMaktx(locDetl.getMaktx());
			adjDetl.setOriQty(locDetl.getAnfme());
			adjDetl.setAdjQty(0.0D);
			adjDetl.setModiTime(now);
			@@ -663,7 +1078,9 @@

			// 添加库存
			for (LocDetlAdjustParam.LocDetlAdjust adjust : list) {
			if (adjust.getCount() == 0.0D) { continue; }
			if (adjust.getCount() == 0.0D) {
			continue;
			}
			Mat mat = matService.selectByMatnr(adjust.getMatnr());
			AgvLocDetl locDetl = new AgvLocDetl();
			locDetl.sync(mat);
			@@ -678,6 +1095,7 @@
			locDetl.setThreeCode(adjust.getThreeCode());
			locDetl.setDeadTime(adjust.getDeadTime());
			locDetl.setSuppCode(adjust.getSuppCode());
			barcode = adjust.getSuppCode();
			if (!agvLocDetlService.insert(locDetl)) {
			throw new CoolException("添加" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码库存明细失败");
			}
			@@ -686,6 +1104,7 @@
			adjDetl.setLocNo(locMast.getLocNo());
			adjDetl.setMatnr(adjust.getMatnr());
			adjDetl.setBatch(adjust.getBatch());
			adjDetl.setMaktx(locDetl.getMaktx());
			adjDetl.setOriQty(0.0D);
			adjDetl.setAdjQty(adjust.getCount());
			adjDetl.setModiTime(now);
			@@ -709,6 +1128,7 @@
			if (locMast.getLocSts().equals("D") \|\| locMast.getLocSts().equals("O")) {
			if (count > 0) {
			locMast.setLocSts("F");
			locMast.setBarcode(barcode);
			}
			}
			locMast.setModiUser(userId);
			@@ -722,17 +1142,17 @@
			@Transactional
			public void completeWrkMast(String workNo, Long userId) {
			AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo);
			if (Cools.isEmpty(wrkMast)){
			throw new CoolException(workNo+"工作档不存在");
			if (Cools.isEmpty(wrkMast)) {
			throw new CoolException(workNo + "工作档不存在");
			}
			if (wrkMast.getIoType() == 113 && (wrkMast.getWrkSts() != 212L \|\| wrkMast.getWrkSts() != 213L \|\| wrkMast.getWrkSts() != 214L)) {
			throw new CoolException(workNo+"不支持手动维护");
			throw new CoolException(workNo + "不支持手动维护");
			}
			if (wrkMast.getIoType()==121){
			if (wrkMast.getWrkSts()<12L){
			agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
			}else if (wrkMast.getWrkSts()==12L){
			agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),12,"手动完成",userId);
			if (wrkMast.getIoType() == 121) {
			if (wrkMast.getWrkSts() < 12L) {
			agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 205, "手动完成", userId);
			} else if (wrkMast.getWrkSts() == 12L) {
			agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 12, "手动完成", userId);

			WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", workNo));
			wrkMastExecute.setWrkSts(3L);
			@@ -741,46 +1161,47 @@
			}
			return;

			} else {
			if(wrkMast.getIoType() == 110){
			agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),206,"手动完成",userId);
			} else {
			if (wrkMast.getIoType() == 110) {
			agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 206, "手动完成", userId);
			} else {
			agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
			agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 205, "手动完成", userId);
			}
			}

			//出库任务 101.出库 \|\| 103.拣料出库 \|\| 107.盘点出库
			if(wrkMast.getIoType() == 101 \|\| wrkMast.getIoType() == 103 \|\| wrkMast.getIoType() == 107 \|\| wrkMast.getIoType() == 111){
			if (wrkMast.getIoType() == 101 \|\| wrkMast.getIoType() == 103 \|\| wrkMast.getIoType() == 107 \|\| wrkMast.getIoType() == 111) {
			//修改出库站点状态
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(), "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
			}
			if(wrkMast.getIoType() == 1 \|\| wrkMast.getIoType() == 53 ){
			if (wrkMast.getIoType() == 1 \|\| wrkMast.getIoType() == 53) {
			//修改出库站点状态
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O","",wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(), "O", "", wrkMast.getWhsType().shortValue());
			}
			//出库任务 110.空板出库

			if (wrkMast.getIoType() == 10) {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(), "O", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
			}

			}

			@Transactional
			public void cancelWrkMast(String workNo, Long userId,Integer type) {
			public void cancelWrkMast(String workNo, Long userId, Integer type) {
			AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo);
			if (Cools.isEmpty(wrkMast)){
			throw new CoolException(workNo+"工作档不存在");
			long flowId = snowflakeIdWorker.nextId();
			if (Cools.isEmpty(wrkMast)) {
			throw new CoolException(workNo + "工作档不存在");
			}
			if (wrkMast.getIoType()==121){
			if (wrkMast.getWrkSts()<12L){
			if (wrkMast.getIoType() == 121) {
			if (wrkMast.getWrkSts() < 12L) {
			//源库位
			String locNo = wrkMast.getSourceLocNo();

			// 目标库位
			String targetLocNo = wrkMast.getLocNo();
			agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
			agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
			agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
			agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);

			wrkMast.setModiUser(userId);
			wrkMast.setModiTime(new Date());
			@@ -797,7 +1218,7 @@


			//删除工作档以及明细
			if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) \|\| !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
			if (!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) \|\| !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())) {
			throw new CoolException("删除失败，请联系管理员");
			}

			@@ -805,26 +1226,26 @@
			//调用agv取消任务接口
			agvWrkMastService.callCancelTask(wrkMast.getWrkNo());
			}
			}else {
			} else {
			throw new CoolException("当前任务正在执行，不可取消");
			}
			}else {
			} else {
			//拣料入库盘点入库不可取消
			if(wrkMast.getIoType() == 53 \|\| wrkMast.getIoType() == 57){
			if (wrkMast.getIoType() == 53 \|\| wrkMast.getIoType() == 57) {
			throw new CoolException("当前任务不可取消");
			}

			//入库取消
			if(wrkMast.getIoType() == 1 \|\| wrkMast.getIoType() == 10 \|\| wrkMast.getIoType() == 58){
			if (wrkMast.getIoType() == 1 \|\| wrkMast.getIoType() == 10 \|\| wrkMast.getIoType() == 58) {
			//源站点
			String devNo = wrkMast.getSourceLocNo();
			//目标库位
			String locNo = wrkMast.getLocNo();
			agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
			agvLocMastService.updateLocStsByLocNo(locNo, "O", "", null);
			if (wrkMast.getIoType() == 58) {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
			} else {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", wrkMast.getWhsType().shortValue());
			}

			if (wrkMast.getIoType() == 1) {
			@@ -834,11 +1255,39 @@
			// 回滚入库订单
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvWaitPakin.getThreeCode()).eq("matnr", agvWaitPakin.getMatnr()).eq("order_no", agvWaitPakin.getOrderNo()));
			orderDetl.setQty(orderDetl.getQty() - agvWaitPakin.getAnfme());

			if (!orderDetlService.updateById(orderDetl)) {
			throw new CoolException("订单回滚失败");
			}
			// FlowLog flowLog = new FlowLog();
			// flowLog.setFid(String.valueOf(flowId));
			// flowLog.setSpare2(wrkMast.getWrkNo().toString());
			// flowLog.setLocNo(locNo);
			// flowLog.setSpare1(wrkMast.getBarcode());
			// flowLog.setOpType(3L);
			// flowLog.setOrderNo(agvWaitPakin.getOrderNo());
			// flowLog.setThreeCode(agvWaitPakin.getThreeCode());
			// flowLog.setMatnr(agvWaitPakin.getMatnr());
			// flowLog.setMaktx(agvWaitPakin.getMaktx());
			// flowLog.setOrderPrevious(orderDetl.getAnfme());
			// flowLog.setOrderCurrent(orderDetl.getAnfme());
			// flowLog.setOrderChanged(0.0);
			//
			// flowLog.setQtyPrevious(orderDetl.getQty());
			// flowLog.setQtyCurrent(orderDetl.getQty()-agvWaitPakin.getAnfme());
			// flowLog.setQtyChanged(-agvWaitPakin.getAnfme());
			//
			// flowLog.setLocPrevious(0.0);
			// flowLog.setLocCurrent(0.0);
			// flowLog.setLocChanged(-agvWaitPakin.getAnfme());
			//
			// flowLog.setUserId(userId);
			// flowLog.setAppeTime(new Date());
			// if (!flowLogService.insert(flowLog)) {
			// throw new CoolException("同步半成品调拨单流水记录失败");
			// }
			// 删除组托档
			if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSuppCode()).eq("matnr",agvWaitPakin.getMatnr()).eq("three_code",agvWaitPakin.getThreeCode()))) {
			if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvWaitPakin.getSuppCode()).eq("matnr", agvWaitPakin.getMatnr()).eq("three_code", agvWaitPakin.getThreeCode()))) {
			throw new CoolException("入库通知档取消失败");
			}
			}
			@@ -848,14 +1297,14 @@


			// 移库取消
			} else if( wrkMast.getIoType() == 11 \|\| wrkMast.getIoType() == 12) {
			} else if (wrkMast.getIoType() == 11 \|\| wrkMast.getIoType() == 12) {
			//源库位
			String locNo = wrkMast.getSourceLocNo();

			// 目标库位
			String targetLocNo = wrkMast.getLocNo();
			agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
			agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
			agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
			agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
			// 源库位库位主档
			AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
			AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
			@@ -866,28 +1315,61 @@
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("order_no", "DB" + agvLocDetl.getOrderNo()));
			orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
			if (!orderDetlService.updateById(orderDetl)) {
			throw new CoolException("保存工作明细失败");
			throw new CoolException("更新订单明细失败");
			}
			// FlowLog flowLog = new FlowLog();
			// flowLog.setFid(String.valueOf(flowId));
			// flowLog.setSpare2(wrkMast.getWrkNo().toString());
			// flowLog.setLocNo(locNo);
			// flowLog.setSpare1(wrkMast.getBarcode());
			// flowLog.setOpType(8L);
			// flowLog.setOrderNo(agvLocDetl.getOrderNo());
			// flowLog.setThreeCode(agvLocDetl.getThreeCode());
			// flowLog.setMatnr(agvLocDetl.getMatnr());
			// flowLog.setMaktx(agvLocDetl.getMaktx());
			// flowLog.setOrderPrevious(orderDetl.getAnfme());
			// flowLog.setOrderCurrent(orderDetl.getAnfme());
			// flowLog.setOrderChanged(0.0);
			//
			// flowLog.setQtyPrevious(orderDetl.getQty());
			// flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
			// flowLog.setQtyChanged(-agvLocDetl.getAnfme());
			//
			// flowLog.setLocPrevious(0.0);
			// flowLog.setLocCurrent(agvLocDetl.getAnfme());
			// flowLog.setLocChanged(agvLocDetl.getAnfme());
			//
			// flowLog.setUserId(userId);
			// flowLog.setAppeTime(new Date());
			// if (!flowLogService.insert(flowLog)) {
			// throw new CoolException("同步半成品调拨单流水记录失败");
			// }
			}
			} else {

			}

			// 自动调拨出库取消
			} else if(wrkMast.getIoType() == 108 \|\| wrkMast.getIoType() == 111 \|\| wrkMast.getIoType() == 112) {
			} else if (wrkMast.getIoType() == 108 \|\| wrkMast.getIoType() == 111 \|\| wrkMast.getIoType() == 112) {
			if (wrkMast.getIoType() == 112) {
			throw new CoolException("当前作业不能取消！");
			}
			if (wrkMast.getIoType() == 108 && wrkMast.getWrkSts() >= 204) {
			throw new CoolException("源库位已经释放，当前作业不能取消！");
			}
			// 源库位
			String locNo = wrkMast.getSourceLocNo();
			// 目标库位
			String targetLocNo = wrkMast.getLocNo();
			agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
			agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo), "", (short) 0);
			if (wrkMast.getIoType() == 108) {
			if (wrkMast.getWrkSts() != 22) {
			agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
			agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
			}
			} else {
			if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) {
			if (wrkMast.getWrkSts() != 22) {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo, "O", "", wrkMast.getWhsType().shortValue());
			}
			} else {
			throw new CoolException("当前作业不能取消！");
			@@ -899,10 +1381,63 @@
			List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
			// 更新订单
			for (AgvLocDetl agvLocDetl : agvLocDetls) {
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
			if (orderDetl != null) {
			orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
			if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
			throw new CoolException("修改订单明细失败，请联系管理员" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
			}
			}
			// FlowLog flowLog = new FlowLog();
			// flowLog.setFid(String.valueOf(flowId));
			// flowLog.setSpare2(wrkMast.getWrkNo().toString());
			// flowLog.setLocNo(locNo);
			// flowLog.setSpare1(wrkMast.getBarcode());
			// flowLog.setOpType(9L);
			// flowLog.setOrderNo(agvLocDetl.getOrderNo());
			// flowLog.setThreeCode(agvLocDetl.getThreeCode());
			// flowLog.setMatnr(agvLocDetl.getMatnr());
			// flowLog.setMaktx(agvLocDetl.getMaktx());
			// flowLog.setOrderPrevious(orderDetl.getAnfme());
			// flowLog.setOrderCurrent(orderDetl.getAnfme());
			// flowLog.setOrderChanged(0.0);
			//
			// flowLog.setQtyPrevious(orderDetl.getQty());
			// flowLog.setQtyCurrent(orderDetl.getQty() - agvLocDetl.getAnfme());
			// flowLog.setQtyChanged(- agvLocDetl.getAnfme());
			//
			// flowLog.setLocPrevious(0.0);
			// flowLog.setLocCurrent(agvLocDetl.getAnfme());
			// flowLog.setLocChanged(agvLocDetl.getAnfme());
			//
			// flowLog.setUserId(userId);
			// flowLog.setAppeTime(new Date());
			// if (!flowLogService.insert(flowLog)) {
			// throw new CoolException("同步半成品调拨单流水记录失败");
			// }
			}

			// 回流单取消
			} else if (wrkMast.getIoType() == 114) {
			if (wrkMast.getWrkSts() >= 204) {
			throw new CoolException("源库位已经释放，当前作业不能取消！");
			}
			//源库位
			String locNo = wrkMast.getSourceLocNo();
			// 目标库位
			String targetLocNo = wrkMast.getLocNo();
			agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
			agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
			// 源库位库位主档
			AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
			AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
			// 当前任务是跨层移库且目标楼层是1楼的回滚调拨单
			List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
			for (AgvLocDetl agvLocDetl : agvLocDetls) {
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 17));
			orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
			if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
			throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
			if (!orderDetlService.updateById(orderDetl)) {
			throw new CoolException("更新订单明细失败");
			}
			}
			//出库取消
			@@ -912,61 +1447,61 @@
			//目标站点
			String devNo = wrkMast.getLocNo();
			if (wrkMast.getIoType() == 110 \|\| wrkMast.getIoType() == 109) {
			if (wrkMast.getIoType() == 109){
			if (wrkMast.getIoType() == 109) {
			// 源库位是站点
			if ("DB".equals(locNo.substring(0,2))) {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
			agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
			if ("DB".equals(locNo.substring(0, 2))) {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
			agvLocMastService.updateLocStsByLocNo(devNo, "O", "", null);
			// 源库位是库位目标库位是站点
			} else if ("DB".equals(devNo.substring(0,2))) {
			agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"O","",null);
			} else if ("DB".equals(devNo.substring(0, 2))) {
			agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "O", "", null);
			// 源库位是库位
			} else {
			agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
			agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
			agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
			agvLocMastService.updateLocStsByLocNo(devNo, "O", "", null);
			}

			}else {
			agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
			} else {
			agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", null);
			}
			} else if (wrkMast.getIoType() == 113) {
			if (wrkMast.getWrkSts() == 212 \|\| wrkMast.getWrkSts() == 213) {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
			} else {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
			if (!Cools.isEmpty(devNo)) {
			agvLocMastService.updateLocStsByLocNo(devNo,"0","",null);
			agvLocMastService.updateLocStsByLocNo(devNo, "0", "", null);
			}
			}

			} else {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
			agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
			} else {
			agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", null);
			agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
			}

			}

			if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
			if (wrkMast.getIoType() != 114 && wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType() != 111 && wrkMast.getIoType() != 108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11) {
			//订单回滚
			//List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
			List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
			agvWrkDetlList1.forEach(agvWrkDetl -> {

			if(!Cools.isEmpty(agvWrkDetl.getOrderNo())){
			if (!Cools.isEmpty(agvWrkDetl.getOrderNo())) {
			String orderNo = agvWrkDetl.getOrderNo();
			if(orderNo.contains("{")){
			if (orderNo.contains("{")) {
			JSONArray orderArray = JSON.parseArray(orderNo);
			for (Object o : orderArray){
			for (Object o : orderArray) {
			JSONObject jsonobject = (JSONObject) o;
			OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
			OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
			orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
			orderDetlService.updateById(orderDetl);
			}

			}else {
			OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
			} else {
			OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
			orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
			orderDetlService.updateById(orderDetl);
			}
			@@ -988,7 +1523,7 @@


			//删除工作档以及明细
			if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) \|\| !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
			if (!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) \|\| !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())) {
			throw new CoolException("删除失败，请联系管理员");
			}

			@@ -1002,7 +1537,7 @@
			/*
			更新目标库位信息
			*/
			private void updateAgvLocMast(AgvLocMast locMast, String locSts){
			private void updateAgvLocMast(AgvLocMast locMast, String locSts) {
			locMast.setLocSts(locSts);
			locMast.setModiTime(new Date());
			agvLocMastService.updateById(locMast);
			@@ -1011,7 +1546,7 @@
			/*
			更新目标库位信息和库位货架类型
			*/
			private void updateAgvLocMast(AgvLocMast locMast, String locSts, short type){
			private void updateAgvLocMast(AgvLocMast locMast, String locSts, short type) {
			locMast.setLocSts(locSts);
			locMast.setLocType2(type);
			locMast.setModiTime(new Date());
			@@ -1021,8 +1556,8 @@
			/*
			更新源站点信息
			*/
			private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts){
			if(!Cools.isEmpty(agvBasDevp)){
			private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts) {
			if (!Cools.isEmpty(agvBasDevp)) {
			agvBasDevp.setLocSts(locSts);
			agvBasDevpService.updateById(agvBasDevp);
			}
			@@ -1031,16 +1566,16 @@
			/*
			更新源站点信息和库位货架类型
			*/
			private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType){
			if(!Cools.isEmpty(agvBasDevp)){
			private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType) {
			if (!Cools.isEmpty(agvBasDevp)) {
			agvBasDevp.setLocSts(locSts);
			agvBasDevp.setLocType2(continerType);
			agvBasDevpService.updateById(agvBasDevp);
			}
			}

			private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
			if(!Cools.isEmpty(agvBasDevp)){
			private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode) {
			if (!Cools.isEmpty(agvBasDevp)) {
			agvBasDevp.setLocSts(locSts);
			agvBasDevp.setLocType2(continerType);
			agvBasDevp.setBarcode(containerCode);
			@@ -1051,13 +1586,24 @@
			/*
			生成工作档明细
			*/
			private void createWrkDetlReWrite(String matnr, int wrkNo, String orderNo,String batch, double anfme, String zpallet, Date now, Long userId, String csocode, String isoseq,Integer processSts){
			private void createWrkDetlReWrite(String matnr, int wrkNo, String orderNo, String batch, double anfme, String zpallet, Date now, Long userId, String csocode, String isoseq, Integer processSts) {
			Mat mat = matService.selectByMatnr(matnr);
			if (Cools.isEmpty(mat)) {
			throw new CoolException(matnr + "商品维护失败");
			}
			OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), batch, csocode);
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), null, csocode);
			if (orderDetl == null) {
			throw new CoolException("订单明细不存在");
			}
			}
			AgvWrkDetl wrkDetl = new AgvWrkDetl();
			wrkDetl.sync(mat);
			if (orderDetl != null) {
			wrkDetl.setWeight(orderDetl.getWeight());
			wrkDetl.setVolume(orderDetl.getVolume());
			}
			wrkDetl.setWrkNo(wrkNo);
			wrkDetl.setOrderNo(orderNo);
			wrkDetl.setIoTime(now);
			@@ -1081,7 +1627,7 @@
			生成工作档明细
			*/
			@Deprecated
			private void createWrkDetlReWrite(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId){
			private void createWrkDetlReWrite(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId) {
			Date now = new Date();
			agvWaitPakinList.stream().forEach(agvWaitPakin -> {
			Mat mat = matService.selectByMatnr(agvWaitPakin.getMatnr());
			@@ -1090,6 +1636,9 @@
			}
			AgvWrkDetl wrkDetl = new AgvWrkDetl();
			wrkDetl.sync(mat);
			wrkDetl.setWeight(agvWaitPakin.getWeight());
			wrkDetl.setVolume(agvWaitPakin.getVolume());

			wrkDetl.setWrkNo(wrkMast.getWrkNo());
			wrkDetl.setOrderNo(agvWaitPakin.getOrderNo());
			wrkDetl.setIoTime(now);
			@@ -1109,7 +1658,7 @@
			/*
			生成工作档
			*/
			private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType){
			private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, Integer pltType) {
			AgvWrkMast wrkMast = new AgvWrkMast();
			//工作状态
			wrkMast.setWrkSts(wrkSts);
			@@ -1131,7 +1680,14 @@
			wrkMast.setAppeTime(now);
			wrkMast.setModiUser(userId);
			wrkMast.setModiTime(now);
			if (!Cools.isEmpty(locNo) && Cools.isEmpty(pltType)) {
			AgvLocMast agvLocMast = agvLocMastService.selectById(locNo);
			pltType = agvLocMast.getPltType();
			}
			wrkMast.setPltType(pltType);
			wrkMast.setLogErrMemo("createWaitPainWrkMastStart");


			if (!agvWrkMastService.insertByIncrease(wrkMast)) {
			throw new CoolException("保存工作档失败");
			}
			@@ -1139,19 +1695,66 @@
			//暂存位任务+1
			addInQty(locNo);

			wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
			wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));

			return wrkMast;
			}

			private boolean isPakOut(String locNo, TaskDto taskDto){
			/*
			生成工作档
			*/
			private AgvWrkMast createWrkMastV2(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, Integer pltType, String ctnNo) {
			AgvWrkMast wrkMast = new AgvWrkMast();
			//工作状态
			wrkMast.setWrkSts(wrkSts);
			//入出库类型
			wrkMast.setIoType(ioType);
			wrkMast.setIoTime(now);
			//优先级
			wrkMast.setIoPri(300.0);
			//源站点
			wrkMast.setSourceLocNo(sourceLocNo);
			//目标站点
			wrkMast.setLocNo(locNo);
			//货架编码
			wrkMast.setBarcode(barcode);
			//货架类型
			wrkMast.setWhsType(containerType);

			wrkMast.setAppeUser(userId);
			wrkMast.setAppeTime(now);
			wrkMast.setModiUser(userId);
			wrkMast.setModiTime(now);
			if (!Cools.isEmpty(locNo) && Cools.isEmpty(pltType)) {
			AgvLocMast agvLocMast = agvLocMastService.selectById(locNo);
			pltType = agvLocMast.getPltType();
			}
			wrkMast.setPltType(pltType);
			wrkMast.setLogErrMemo("createWaitPainWrkMastStart");
			wrkMast.setCtnNo(ctnNo);


			if (!agvWrkMastService.insertByIncrease(wrkMast)) {
			throw new CoolException("保存工作档失败");
			}

			//暂存位任务+1
			addInQty(locNo);

			wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));

			return wrkMast;
			}


			private boolean isPakOut(String locNo, TaskDto taskDto) {
			Double allAnfme = agvLocDetlService.selectSumAnfmeByLocNo(locNo);
			Double pakOutAnfme = 0.0;
			for (LocDto locDto : taskDto.getLocDtos()){
			for (LocDto locDto : taskDto.getLocDtos()) {
			pakOutAnfme += locDto.getAnfme();
			}

			if(allAnfme > pakOutAnfme){
			if (allAnfme > pakOutAnfme) {
			return false;
			}
			return true;
			@@ -1161,19 +1764,19 @@
			AGV生成出库工作档后修改订单信息
			TODO 与四项库生成出库工作档后修改订单信息整合到一起
			*/
			private void modifyOrderDetl(LocDto locDto, Long userId){
			private void modifyOrderDetl(LocDto locDto, Long userId) {

			if (!BaseController.isJSON(locDto.getOrderNo())) {
			//非合并出库
			OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
			OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
			orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getCsocode(), locDto.getIsoseq());
			}
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(),locDto.getCsocode(),locDto.getIsoseq())) {
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), locDto.getCsocode(), locDto.getIsoseq())) {
			throw new CoolException("修改订单明细数量失败");
			}
			orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
			}else {
			} else {
			//合并出库
			List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);

			@@ -1183,20 +1786,20 @@
			Double orderAnfme;

			for (OrderDto orderDto : orderDtoList) {
			OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
			OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
			orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null, locDto.getCsocode(), locDto.getIsoseq());
			}

			orderAnfme = orderDetl.getAnfme() - orderDetl.getQty();

			if(locAnfme > orderAnfme){
			if (locAnfme > orderAnfme) {
			locAnfme -= orderAnfme;
			}else {
			} else {
			orderAnfme = locAnfme;
			}

			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderAnfme,orderDetl.getThreeCode(),orderDetl.getDeadTime())) {
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderAnfme, orderDetl.getThreeCode(), orderDetl.getDeadTime())) {
			throw new CoolException("修改订单明细数量失败");
			}
			orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
			@@ -1217,30 +1820,30 @@
			if (wrkMast.getIoType() == 108) {
			wrkMast.setIoType(111);
			wrkMast.setModiTime(new Date());
			agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
			} else if(wrkMast.getIoType() == 111) {
			agvWrkMastService.update(wrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
			} else if (wrkMast.getIoType() == 111) {
			wrkMast.setIoType(108);
			wrkMast.setModiTime(new Date());
			agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
			agvWrkMastService.update(wrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
			}


			}

			private void addInQty(String devno){
			private void addInQty(String devno) {
			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devno);
			if(!Cools.isEmpty(agvBasDevp)){
			if(Cools.isEmpty(agvBasDevp.getInQty())){
			if (!Cools.isEmpty(agvBasDevp)) {
			if (Cools.isEmpty(agvBasDevp.getInQty())) {
			agvBasDevp.setInQty(1);
			}else {
			} else {
			agvBasDevp.setInQty(agvBasDevp.getInQty() + 1);
			}
			}
			}

			private int getContainerTypeByloc(String locNo){
			private int getContainerTypeByloc(String locNo) {

			return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no",locNo)).getLocType2();
			return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo)).getLocType2();

			}