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-09-30 14:07:05 +08:00
parent 57f0690e98 581bba9e3d
commit c4a151c7e6
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
uapbd/src/private/nc/bs/bd/pfxx/plugin/MaterialPfxxPlugin.java
View File

@ -1,18 +1,11 @@
package nc.bs.bd.pfxx.plugin;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.yonyou.cloud.utils.CollectionUtils;
import nc.bs.dao.BaseDAO;
import nc.bs.dao.DAOException;
import nc.bs.framework.common.NCLocator;
import nc.bs.logging.Logger;
import nc.bs.pfxx.ISwapContext;
import nc.itf.bd.material.baseinfo.IMaterialBaseInfoService;
import nc.jdbc.framework.processor.ColumnListProcessor;
import nc.itf.bd.material.plan.IMaterialPlanQueryService;
import nc.itf.bd.material.plan.IMaterialPlanService;
import nc.itf.bd.material.stock.IMaterialStockQueryService;
@ -31,9 +24,12 @@ import nc.vo.pfxx.util.PfxxPluginUtils;
import nc.vo.pub.BusinessException;
import nc.vo.pub.VOStatus;
import nc.vo.pub.lang.UFBoolean;
import nccloud.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/**
* 物料基本信息外部交互平台导入
*
@ -214,8 +210,7 @@ public class MaterialPfxxPlugin extends nc.bs.pfxx.plugin.AbstractPfxxPlugin {
}
private MaterialVO getUpdateVO(MaterialVO materialVO, String pk) throws BusinessException {
MaterialVO oldVO = (MaterialVO) this.getBaseDAO().retrieveByPK(MaterialVO.class, pk,
new String[] { MaterialVO.CREATOR, MaterialVO.CREATIONTIME, MaterialVO.PK_SOURCE, MaterialVO.VERSION, MaterialVO.LATEST, MaterialVO.ENABLESTATE });
MaterialVO oldVO = (MaterialVO) this.getBaseDAO().retrieveByPK(MaterialVO.class, pk);
if (oldVO == null) {
throw new BusinessException(nc.vo.ml.NCLangRes4VoTransl.getNCLangRes().getStrByID("bdpub", "0bdpub0057")
/* @res "该数据已被删除" */);
@ -232,7 +227,14 @@ public class MaterialPfxxPlugin extends nc.bs.pfxx.plugin.AbstractPfxxPlugin {
materialVO.setMaterialconvert(this.getMaterialConvertVOs(materialVO));
materialVO.setMaterialtaxtype(this.getMaterialTaxTypeVOs(materialVO));
materialVO.setIsfeature(UFBoolean.FALSE);
// 泰开专项，修改时，不清空自定义项的值
for (int i = 1; i <= 50; i++) {
String defKey = "def" + i;
//如果没传自定义项，拿原来的自定义项的值
if (materialVO.getAttributeValue(defKey) == null) {
materialVO.setAttributeValue(defKey,oldVO.getAttributeValue(defKey));;
}
}
return materialVO;
}

2
uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
View File

@ -114,11 +114,13 @@ public class MaterialToGyMesListener implements IBusinessListener {
singleObj.put("mainWarehouse", stockMap.get("pk_stordoc")); // 主仓库
singleObj.put("reservation", stockMap.get("remain")); // 预留
singleObj.put("virtualItem", isvirtual.toString()); // 虚项
if (prodMap != null && !prodMap.isEmpty()) {
singleObj.put("productionDepartment", prodMap.get("deptCode")); // 生产部门编码
singleObj.put("matchingComponents", prodMap.get("iscreatesonprodorder")); // 配套子件
singleObj.put("issuance", prodMap.get("issend")); // 发料
singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式
singleObj.put("postCompletionProcessing", prodMap.get("wghxcl")); // 完工后续处理
}
singleObj.put("bipCreateBy", creatorName); // 创建人
dataArr.add(singleObj);
/**

2
uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
View File

@ -149,11 +149,13 @@ public class MaterialToGyMesListener implements IBusinessListener {
singleObj.put("mainWarehouse", stockMap.get("pk_stordoc")); // 主仓库
singleObj.put("reservation", stockMap.get("remain")); // 预留
singleObj.put("virtualItem", isvirtual.toString()); // 虚项
if (prodMap != null && !prodMap.isEmpty()) {
singleObj.put("productionDepartment", prodMap.get("deptCode")); // 生产部门编码
singleObj.put("matchingComponents", prodMap.get("iscreatesonprodorder")); // 配套子件
singleObj.put("issuance", prodMap.get("issend")); // 发料
singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式
singleObj.put("postCompletionProcessing", prodMap.get("wghxcl")); // 完工后续处理
}
singleObj.put("bipCreateBy", creatorName); // 创建人
dataArr.add(singleObj);
/**