zy-asrs.git - Gitblit

			@@ -8,6 +8,7 @@
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.entity.param.CombParam;
			import com.zy.asrs.mapper.ReportQueryMapper;
			import com.zy.asrs.service.*;
			import com.zy.asrs.task.AbstractHandler;
			import com.zy.asrs.task.core.ReturnT;
			@@ -52,6 +53,11 @@

			@Value("${mes.inPath}")
			private String inpath;

			@Autowired
			private PackQualifiedService packQualifiedService;
			@Autowired
			private ReportQueryMapper reportQueryMapper;

			public ReturnT<String> start(WrkMast wrkMast) {
			// 4.入库完成
			@@ -154,6 +160,10 @@
			locMast.setIoTime(now);
			locMast.setModiTime(now);
			locMast.setFireStatus(0);
			//入测试库位时给库位测试状态为1待测
			if(!Cools.isEmpty(locMast.getChannel())){
			locMast.setPackStatus(1);//待测
			}
			if (locMast.getCrnNo()==1){
			if (locMast.getLocType1()==1){
			locMast.setPackStatus(1);
			@@ -167,12 +177,23 @@
			.eq("barcode",wrkDetl1.getMatnr())
			.eq("status",4)
			);
			if (Cools.isEmpty(testMast)){
			testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
			.eq("barcode",wrkDetl1.getMatnr())
			.eq("status",5)
			);
			}
			if (Cools.isEmpty(testMast)){
			throw new CoolException("更改测试状态失败,查询测试档案失败");
			}
			testMast.setStatus(5);
			testMast.setModiTime(new Date());
			if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode",wrkDetl1.getMatnr()).eq("status",4))){
			throw new CoolException("更改测试状态失败");
			}
			}
			//入库标记
			packQualifiedService.insertPackQualified(true,new Date(),wrkDetls.get(0).getMatnr());
			//2.入库完成上报
			CombParam combParam = new CombParam();
			combParam.setPackNo(wrkDetls.get(0).getMatnr());
			@@ -187,7 +208,7 @@
			}

			combParam.setRequestTime(DateUtils.convert(now));
			new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
			// new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
			if (!locMastService.updateById(locMast)) {
			// exceptionHandle("全板入库 ===>> 修改库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			@@ -348,8 +369,6 @@
			locMast.setModiTime(now);
			LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));


			boolean sign =false;
			if (locMast.getLocType1().equals(sourceLoc.getLocType1())){
			locMast.setPackStatus(packStatus);

			@@ -375,52 +394,37 @@
			}else {
			throw new CoolException("待测库位无物");
			}

			}else {
			//测试库位转静置库位和NG库位
			if (locMast.getLocType1().equals((short)4)){
			locMast.setPackStatus(4); //4:NG
			// //入库标记
			// packQualifiedService.insertPackQualified(true,new Date(),locDetl.getMatnr());
			// //出库标记
			// packQualifiedService.insertPackQualified(false,new Date(),locDetl.getMatnr());
			}else {
			locMast.setPackStatus(5); //5:静置中
			// //入库标记
			// packQualifiedService.insertPackQualified(true,new Date(),locDetl.getMatnr());
			// //出库标记
			// packQualifiedService.insertPackQualified(false,new Date(),locDetl.getMatnr());
			}
			sign=true;
			TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
			.eq("loc_no",sourceLoc.getLocNo())
			.eq("barcode",locDetl.getMatnr())
			.eq("status",4)
			.in("status",3,4)
			);
			testMast.setStatus(5);
			testMast.setLocNo(locMast.getLocNo());
			testMast.setModiTime(new Date());
			if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
			.eq("loc_no",sourceLoc.getLocNo())
			.eq("barcode",locDetl.getMatnr())
			.eq("status",4))){
			if (!testMastService.updateById(testMast)){
			throw new CoolException("更改测试状态失败");
			}

			}
			if (!locMastService.updateById(locMast)) {
			// exceptionHandle("库位移转 ===>> 修改目标库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return FAIL.setMsg("库位移转 ===>> 修改目标库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
			}

			if (locMast.getCrnNo()==1 && sign){
			//5.静置库位入库完成上报
			CombParam combParam = new CombParam();
			combParam.setPackNo(locDetl.getMatnr());
			combParam.setLocNo(wrkMast.getLocNo());
			if (locMast.getPackStatus()==4){
			combParam.setPackSts(2);
			}else if (locMast.getPackStatus()==5){
			combParam.setPackSts(1);
			}else {
			combParam.setPackSts(0);
			}
			combParam.setStepSts(5);
			combParam.setRequestTime(DateUtils.convert(now));
			new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
			}
			break;
			default:
			@@ -500,6 +504,8 @@
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return FAIL.setMsg("全板出库 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
			}else{
			//出库标记
			packQualifiedService.insertPackQualified(false,new Date(),wrkDetls101.get(0).getMatnr());
			//2.出库完成上报
			CombParam combParam = new CombParam();
			combParam.setPackNo(wrkDetls101.get(0).getMatnr());
			@@ -528,7 +534,7 @@
			combParam.setStepSts(6);//静置库出库完成
			}
			combParam.setRequestTime(DateUtils.convert(now));
			new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
			// new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
			}
			}
			break;