zy-asrs.git - Gitblit

			@@ -38,11 +38,11 @@
			private WaitPakinService waitPakinService;

			public ReturnT<String> start(WrkMast wrkMast) {
			// 4.入库完成
			if (wrkMast.getWrkSts() == 4) {
			// 9.入库完成
			if (wrkMast.getWrkSts() == 9) {
			return doIn(wrkMast);
			// 14.出库完成
			} else if (wrkMast.getWrkSts() == 14) {
			// 17.出库完成
			} else if (wrkMast.getWrkSts() == 17) {
			return doOut(wrkMast);
			}
			return SUCCESS;
			@@ -86,7 +86,7 @@
			}
			// 遍历工作明细，更新库存明细和入库通知档
			for (WrkDetl wrkDetl : wrkDetls) {

			wrkDetl.setBatch("");
			LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
			if (null != locDetl) {
			if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
			@@ -127,8 +127,10 @@
			if (locMast.getLocSts().equals("S")) {
			locMast.setLocSts("F");
			locMast.setBarcode(wrkMast.getBarcode());
			locMast.setFrozen(wrkMast.getFrozen());
			locMast.setIoTime(now);
			locMast.setModiTime(now);
			locMast.setFrozenMemo(wrkMast.getMemo());
			if (!locMastService.updateById(locMast)) {
			exceptionHandle("全板入库 ===>> 修改库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
			}
			@@ -145,7 +147,7 @@

			LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
			if (null != locDetl) {
			if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
			if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getManu(),wrkDetl.getMemo())) {
			exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
			}
			}
			@@ -207,6 +209,24 @@
			if (wrkDetls57.isEmpty()) {
			exceptionHandle("盘点入库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
			}
			if(!Cools.isEmpty(locDetlService.selectByLocNo(wrkMast.getLocNo()))){
			locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
			}
			if (Cools.isEmpty(locDetlService.selectByLocNo(wrkMast.getLocNo()))){
			for (WrkDetl wrkDetl:wrkDetls57){
			LocDetl locDetl = new LocDetl();
			locDetl.sync(wrkDetl);
			locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
			locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
			locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
			locDetl.setModiTime(now);
			locDetl.setAppeTime(now);
			if (!locDetlService.insert(locDetl)) {
			exceptionHandle("盘点入库 ===>> 新增库存明细失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
			}
			}
			}

			// 修改库位状态 Q ====>> F
			if (locMast.getLocSts().equals("Q")) {
			locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
			@@ -218,8 +238,8 @@
			}
			}
			break;
			// 库位移转
			case 11:
			case 11:// 库位移转
			case 111:// 库位移转(高频区域)
			// 默认目标库位是空板
			String locSts = "D";
			// 库位移转判断是否为空板移转
			@@ -254,7 +274,7 @@
			break;
			}
			// 修改工作主档状态
			wrkMast.setWrkSts(5L);
			wrkMast.setWrkSts(10L);
			wrkMast.setModiTime(now);
			if (!wrkMastService.updateById(wrkMast)) {
			exceptionHandle("更新入库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
			@@ -277,12 +297,42 @@
			}
			assert locMast != null;
			switch (wrkMast.getIoType()) {
			case 11://移库再回原库位
			String locSts = "R";
			// 库位移转判断是否为空板移转
			if (wrkMast.getEmptyMk().equals("N")) {
			// 转移库存明细数据: 库存号由工作档源库位变为目标库位
			if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
			exceptionHandle("库位移转 ===>> 转移库存明细数据失败；[源库位={0}],[目标库位={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
			}
			}
			// 修改源库位状态 ==> O
			LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
			if (null != sourceLoc && !sourceLoc.getLocSts().equals("O")) {
			sourceLoc.setBarcode("");
			sourceLoc.setLocSts("O");
			sourceLoc.setModiTime(now);
			sourceLoc.setIoTime(now);
			if (!locMastService.updateById(sourceLoc)) {
			exceptionHandle("库位移转 ===>> 修改源库位状态失败；[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
			}

			// 修改目标库位状态 ==> .locSts
			locMast.setLocSts(locSts);
			locMast.setBarcode(wrkMast.getBarcode());
			locMast.setIoTime(now);
			locMast.setModiTime(now);
			if (!locMastService.updateById(locMast)) {
			exceptionHandle("库位移转 ===>> 修改目标库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
			}
			}
			break;
			// 全板出库
			case 101:
			// 出库确认信号位
			if (Cools.isEmpty(wrkMast.getInvWh()) \|\| wrkMast.getInvWh().equals("N")) {
			return SUCCESS;
			}
			// if (Cools.isEmpty(wrkMast.getInvWh()) \|\| wrkMast.getInvWh().equals("N")) {
			// return SUCCESS;
			// }
			// 根据工作号，查询工作明细档
			List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
			if (wrkDetls101.isEmpty()) {
			@@ -299,8 +349,10 @@
			if (locMast.getLocSts().equals("R")) {
			locMast.setLocSts("O");
			locMast.setBarcode("");
			locMast.setFrozen(0);
			locMast.setModiTime(now);
			locMast.setIoTime(now);
			locMast.setFrozenMemo("");
			if (!locMastService.updateById(locMast)) {
			exceptionHandle("全板出库 ===>> 修改源库位状态失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
			}
			@@ -322,11 +374,13 @@
			default:
			break;
			}
			// 修改工作主档状态
			wrkMast.setWrkSts(15L);
			wrkMast.setModiTime(now);
			if (!wrkMastService.updateById(wrkMast)) {
			exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
			if(wrkMast.getIoType()!=11) {
			// 修改工作主档状态
			wrkMast.setWrkSts(18L);
			wrkMast.setModiTime(now);
			if (!wrkMastService.updateById(wrkMast)) {
			exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
			}
			}
			} catch (Exception e) {
			log.error("fail", e);