diff --git a/uapbd/src/private/nc/bs/uapbd/task/ims/ProductReportGyImsPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/ims/ProductReportGyImsPlugin.java index 03894cc8..e0bf0281 100644 --- a/uapbd/src/private/nc/bs/uapbd/task/ims/ProductReportGyImsPlugin.java +++ b/uapbd/src/private/nc/bs/uapbd/task/ims/ProductReportGyImsPlugin.java @@ -9,6 +9,7 @@ import nc.bs.pub.taskcenter.BgWorkingContext; import nc.bs.pub.taskcenter.IBackgroundWorkPlugin; import nc.bs.uapbd.util.GyImsDbUtil; import nc.bs.uapbd.util.MyHelper; +import nc.bs.uif2.VersionConflictException; import nc.itf.mmpac.pmo.pac0002.IPMOQueryService; import nc.itf.mmpac.wr.IWrMaintainService; import nc.itf.uap.pf.busiflow.PfButtonClickContext; @@ -121,7 +122,7 @@ public class ProductReportGyImsPlugin implements IBackgroundWorkPlugin { hvo.setTaudittime(taudittime1); } String ctrantypeid = getValueByCondtion("bd_billtype", " pk_billtypeid ", " istransaction = 'Y' and nvl ( islock, 'N' ) = 'N' and parentbilltype = '55A4' and pk_group = '" - + InvocationInfoProxy.getInstance().getGroupId() + "' and pk_billtypecode = '" + mainMap.get("vtrantypeid") + "' "); + + InvocationInfoProxy.getInstance().getGroupId() + "' and pk_billtypecode = '" + mainMap.get("vtrantypeid") + "' "); hvo.setVtrantypeid(ctrantypeid); // hvo.setVtrantypeid("1001A11000000ZW5C3YG"); hvo.setVtrantypecode(mainMap.get("vtrantypeid") + ""); @@ -177,6 +178,9 @@ public class ProductReportGyImsPlugin implements IBackgroundWorkPlugin { logger.error("ProductReportGyImsPlugin Error: " + e.getMessage(), e); String updateSql = "update BIPReportMainTab set err_msg = ? where pk_wr = ?"; String message = e.getMessage(); + if (e instanceof VersionConflictException e1) { + message = e1.getBusiObject() + ""; + } if (MMValueCheck.isNotEmpty(message) && message.length() > 4000) { message = message.substring(0, 4000); } @@ -187,6 +191,7 @@ public class ProductReportGyImsPlugin implements IBackgroundWorkPlugin { logger.error("---end----高压IMS-生产报告-任务结束运行--"); return null; } + private String getValueByCondtion(String tablename, String fieldname, String contion) throws BusinessException { BaseDAO dao = new BaseDAO(); String result = ""; @@ -197,6 +202,7 @@ public class ProductReportGyImsPlugin implements IBackgroundWorkPlugin { result = (String) dao.executeQuery(sb.toString(), new ColumnProcessor()); return result; } + /** * 填充生产报告的质量信息 */