zy-asrs.git - Gitblit

			@@ -118,7 +118,7 @@
			// 出库 --------------------------------------------------------------------------------
			} else if (wrkMast.getWrkSts() == 15) {
			if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && !Objects.isNull(wrkMast.getExitMk())){
			List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
			List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
			WrkDetl wrkDetl = wrkDetls1.get(0);
			JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
			if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {

			@@ -450,17 +450,18 @@
			// }
			movLoc(wrkMast);
			break;
			case 2:WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode",wrkMast.getBarcode()).eq("io_type",101));
			if(Objects.isNull(wrkMast1.getIsSuplus())){
			break;
			}
			if(!Cools.isEmpty(wrkMast1)) {
			wrkMast1.setOveMk("Y");
			}
			if(!wrkMastService.updateById(wrkMast1)) {
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return FAIL.setMsg("更新退库跨区域完成状态失败; [workNo=" + wrkMast1.getWrkNo());
			}break;
			case 2:
			WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode",wrkMast.getBarcode()).eq("io_type",101));
			if(Objects.isNull(wrkMast1.getIsSuplus())){
			break;
			}
			if(!Cools.isEmpty(wrkMast1)) {
			wrkMast1.setOveMk("Y");
			}
			if(!wrkMastService.updateById(wrkMast1)) {
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return FAIL.setMsg("更新退库跨区域完成状态失败; [workNo=" + wrkMast1.getWrkNo());
			}break;
			default:
			break;
			}

	src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史