yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-11-20 18:27:11 +08:00
parent 4eda16f13f da7e4a19fb
commit 7798eef23a
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
uapbd/src/private/nc/bs/uapbd/task/ims/ErpIaI2billFromGyImsPlugin.java
View File

@ -9,6 +9,7 @@ import nc.bs.pub.pa.PreAlertObject;
import nc.bs.pub.taskcenter.BgWorkingContext;
import nc.bs.pub.taskcenter.IBackgroundWorkPlugin;
import nc.bs.uapbd.util.MyHelper;
import nc.jdbc.framework.SQLParameter;
import nc.jdbc.framework.processor.MapListProcessor;
import nc.jdbc.framework.processor.MapProcessor;
import nc.vo.ic.m45.entity.PurchaseInVO;
@ -162,10 +163,11 @@ public class ErpIaI2billFromGyImsPlugin implements IBackgroundWorkPlugin {
getImsDao().executeUpdate(updateSql);
} catch (BusinessException e) {
logger.error("ErpIaI2billFromGyImsPlugin Error: " + e.getMessage(), e);
String updateSql = "update BIPInputMainTab set err_msg = '[err_msg]' where cgeneralhid = '[cgeneralhid]'";
updateSql = updateSql.replace("[err_msg]", e.getMessage());
updateSql = updateSql.replace("[cgeneralhid]", cgeneralhid);
int rows = getImsDao().executeUpdate(updateSql);
String updateSql = "update BIPInputMainTab set err_msg = ? where cgeneralhid = ?";
SQLParameter parameter = new SQLParameter();
parameter.addParam(e.getMessage());
parameter.addParam(cgeneralhid);
int rows = getImsDao().executeUpdate(updateSql, parameter);
}
}
return null;

19
uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java
View File

@ -9,6 +9,7 @@ import nc.bs.pub.taskcenter.IBackgroundWorkPlugin;
import nc.bs.uapbd.util.MyHelper;
import nc.itf.mmpac.pickm.IPickmQueryService;
import nc.itf.uap.pf.busiflow.PfButtonClickContext;
import nc.jdbc.framework.SQLParameter;
import nc.jdbc.framework.processor.ColumnProcessor;
import nc.jdbc.framework.processor.MapListProcessor;
import nc.pubitf.ic.m4d.api.IMaterialOutMaintainAPI;
@ -29,7 +30,9 @@ import nc.vo.scmpub.res.billtype.MMBillType;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 定时同步高压加工车间IMS的材料出库
@ -98,8 +101,8 @@ public class MaterialOutGyImsPlugin implements IBackgroundWorkPlugin {
MaterialOutHeadVO hvo = vo.getHead();
MaterialOutBodyVO[] bodys = vo.getBodys();
hvo.setVbillcode(mainMap.get("vbillcode") + "");
hvo.setCreator(MyHelper.getUserId((String) mainMap.get("creator")) );
hvo.setBillmaker(MyHelper.getUserId((String) mainMap.get("billmaker")) );
hvo.setCreator(MyHelper.getUserId((String) mainMap.get("creator")));
hvo.setBillmaker(MyHelper.getUserId((String) mainMap.get("billmaker")));
hvo.setVtrantypecode("4D-01");
if (MMValueCheck.isEmpty(mainMap.get("cwarehouseid"))) {
continue;
@ -166,11 +169,11 @@ public class MaterialOutGyImsPlugin implements IBackgroundWorkPlugin {
getImsDao().executeUpdate(updateSql);
} catch (BusinessException e) {
logger.error("MaterialOutGyImsPlugin Error: ", e);
String updateSql = "update BIPOutMainTab set err_msg = '[err_msg]' where cgeneralhid = '[cgeneralhid]'";
updateSql = updateSql.replace("[err_msg]", e.getMessage());
updateSql = updateSql.replace("[cgeneralhid]", cgeneralhid);
// NCCForUAPLogger.debug("updateSql-fail = " + updateSql);
getImsDao().executeUpdate(updateSql);
String updateSql = "update BIPOutMainTab set err_msg = ? where cgeneralhid = ?";
SQLParameter parameter = new SQLParameter();
parameter.addParam(e.getMessage());
parameter.addParam(cgeneralhid);
int rows = getImsDao().executeUpdate(updateSql, parameter);
}
}
logger.error("---end----高压IMS-材料出库-任务结束运行--");

10
uapbd/src/private/nc/bs/uapbd/task/ims/ProductReportGyImsPlugin.java
View File

@ -10,6 +10,7 @@ import nc.bs.uapbd.util.MyHelper;
import nc.itf.mmpac.pmo.pac0002.IPMOQueryService;
import nc.itf.mmpac.wr.IWrMaintainService;
import nc.itf.uap.pf.busiflow.PfButtonClickContext;
import nc.jdbc.framework.SQLParameter;
import nc.jdbc.framework.processor.ColumnProcessor;
import nc.jdbc.framework.processor.MapListProcessor;
import nc.util.mmf.busi.service.PFPubService;
@ -170,10 +171,11 @@ public class ProductReportGyImsPlugin implements IBackgroundWorkPlugin {
getImsDao().executeUpdate(updateSql);
} catch (BusinessException e) {
logger.error("ProductReportGyImsPlugin Error: " + e.getMessage(), e);
String updateSql = "update BIPReportMainTab set err_msg = '[err_msg]' where pk_wr = '[pkWr]'";
updateSql = updateSql.replace("[err_msg]", e.getMessage());
updateSql = updateSql.replace("[pkWr]", pkWr);
getImsDao().executeUpdate(updateSql);
String updateSql = "update BIPReportMainTab set err_msg = ? where pk_wr = ?";
SQLParameter parameter = new SQLParameter();
parameter.addParam(e.getMessage());
parameter.addParam(pkWr);
int rows = getImsDao().executeUpdate(updateSql, parameter);
}
}
logger.error("---end----高压IMS-生产报告-任务结束运行--");