zy-wcs.git - Gitblit

			@@ -734,14 +734,14 @@
			*/
			public synchronized void toSxk(Integer mark) {

			for (CrnSlave crnSlave : slaveProperties.getCrn()) {
			for (DevpSlave devpSlave : slaveProperties.getDevp()) {
			// 遍历堆垛机出库站
			for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
			if (crnStn.getStaNo() != 1035) {
			for (DevpSlave.Sta crnStn : devpSlave.getOutSta()) {
			if (crnStn.getStaNo() != 1135) {
			continue;
			}
			// 获取堆垛机出库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId());
			StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
			if (staProtocol == null) {
			continue;
			@@ -762,7 +762,7 @@
			// 下发站点信息
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(RouteUtils.CrnStaEnd(1031, 1135));
			if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
			if (!MessageQueue.offer(SlaveType.Devp, devpSlave.getId(), new Task(2, staProtocol))) {
			log.info(staProtocol.getWorkNo() + "," + staProtocol.getStaNo() + "输送线出库命令下发失败222");
			continue;
			} else {

			@@ -115,7 +115,7 @@
			</select>

			<select id="selectPakOutStep3" resultMap="BaseResultMap">
			select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=107 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
			select top 1 * from dbo.asr_wrk_mast where sta_no=#{sourceStaNo} and wrk_sts=107 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
			</select>

			<select id="selectLocMove" resultMap="BaseResultMap">

	src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/core/thread/SiemensDevpThread.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/WrkMastMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -57,7 +57,7 @@
			}};

			public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
			add(1112);add(1114);add(1122);add(1124);add(1131);
			add(1112);add(1114);add(1122);add(1124);add(1131);add(1135);

			}};