zy-wcs.git - Gitblit

			@@ -151,18 +151,22 @@
			back = true;
			}
			if (!back && staProtocol.getWeight() > 1000) {
			errMsg = "超重";
			errMsg = "超重或未读取";
			back = true;
			}
			if (!back && staProtocol.isBarcodeErr()) {
			errMsg = "扫码失败";
			back = true;
			}
			if(staProtocol.getWeight() <= 0 ){
			continue;
			}
			// if (!back && staProtocol.getWeight() == 0.0) {
			// errMsg = "重量获取失败";
			// back = true;
			// }

			// News.info("{}重量", staProtocol.getWeight());

			// 退回
			if (back) {
			@@ -307,7 +311,8 @@
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			//
			log.error("输送线下发2：" + staProtocol.getWorkNo() + "," + staProtocol.getStaNo());

			// if (ledThread != null) {
			String errorMsg = jsonObject.getString("msg");
			if (!Cools.isEmpty(errorMsg)) {

			@@ -121,7 +121,7 @@
			basDevp.setLocType2((short) 0); // 宽窄类型{0:未知,1:窄库位,2:宽库位}
			basDevp.setLocType3((short) 0); // 轻重类型{0:未知,1:轻库位,2:重库位}
			basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
			basDevp.setInQty(weight !=null ?(int)weight : 0);
			basDevp.setMaxWt((double) (weight !=null ?(int)weight : 0));
			return basDevp;
			}

			@@ -274,6 +274,8 @@
			int staNoSize = staNos.size();
			OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (500 * 8));
			OperateResultExOne<byte[]> resultWeight = siemensS7Net.Read("DB102.0", (short) (8 * 4));
			OperateResultExOne<byte[]> resultWeight2 = siemensS7Net.Read("DB102.0", (short) (4 * 4));

			if (result.IsSuccess && resultWeight.IsSuccess) {
			int j = 0;
			for(int i = 0 ; i<staNoSize;i++){
			@@ -289,8 +291,14 @@

			staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset)); // 工作号
			if (staNoWeight.contains(siteId)) {
			staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight.Content, j));
			j = j + 4;
			if(staNoWeight.size() == 4){
			staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight2.Content, j));
			j = j + 4;
			}else{
			staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight.Content, j));
			j = j + 4;

			}
			}
			staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, offset+ 4)); // 目标站
			status = siemensS7Net.getByteTransform().TransBool(result.Content, offset+ 6, 2);
			@@ -332,6 +340,11 @@
			Integer siteId = staNoErrs.get(i); // 站点编号
			boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
			StaProtocol staProtocol = station.get(siteId);
			if (staProtocol == null) {
			staProtocol = new StaProtocol();
			staProtocol.setSiteId(siteId);
			station.put(siteId, staProtocol);
			}
			staProtocol.setFrontErr(status[0]);
			staProtocol.setBackErr(status[1]);
			staProtocol.setHighErr(status[2]);

	src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/core/model/protocol/StaProtocol.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/core/thread/SiemensDevpThread.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史