zy-wcs.git - Gitblit

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

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.core.common.Cools;
			@@ -19,6 +20,8 @@
			import com.zy.common.model.StartupDto;
			import com.zy.common.service.CommonService;
			import com.zy.common.utils.CollectionUtils;
			import com.zy.common.utils.HttpHandler;
			import com.zy.common.web.param.SearchLocParam;
			import com.zy.core.CrnThread;
			import com.zy.core.DevpThread;
			import com.zy.core.cache.MessageQueue;
			@@ -37,7 +40,7 @@
			import com.zy.core.thread.LedThread;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.jdbc.core.JdbcTemplate;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.scheduling.annotation.Async;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -57,7 +60,6 @@
			@Service("mainService")
			@Transactional
			public class MainServiceImpl {


			public static final long COMMAND_TIMEOUT = 5 * 1000;

			@@ -85,8 +87,8 @@
			private BasErrLogService basErrLogService;
			@Autowired
			private BasCrnErrorMapper basCrnErrorMapper;
			@Autowired
			private JdbcTemplate jdbcTemplate;
			@Value("${wms.url}")
			private String wmsUrl;

			/**
			* 组托
			@@ -131,72 +133,104 @@
			log.error("工作档中已存在该站状态为（ 2.设备上走）的数据,工作号={}", wrkMast.getWrkNo());
			continue;
			}
			// 获取入库通知档
			List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
			if (waitPakins.isEmpty()) {
			log.error("无此入库条码数据。条码号={}", barcode);
			continue;
			}
			// // 获取入库通知档
			// List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
			// if (waitPakins.isEmpty()) {
			// log.error("无此入库条码数据。条码号={}", barcode);
			// continue;
			// }

			try {
			// 检索库位

			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
			StartupDto startupDto = commonService.getLocNo(1, 1, inSta.getStaNo(), matNos, locTypeDto, 0);
			// 工作号
			int workNo = startupDto.getWorkNo();
			// 插入工作明细档
			wrkDetlService.createWorkDetail(workNo, waitPakins, barcode);

			// 插入工作主档
			wrkMast = new WrkMast();
			wrkMast.setWrkNo(workNo);
			wrkMast.setIoTime(new Date());
			wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
			wrkMast.setIoType(1); // 入出库状态：1.入库
			wrkMast.setIoPri(10D); // 优先级：10
			wrkMast.setCrnNo(startupDto.getCrnNo());
			wrkMast.setSourceStaNo(startupDto.getSourceStaNo());
			wrkMast.setStaNo(startupDto.getStaNo());
			wrkMast.setLocNo(startupDto.getLocNo());
			wrkMast.setBarcode(barcode); // 托盘码
			wrkMast.setFullPlt("Y"); // 满板：Y
			wrkMast.setPicking("N"); // 拣料
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk("N"); // 空板
			wrkMast.setLinkMis("N");
			// 操作人员数据
			wrkMast.setAppeTime(new Date());
			wrkMast.setModiTime(new Date());
			Integer insert = wrkMastMapper.insert(wrkMast);
			if (insert == 0) {
			throw new CoolException("保存工作档失败");
			}
			// 更新目标库位状态
			LocMast locMast = locMastService.selectById(startupDto.getLocNo());
			locMast.setLocSts("S"); // S.入库预约
			locMast.setModiTime(new Date());
			if (!locMastService.updateById(locMast)){
			throw new CoolException("改变库位状态失败");
			}
			// 将入库通知档修改为已启动
			if (wrkMastMapper.updateWaitPakInStep1(barcode) == 0) {
			throw new CoolException("修改入库通知档状态为已启动失败");
			SearchLocParam param = new SearchLocParam();
			param.setBarcode(barcode);
			param.setIoType(1);
			param.setSourceStaNo(inSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(dto.getWorkNo().shortValue());
			staProtocol.setStaNo(dto.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			} else {
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}

			// 命令下发区 --------------------------------------------------------------------------

			// 更新站点信息且下发plc命令
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo((short) workNo);
			staProtocol.setStaNo(startupDto.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			// // 检索库位
			// LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			// List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
			// StartupDto startupDto = commonService.getLocNo(1, 1, inSta.getStaNo(), matNos, locTypeDto, 0);
			// // 工作号
			// int workNo = startupDto.getWorkNo();
			// // 插入工作明细档
			// wrkDetlService.createWorkDetail(workNo, waitPakins, barcode);
			//
			// // 插入工作主档
			// wrkMast = new WrkMast();
			// wrkMast.setWrkNo(workNo);
			// wrkMast.setIoTime(new Date());
			// wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
			// wrkMast.setIoType(1); // 入出库状态：1.入库
			// wrkMast.setIoPri(10D); // 优先级：10
			// wrkMast.setCrnNo(startupDto.getCrnNo());
			// wrkMast.setSourceStaNo(startupDto.getSourceStaNo());
			// wrkMast.setStaNo(startupDto.getStaNo());
			// wrkMast.setLocNo(startupDto.getLocNo());
			// wrkMast.setBarcode(barcode); // 托盘码
			// wrkMast.setFullPlt("Y"); // 满板：Y
			// wrkMast.setPicking("N"); // 拣料
			// wrkMast.setExitMk("N"); // 退出
			// wrkMast.setEmptyMk("N"); // 空板
			// wrkMast.setLinkMis("N");
			// // 操作人员数据
			// wrkMast.setAppeTime(new Date());
			// wrkMast.setModiTime(new Date());
			// Integer insert = wrkMastMapper.insert(wrkMast);
			// if (insert == 0) {
			// throw new CoolException("保存工作档失败");
			// }
			// // 更新目标库位状态
			// LocMast locMast = locMastService.selectById(startupDto.getLocNo());
			// locMast.setLocSts("S"); // S.入库预约
			// locMast.setModiTime(new Date());
			// if (!locMastService.updateById(locMast)){
			// throw new CoolException("改变库位状态失败");
			// }
			// // 将入库通知档修改为已启动
			// if (wrkMastMapper.updateWaitPakInStep1(barcode) == 0) {
			// throw new CoolException("修改入库通知档状态为已启动失败");
			// }
			//
			// // 命令下发区 --------------------------------------------------------------------------
			//
			// // 更新站点信息且下发plc命令
			// barcodeThread.setBarcode("");
			// staProtocol.setWorkNo((short) workNo);
			// staProtocol.setStaNo(startupDto.getStaNo().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// if (!result) {
			// throw new CoolException("更新plc站点信息失败");
			// }

			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}

			@@ -395,7 +429,7 @@
			}
			// 判断堆垛机状态等待确认
			if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
			&& crnProtocol.getTaskFinish() == 1 // todo:luxiaotao 等待确认
			&& crnProtocol.statusType == CrnStatusType.WAITING
			&& crnProtocol.forkPosType == CrnForkPosType.HOME) {

			// 命令下发区 --------------------------------------------------------------------------
			@@ -427,8 +461,7 @@
			/**
			* 入出库 ===>> 堆垛机入出库作业下发
			*/
			@Async
			public void crnIoExecute(){
			public synchronized void crnIoExecute(){
			for (CrnSlave crn : slaveProperties.getCrn()) {
			// 获取堆垛机信息
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
			@@ -462,9 +495,6 @@
			}
			}
			}
			try {
			Thread.sleep(500L);
			} catch (InterruptedException ignore) {}
			// 库位移转
			this.locToLoc(crn, crnProtocol);
			}
			@@ -473,7 +503,7 @@
			/**
			* 入库 ===>> 堆垛机站到库位
			*/
			public synchronized void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
			boolean flag = false;
			// 获取堆垛机入库站信息
			@@ -567,7 +597,7 @@
			/**
			* 出库 ===>> 库位到堆垛机站
			*/
			public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			// 获取工作状态为11（生成出库ID）的出库工作档
			WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
			@@ -632,8 +662,9 @@
			wrkMast.setUpdMk("Y");
			wrkMastMapper.updateById(wrkMast);
			// 生成工作档、改变浅库位的源库/目标库库位状态、下发堆垛机命令（立马执行)
			moveLocForDeepLoc(slave, shallowLoc);
			// moveLocForDeepLoc(slave, shallowLoc);
			}
			log.error("{}任务出库失败，浅库位堵塞！", wrkMast.getWrkNo());
			continue;
			}
			}
			@@ -674,7 +705,7 @@
			/**
			* 库位移转
			*/
			public synchronized void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			// 获取工作档信息
			WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
			if (null == wrkMast) {
			@@ -750,8 +781,7 @@
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { continue; }
			// 状态：等待确认并且任务完成位 = 1
			if (crnProtocol.getTaskFinish() == 1 // todo:luxiaotao 等待确认
			&& crnProtocol.getTaskNo() != 0) {
			if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
			// 获取入库待确认工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
			if (wrkMast == null) {
			@@ -797,13 +827,13 @@
			BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
			// 有异常
			if (latest == null) {
			if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {
			if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
			WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
			if (wrkMast == null) {
			continue;
			}
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm1()):crnError.getErrName();
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
			BasErrLog basErrLog = new BasErrLog(
			null, // 编号
			wrkMast.getWrkNo(), // 工作号
			@@ -818,7 +848,7 @@
			wrkMast.getSourceStaNo(), // 源站
			wrkMast.getSourceLocNo(), // 源库位
			wrkMast.getBarcode(), // 条码
			crnProtocol.getAlarm1(), // 异常码
			(int) crnProtocol.getAlarm(), // 异常码
			errName, // 异常
			1, // 异常情况
			now, // 添加时间
			@@ -833,7 +863,7 @@
			}
			} else {
			// 异常修复
			if (crnProtocol.getAlarm1() == null \|\| crnProtocol.getAlarm1() == 0) {
			if (crnProtocol.getAlarm() == null \|\| crnProtocol.getAlarm() == 0) {
			latest.setEndTime(now);
			latest.setUpdateTime(now);
			latest.setStatus(2);
			@@ -846,11 +876,11 @@
			} else {
			BasErrLog latest = basErrLogService.findLatest(crn.getId());
			// 有异常
			if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {
			if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
			// 记录新异常
			if (latest == null \|\| (latest.getErrCode() != crnProtocol.getAlarm1().intValue())) {
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm1()):crnError.getErrName();
			if (latest == null \|\| (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
			BasErrLog basErrLog = new BasErrLog(
			null, // 编号
			null, // 工作号
			@@ -865,7 +895,7 @@
			null, // 源站
			null, // 源库位
			null, // 条码
			crnProtocol.getAlarm1(), // 异常码
			(int)crnProtocol.getAlarm(), // 异常码
			errName, // 异常
			1, // 异常情况
			now, // 添加时间
			@@ -917,59 +947,96 @@
			}
			// 站点条件判断
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			&& staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getWorkNo() == 9999 \|\| staProtocol.getWorkNo() == 9990) && staProtocol.isPakMk()) {
			// 检索库位
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			StartupDto startupDto = commonService.getLocNo(1, 10, emptyInSta.getStaNo(), null, locTypeDto, 0);
			// 工作号
			int workNo = startupDto.getWorkNo();
			&& staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getWorkNo() == 9999 \|\| staProtocol.getWorkNo() == 9990 \|\| staProtocol.getWorkNo() == 9997) && staProtocol.isPakMk()) {

			try {
			// 插入工作主档
			WrkMast wrkMast = new WrkMast();
			wrkMast.setWrkNo(workNo);
			wrkMast.setIoTime(new Date());
			wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
			wrkMast.setIoType(10); // 入出库状态：10.空板入库
			wrkMast.setIoPri(10D); // 优先级：10
			wrkMast.setCrnNo(startupDto.getCrnNo());
			wrkMast.setSourceStaNo(startupDto.getSourceStaNo());
			wrkMast.setStaNo(startupDto.getStaNo());
			wrkMast.setLocNo(startupDto.getLocNo());
			wrkMast.setFullPlt("N"); // 满板
			wrkMast.setPicking("N"); // 拣料
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk("Y"); // 空板
			wrkMast.setLinkMis("N");
			// wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
			// 操作人员数据
			wrkMast.setAppeTime(new Date());
			wrkMast.setModiTime(new Date());
			Integer insert = wrkMastMapper.insert(wrkMast);
			if (insert == 0) {
			throw new CoolException("保存工作档失败");
			}
			// 更新目标库位状态
			LocMast locMast = locMastService.selectById(startupDto.getLocNo());
			locMast.setLocSts("S"); // S.入库预约
			locMast.setModiTime(new Date());
			if (!locMastService.updateById(locMast)){
			throw new CoolException("改变库位状态失败");
			}
			// 命令下发区 --------------------------------------------------------------------------
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo((short) workNo);
			staProtocol.setStaNo(startupDto.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			SearchLocParam param = new SearchLocParam();
			param.setIoType(10);
			param.setSourceStaNo(emptyInSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(dto.getWorkNo().shortValue());
			staProtocol.setStaNo(dto.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			} else {
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}




			// // 检索库位
			// LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			// StartupDto startupDto = commonService.getLocNo(1, 10, emptyInSta.getStaNo(), null, locTypeDto, 0);
			// // 工作号
			// int workNo = startupDto.getWorkNo();
			//
			// try {
			// // 插入工作主档
			// WrkMast wrkMast = new WrkMast();
			// wrkMast.setWrkNo(workNo);
			// wrkMast.setIoTime(new Date());
			// wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
			// wrkMast.setIoType(10); // 入出库状态：10.空板入库
			// wrkMast.setIoPri(10D); // 优先级：10
			// wrkMast.setCrnNo(startupDto.getCrnNo());
			// wrkMast.setSourceStaNo(startupDto.getSourceStaNo());
			// wrkMast.setStaNo(startupDto.getStaNo());
			// wrkMast.setLocNo(startupDto.getLocNo());
			// wrkMast.setFullPlt("N"); // 满板
			// wrkMast.setPicking("N"); // 拣料
			// wrkMast.setExitMk("N"); // 退出
			// wrkMast.setEmptyMk("Y"); // 空板
			// wrkMast.setLinkMis("N");
			//// wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
			// // 操作人员数据
			// wrkMast.setAppeTime(new Date());
			// wrkMast.setModiTime(new Date());
			// Integer insert = wrkMastMapper.insert(wrkMast);
			// if (insert == 0) {
			// throw new CoolException("保存工作档失败");
			// }
			// // 更新目标库位状态
			// LocMast locMast = locMastService.selectById(startupDto.getLocNo());
			// locMast.setLocSts("S"); // S.入库预约
			// locMast.setModiTime(new Date());
			// if (!locMastService.updateById(locMast)){
			// throw new CoolException("改变库位状态失败");
			// }
			// // 命令下发区 --------------------------------------------------------------------------
			//
			// // 更新站点信息且下发plc命令
			// staProtocol.setWorkNo((short) workNo);
			// staProtocol.setStaNo(startupDto.getStaNo().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// if (!result) {
			// throw new CoolException("更新plc站点信息失败");
			// }
			// } catch (Exception e) {
			// e.printStackTrace();
			// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			// }

			}

			@@ -1196,82 +1263,6 @@
			/**
			* 堆垛机演示 ===>> 库位移转
			*/
			@Async
			public void crnDemoOfLocMove(Integer crn){
			for (int i = 0; i < 5; i++) {

			LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn);
			LocMast loc = locMastService.queryDemoLoc(crn);
			if (null == sourceLoc \|\| null == loc) {
			break;
			}
			String sourceLocNo = sourceLoc.getLocNo();
			String locNo = loc.getLocNo();

			// 获取工作号
			int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
			// 保存工作档
			WrkMast wrkMast = new WrkMast();
			wrkMast.setWrkNo(workNo);
			wrkMast.setIoTime(new Date());
			wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
			wrkMast.setIoType(11); // 入出库状态： 11.库格移载
			wrkMast.setIoPri(13D);
			wrkMast.setCrnNo(crn);
			wrkMast.setSourceLocNo(sourceLocNo); // 源库位
			wrkMast.setLocNo(locNo); // 目标库位
			wrkMast.setFullPlt("N"); // 满板：Y
			wrkMast.setPicking("N"); // 拣料
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 空板
			wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码
			wrkMast.setLinkMis("N");
			wrkMast.setAppeTime(new Date());
			wrkMast.setModiTime(new Date());
			int res = wrkMastMapper.insert(wrkMast);
			if (res == 0) {
			throw new CoolException("保存工作档失败");
			}
			// 工作档明细保存
			List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
			for (LocDetl locDetl : locDetls) {
			WrkDetl wrkDetl = new WrkDetl();
			wrkDetl.setWrkNo(workNo);
			wrkDetl.setIoTime(new Date());
			wrkDetl.setAnfme(locDetl.getAnfme());
			VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
			wrkDetl.setAppeTime(new Date());
			wrkDetl.setModiTime(new Date());
			if (!wrkDetlService.insert(wrkDetl)) {
			throw new CoolException("保存工作档明细失败");
			}
			}
			// 修改源库位状态
			if (sourceLoc.getLocSts().equals("D") \|\| sourceLoc.getLocSts().equals("F")) {
			sourceLoc.setLocSts("R"); // R.出库预约
			sourceLoc.setModiTime(new Date());
			if (!locMastService.updateById(sourceLoc)){
			throw new CoolException("更新源库位状态失败");
			}
			} else {
			throw new CoolException("源库位出库失败");
			}
			// 修改目标库位状态
			if (loc.getLocSts().equals("O")) {
			loc.setLocSts("S"); // S.入库预约
			loc.setModiTime(new Date());
			if (!locMastService.updateById(loc)) {
			throw new CoolException("更新目标库位状态失败");
			}
			} else {
			throw new CoolException("移转失败");
			}
			}
			}

			/**
			* 堆垛机演示 ===>> 库位移转
			*/
			public synchronized void crnDemoOfLocMove1(){
			for (CrnSlave crn : slaveProperties.getCrn()) {
			if (!crn.getDemo()) { continue; } // 必须为演示状态
			@@ -1318,21 +1309,21 @@
			throw new CoolException("保存工作档失败");
			}
			// 工作档明细保存
			List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
			for (LocDetl locDetl : locDetls) {
			WrkDetl wrkDetl = new WrkDetl();
			wrkDetl.setWrkNo(workNo);
			wrkDetl.setIoTime(new Date());
			wrkDetl.setAnfme(locDetl.getAnfme());
			VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
			wrkDetl.setAppeTime(new Date());
			wrkDetl.setModiTime(new Date());
			if (!wrkDetlService.insert(wrkDetl)) {
			throw new CoolException("保存工作档明细失败");
			}
			}
			// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
			// for (LocDetl locDetl : locDetls) {
			// WrkDetl wrkDetl = new WrkDetl();
			// wrkDetl.setWrkNo(workNo);
			// wrkDetl.setIoTime(new Date());
			// wrkDetl.setAnfme(locDetl.getAnfme());
			// VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
			// wrkDetl.setAppeTime(new Date());
			// wrkDetl.setModiTime(new Date());
			// if (!wrkDetlService.insert(wrkDetl)) {
			// throw new CoolException("保存工作档明细失败");
			// }
			// }
			// 修改源库位状态
			if (sourceLoc.getLocSts().equals("D") \|\| sourceLoc.getLocSts().equals("F")) {
			if (sourceLoc.getLocSts().equals("D")) {
			sourceLoc.setLocSts("R"); // R.出库预约
			sourceLoc.setModiTime(new Date());
			if (!locMastService.updateById(sourceLoc)){