zy-wcs.git - Gitblit

			@@ -7,7 +7,7 @@
			import com.zy.asrs.domain.vo.SiteTableVo;
			import com.zy.asrs.entity.BasDevp;
			import com.zy.asrs.service.BasDevpService;
			import com.zy.core.Slave;
			import com.zy.core.DevpThread;
			import com.zy.core.cache.MessageQueue;
			import com.zy.core.cache.OutputQueue;
			import com.zy.core.cache.SlaveConnection;
			@@ -16,7 +16,6 @@
			import com.zy.core.model.Task;
			import com.zy.core.model.protocol.StaProtocol;
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.DevpThread;
			import com.zy.core.thread.SiemensDevpThread;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;
			@@ -82,6 +81,7 @@
			vo.setStaNo(staProtocol.getStaNo()); // 目标站
			// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高"); //高低库位
			vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
			vo.setInreq1(devp.getInreq1());
			}
			return R.ok().add(list);
			}
			@@ -169,6 +169,7 @@
			public R siteDetlUpdate(@RequestParam Integer siteId,
			@RequestParam Short workNo,
			@RequestParam Short staNo,
			@RequestParam Short palletSize,
			@RequestParam String pakMk){
			for (DevpSlave devp : slaveProperties.getDevp()) {
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			@@ -187,11 +188,13 @@
			if (staNo != null) {
			staProtocol.setStaNo(staNo);
			}
			if (palletSize != null) {
			staProtocol.setPalletSize(palletSize);
			}
			if (pakMk != null) {
			staProtocol.setPakMk(pakMk.equals("Y"));
			}

			staProtocol.setPalletSize((short) 1);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (result) {
			return R.ok();