zy-asrs.git - Gitblit

			@@ -43,6 +43,8 @@
			private CommonService commonService;
			@Autowired
			private WrkDetlService wrkDetlService;
			@Autowired
			private BasCrnpService basCrnpService;

			@Value("${channel.equipmentRow}")
			private Integer equipmentRow; //测试库位所在排号
			@@ -61,17 +63,22 @@
			try {
			List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
			.eq("loc_sts", "F")
			.eq("pack_status", 4)
			.eq("pack_status", 4)//测试失败
			.eq("row1", equipmentRow)
			.eq("loc_type1", (short) 1)
			.eq("fire_status",0)
			);
			if (!Cools.isEmpty(locMasts)){
			for (LocMast locMast:locMasts){
			LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
			if (Cools.isEmpty(locDetl)){
			log.error("测试失败（NG）移库==>库存明细查询失败！库位号："+locMast.getLocNo());
			continue;
			}
			TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
			.eq("loc_no",locMast.getLocNo())
			.eq("barcode",locMast.getBarcode())
			.eq("status",4)
			.eq("barcode",locDetl.getMatnr())
			.eq("status",4)//完成测试
			);
			if (!Cools.isEmpty(testMast)){
			if (testMast.getStatus()==4){
			@@ -81,7 +88,15 @@
			targetLocNo=locMastService.queryFreeLocMast(1,(short)4);
			}
			if (targetLocNo != null){
			workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
			workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt("9935"));
			//4.测试完成上报
			CombParam combParam = new CombParam();
			combParam.setPackNo(locDetl.getMatnr());
			combParam.setLocNo(locMast.getLocNo());
			combParam.setPackSts(2);
			combParam.setStepSts(4);
			combParam.setRequestTime(DateUtils.convert(new Date()));
			new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
			return SUCCESS;
			}else {
			log.error("测试完成自动移库--->没有空库位!");
			@@ -95,48 +110,70 @@
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return FAIL.setMsg(e.getMessage());
			log.error(""+e);
			// e.printStackTrace();
			// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			// return FAIL.setMsg(e.getMessage());
			}

			//测试成功出库、移库
			try {
			List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
			.eq("loc_sts", "F")
			.eq("pack_status", 4)
			.eq("pack_status", 3)//测试完成
			.eq("row1", equipmentRow)
			.eq("loc_type1", (short) 1)
			.eq("fire_status",0)
			);
			if (!Cools.isEmpty(locMasts2)){
			for (LocMast locMast:locMasts2){
			LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
			if (Cools.isEmpty(locDetl)){
			log.error("测试成功出库、移库==>库存明细查询失败！库位号："+locMast.getLocNo());
			continue;
			}
			TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
			.eq("loc_no",locMast.getLocNo())
			.eq("barcode",locMast.getBarcode())
			.eq("barcode",locDetl.getMatnr())
			.eq("status",4)
			);
			boolean sign=false;
			if (!Cools.isEmpty(testMast)){
			if (testMast.getStatus()==4){
			boolean signCrn1 = basCrnpService.checkSiteError(1, false);
			if (!signCrn1){
			log.error("测试完成自动移库--->1号堆垛机不可出库!");
			break;
			}
			//移库开始，查询目标库位
			LocMast targetLocNo = locMastService.queryFreeLocMast(4,(short)2);
			if (Cools.isEmpty(targetLocNo)){
			targetLocNo=locMastService.queryFreeLocMast(3,(short)2);
			}
			boolean signCrn2 = basCrnpService.checkSiteError(2, true);
			if (!signCrn2){
			targetLocNo = null;
			log.error("测试完成自动移库--->2号堆垛机不可入库! 开始查找1号堆垛机");
			}
			if (targetLocNo != null){
			//生成出库任务
			if (outLoc(locMast)){
			return SUCCESS;
			sign=true;
			}
			}else {
			signCrn1 = basCrnpService.checkSiteError(1, true);
			if (!signCrn1){
			log.error("测试完成自动移库--->1号堆垛机不可入库!");
			break;
			}
			//3\4排满向2排移库，查询目标库位
			targetLocNo = locMastService.queryFreeLocMast(2,(short)2);
			if (Cools.isEmpty(targetLocNo)){
			targetLocNo=locMastService.queryFreeLocMast(1,(short)2);
			}
			if (targetLocNo != null){
			workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
			return SUCCESS;
			workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)9935);
			sign=true;
			}else {
			log.error("测试完成自动移库--->没有空库位!");
			}
			@@ -144,15 +181,28 @@
			}else if (testMast.getStatus()!=4) {
			log.error("测试状态异常,库位号为：" + testMast.getLocNo());
			}

			}else {
			log.error("测试库位："+locMast.getLocNo()+"所属测试档为空或者不状态为4");
			}
			if (sign){
			//4.测试完成上报
			CombParam combParam = new CombParam();
			combParam.setPackNo(locDetl.getMatnr());
			combParam.setLocNo(locMast.getLocNo());
			combParam.setPackSts(1);
			combParam.setStepSts(4);
			combParam.setRequestTime(DateUtils.convert(new Date()));
			new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
			return SUCCESS;
			}
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return FAIL.setMsg(e.getMessage());
			log.error(""+e);
			// e.printStackTrace();
			// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			// return FAIL.setMsg(e.getMessage());
			}

			//测试有空库位移库
			@@ -162,9 +212,15 @@
			.eq("pack_status", 0)
			.eq("loc_type1", (short) 3)
			.eq("fire_status",0)
			.orderBy("io_time",true)
			);
			if (!Cools.isEmpty(locMasts3)){
			for (LocMast locMast:locMasts3){
			boolean signCrn1 = basCrnpService.checkSiteError(1, true);
			if (!signCrn1){
			log.error("向测试库位移库失败---->1号堆垛机不可用!");
			break;
			}
			//移库开始，查询目标库位
			LocMast targetLocNo = locMastService.queryFreeLocMast(equipmentRow,(short)1);
			if (targetLocNo != null){
			@@ -175,9 +231,10 @@
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return FAIL.setMsg(e.getMessage());
			log.error(""+e);
			// e.printStackTrace();
			// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			// return FAIL.setMsg(e.getMessage());
			}
			return SUCCESS;
			}
			@@ -194,7 +251,7 @@
			} else if (Cools.isEmpty(locMast.getModiTime())){
			log.error("库位:"+locMast.getLocNo()+"modiTime为空");
			} else if (Cools.isEmpty(locMast.getBarcode())){
			log.error("库位:"+locMast.getLocNo()+"Pack码为空");
			log.error("库位:"+locMast.getLocNo()+"托盘码为空");
			} else {
			// 生成工作号
			int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
			@@ -207,7 +264,7 @@
			wrkMast.setIoPri(13D); // 优先级：13
			wrkMast.setCrnNo(1);
			wrkMast.setSourceStaNo(203); // 源站
			wrkMast.setStaNo(205); // 目标站 2号堆垛机入库站
			wrkMast.setStaNo(206); // 目标站 2号堆垛机入库站
			wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
			wrkMast.setFullPlt("Y"); // 满板：Y
			wrkMast.setPicking("N"); // 拣料
			@@ -237,15 +294,7 @@
			if (locMast.getLocSts().equals("F")) {
			locMast.setLocSts("R");
			locMast.setModiTime(now);
			locMast.setPackStatus(6); //6:静置完成

			CombParam combParam = new CombParam();
			combParam.setPackNo(locMast.getBarcode());
			combParam.setLocNo(locMast.getLocNo());
			combParam.setPackSts(6);
			combParam.setRequestTime(DateUtils.convert(new Date()));
			new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

			// locMast.setPackStatus(5); //5:开始静置
			if (!locMastService.updateById(locMast)) {
			log.error("预约库位状态失败，库位号："+locMast.getLocNo());
			return false;