zy-wcs.git - Gitblit

			@@ -44,7 +44,6 @@
			*/
			@Slf4j
			@Service("mainService")
			@Transactional
			public class MainServiceImpl {

			@Value("${wms.url}")
			@@ -2576,7 +2575,7 @@
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			// e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}

			@@ -2601,7 +2600,7 @@
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			// e.printStackTrace();
			}
			}

			@@ -2983,12 +2982,48 @@
			ledCommand.setStaNo(wrkStaNo);
			ledCommand.setBarcode(barcode);
			if (ioType != 110 && ioType != 10) {
			List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
			if (ioType == 101) {
			List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
			wrkDetls.forEach(wrkDetl -> {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), 0D, wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
			});
			List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
			wrkDetls.forEach(wrkDetl -> {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (wrkDetl.getStock() - wrkDetl.getAnfme()), wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
			});

			// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
			// if (ioType == 101) {
			// List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
			// wrkDetls.forEach(wrkDetl -> {
			// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), 0D, wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
			// });
			//// locDetls.forEach(locDetl -> {
			//// Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
			//// Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());
			//// Utils.wapperSetCondition(wrapper, "three_code", locDetl.getThreeCode());
			//// Utils.wapperSetCondition(wrapper, "dead_time", locDetl.getDeadTime());
			//// Utils.wapperSetCondition(wrapper, "supp_code", locDetl.getSuppCode());//料箱码
			//// List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
			//// if (Cools.isEmpty(detl)) {
			//// String suppCode = "";
			//// if (locDetl.getSuppCode() != null) {
			//// suppCode = locDetl.getSuppCode();
			//// }
			//// ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
			//// } else {
			//// //出库数量累计
			//// Double conut = 0.0;
			//// for (WrkDetl wrkDetl : detl) {
			//// conut = conut + wrkDetl.getAnfme();
			//// }
			////
			//// for (WrkDetl wrkDetl : detl) {
			//// String suppCode = "";
			//// if (wrkDetl.getSuppCode() != null) {
			//// suppCode = wrkDetl.getSuppCode();
			//// }
			//// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
			//// }
			//// }
			////
			//// });
			// } else {
			// locDetls.forEach(locDetl -> {
			// Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
			// Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());
			@@ -3014,69 +3049,36 @@
			// if (wrkDetl.getSuppCode() != null) {
			// suppCode = wrkDetl.getSuppCode();
			// }
			// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
			// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (wrkDetl.getStock() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
			// }
			// }
			//
			// });
			} else {
			locDetls.forEach(locDetl -> {
			Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
			Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());
			Utils.wapperSetCondition(wrapper, "three_code", locDetl.getThreeCode());
			Utils.wapperSetCondition(wrapper, "dead_time", locDetl.getDeadTime());
			Utils.wapperSetCondition(wrapper, "supp_code", locDetl.getSuppCode());//料箱码
			List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
			if (Cools.isEmpty(detl)) {
			String suppCode = "";
			if (locDetl.getSuppCode() != null) {
			suppCode = locDetl.getSuppCode();
			}
			ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
			} else {
			//出库数量累计
			Double conut = 0.0;
			for (WrkDetl wrkDetl : detl) {
			conut = conut + wrkDetl.getAnfme();
			}

			for (WrkDetl wrkDetl : detl) {
			String suppCode = "";
			if (wrkDetl.getSuppCode() != null) {
			suppCode = wrkDetl.getSuppCode();
			}
			if (wrkDetl.getAnfme() > 0D) {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (wrkDetl.getStock() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
			}
			}
			}

			});
			}


			if (ioType == 107) {
			locDetls = new ArrayList<>();
			ledCommand.setMatDtos(new ArrayList<>());
			}

			if (locDetls.isEmpty() && ioType != 101) {
			List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
			wrkDetls.forEach(wrkDetl -> {
			if (wrkDetl.getAnfme() > 0D) {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
			}
			});

			if (wrkDetls.isEmpty()) {//从历史档查询
			List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
			for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
			if (wrkDetlLog.getAnfme() > 0D) {
			ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
			}
			}
			}
			}
			// }
			//
			//
			// if (ioType == 107) {
			// locDetls = new ArrayList<>();
			// ledCommand.setMatDtos(new ArrayList<>());
			// }
			//
			// if (locDetls.isEmpty() && ioType != 101) {
			// List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
			// wrkDetls.forEach(wrkDetl -> {
			// if (wrkDetl.getAnfme() > 0D) {
			// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
			// }
			// });
			//
			// if (wrkDetls.isEmpty()) {//从历史档查询
			// List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
			// for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
			// if (wrkDetlLog.getAnfme() > 0D) {
			// ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
			// }
			// }
			// }
			// }
			}

			commands.add(ledCommand);
			@@ -4098,32 +4100,36 @@

			//扫描设备PakMk标记是否超时
			public synchronized void scanDevicePakMk() {
			//扫描小车
			for (ShuttleSlave slave : slaveProperties.getShuttle()) {
			NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
			NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (shuttleProtocol == null) {
			continue;
			try {
			//扫描小车
			for (ShuttleSlave slave : slaveProperties.getShuttle()) {
			NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
			NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (shuttleProtocol == null) {
			continue;
			}

			if ((System.currentTimeMillis() - shuttleProtocol.getSendTime() > (1000 * 60 * 5)) && shuttleProtocol.getPakMk()) {
			//设备超过5分钟还没复位标记
			shuttleProtocol.setPakMk(false);//复位标记
			}
			}

			if ((System.currentTimeMillis() - shuttleProtocol.getSendTime() > (1000605)) && shuttleProtocol.getPakMk()) {
			//设备超过5分钟还没复位标记
			shuttleProtocol.setPakMk(false);//复位标记
			}
			}
			//扫描提升机
			for (LiftSlave slave : slaveProperties.getLift()) {
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
			LiftProtocol liftProtocol = liftThread.getLiftProtocol();
			if (liftProtocol == null) {
			continue;
			}

			//扫描提升机
			for (LiftSlave slave : slaveProperties.getLift()) {
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
			LiftProtocol liftProtocol = liftThread.getLiftProtocol();
			if (liftProtocol == null) {
			continue;
			if ((System.currentTimeMillis() - liftProtocol.getSendTime() > (1000 * 60 * 5)) && liftProtocol.getPakMk()) {
			//设备超过5分钟还没复位标记
			liftProtocol.setPakMk(false);//复位标记
			}
			}

			if ((System.currentTimeMillis() - liftProtocol.getSendTime() > (1000605)) && liftProtocol.getPakMk()) {
			//设备超过5分钟还没复位标记
			liftProtocol.setPakMk(false);//复位标记
			}
			} catch (Exception e) {
			e.printStackTrace();
			}

			}