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-10-16 16:45:51 +08:00
parent 2e84e033d1 ca4861e67a
commit 717c315157
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ import nc.pubitf.ic.m4d.api.IMaterialOutMaintainAPI;
import nc.util.mmf.busi.service.PFPubService; import nc.util.mmf.busi.service.PFPubService;
import nc.util.mmf.framework.base.MMValueCheck; import nc.util.mmf.framework.base.MMValueCheck;
import nc.vo.bd.material.MaterialVO; import nc.vo.bd.material.MaterialVO;
import nc.vo.bd.stordoc.StordocVO;
import nc.vo.fi.pub.SqlUtils; import nc.vo.fi.pub.SqlUtils;
import nc.vo.ic.m4d.entity.MaterialOutBodyVO; import nc.vo.ic.m4d.entity.MaterialOutBodyVO;
import nc.vo.ic.m4d.entity.MaterialOutHeadVO; import nc.vo.ic.m4d.entity.MaterialOutHeadVO;
@ -70,11 +71,13 @@ public class MaterialOutGyImsPlugin implements IBackgroundWorkPlugin {
try { try {
IPickmQueryService queryService = NCLocator.getInstance().lookup(IPickmQueryService.class); IPickmQueryService queryService = NCLocator.getInstance().lookup(IPickmQueryService.class);
// IMS 同步状态：BIP:C-创建;U-修改D-删除 IMS:2-MES单据接收完成 // IMS 同步状态：BIP:C-创建;U-修改D-删除 IMS:2-MES单据接收完成
String selSql = "select * from BIPOutMainTab where status != '2'"; String selSql = "select * from BIPOutMainTab where status = 'C'";
List<Map<String, Object>> mainList = (List<Map<String, Object>>) getImsDao().executeQuery(selSql, new MapListProcessor()); List<Map<String, Object>> mainList = (List<Map<String, Object>>) getImsDao().executeQuery(selSql, new MapListProcessor());
Set<String> imsIdSet = new HashSet<>(); Set<String> imsIdSet = new HashSet<>();
for (Map<String, Object> mainMap : mainList) { for (Map<String, Object> mainMap : mainList) {
String cgeneralhid = mainMap.get("cgeneralhid") + ""; String cgeneralhid = mainMap.get("cgeneralhid") + "";
// 同步状态：IMS:C-创建;U-修改; 4-BIP审核出库MES接收确认 BIP:2-BIP审核出库
String status = mainMap.get("status") + "";
try { try {
String pkSql = "select * from BIPOutDetailTab where cgeneralhid = '" + cgeneralhid + "'"; String pkSql = "select * from BIPOutDetailTab where cgeneralhid = '" + cgeneralhid + "'";
List<Map<String, Object>> detailList = (List<Map<String, Object>>) getImsDao().executeQuery(pkSql, new MapListProcessor()); List<Map<String, Object>> detailList = (List<Map<String, Object>>) getImsDao().executeQuery(pkSql, new MapListProcessor());
@ -104,6 +107,16 @@ public class MaterialOutGyImsPlugin implements IBackgroundWorkPlugin {
hvo.setCreator("BIP"); hvo.setCreator("BIP");
hvo.setBillmaker("BIP"); hvo.setBillmaker("BIP");
hvo.setVtrantypecode("4D-01"); hvo.setVtrantypecode("4D-01");
if (MMValueCheck.isEmpty(mainMap.get("cwarehouseid"))) {
continue;
}
// 仓库编码
String cwarehouseid = mainMap.get("cwarehouseid") + "";
String whereStorSql = StordocVO.CODE + " = '" + cwarehouseid + "'" + " and pk_org = '" + hvo.getPk_org() + "'";
String warehousePk = MyHelper.getStrValByCondition(StordocVO.getDefaultTableName(), StordocVO.PK_STORDOC,
whereStorSql);
// NCCForUAPLogger.debug("cwarehouseid = " + cwarehouseid);
hvo.setCwarehouseid(warehousePk);
if (mainMap.get("dmakedate") != null && mainMap.get("dmakedate") instanceof Timestamp dmakedate1) { if (mainMap.get("dmakedate") != null && mainMap.get("dmakedate") instanceof Timestamp dmakedate1) {
String dmakedateStr = DATE_FORMATTER.format(dmakedate1); String dmakedateStr = DATE_FORMATTER.format(dmakedate1);
UFDate dmakedate = new UFDate(dmakedateStr); UFDate dmakedate = new UFDate(dmakedateStr);
@ -140,6 +153,7 @@ public class MaterialOutGyImsPlugin implements IBackgroundWorkPlugin {
if (MMValueCheck.isEmpty(resultvos)) { if (MMValueCheck.isEmpty(resultvos)) {
continue; continue;
} }
// NCCForUAPLogger.debug("code = " + resultvos[0].getHead().getVbillcode());
imsIdSet.add(cgeneralhid); imsIdSet.add(cgeneralhid);
} catch (BusinessException e) { } catch (BusinessException e) {
Logger.error("MaterialOutGyImsPlugin Error: ", e); Logger.error("MaterialOutGyImsPlugin Error: ", e);