Merge remote-tracking branch 'origin/main'

This commit is contained in:
mzr 2025-10-02 16:36:25 +08:00
commit 9c187a1200
1 changed files with 22 additions and 6 deletions

View File

@ -2,10 +2,12 @@ package nc.bs.uapbd.bip.workplugin;
import nc.bs.dao.BaseDAO;
import nc.bs.framework.common.InvocationInfoProxy;
import nc.bs.ic.m45.insert.InsertBP;
import nc.bs.pub.pa.PreAlertObject;
import nc.bs.pub.taskcenter.BgWorkingContext;
import nc.bs.pub.taskcenter.IBackgroundWorkPlugin;
import nc.bs.trade.business.HYPubBO;
import nc.jdbc.framework.processor.ColumnProcessor;
import nc.jdbc.framework.processor.MapListProcessor;
import nc.pubimpl.ic.api.maintain.BillMaintainTool;
import nc.vo.ia.mi2.entity.I2BillVO;
@ -16,7 +18,9 @@ import nc.vo.ic.m45.entity.PurchaseInVO;
import nc.vo.pub.BusinessException;
import nc.vo.pub.lang.UFDate;
import nc.vo.pub.lang.UFDouble;
import nc.vo.pubapp.pattern.exception.ExceptionUtils;
import nc.vo.scmpub.res.billtype.ICBillType;
import org.eclipse.swt.internal.C;
import java.util.ArrayList;
import java.util.List;
@ -72,7 +76,7 @@ public class ErpIaI2billFromGyImsPlugin implements IBackgroundWorkPlugin {
head.setDbilldate(new UFDate(String.valueOf(map.get("dbilldate"))) ); // ÈÕÆÚÀàÐÍ
map.put("vtrantypecode","45-Cxx-C102");
map.put("vtrantypecode","45-Cxx-CI02");
head.setVtrantypecode((String) map.get("vtrantypecode"));
Object ctrantypeid = hy.findColValue("bd_billtype", "pk_billtypeid", " pk_billtypecode = '"+map.get("vtrantypecode")+"' and dr='0' ");
@ -347,8 +351,12 @@ public class ErpIaI2billFromGyImsPlugin implements IBackgroundWorkPlugin {
if (ctaxcodeid != null) {
bodyVO.setCtaxcodeid((String) ctaxcodeid);
}
Object ntaxrateVal = hy1.findColValue("bd_taxrate", "taxrate",
" pk_taxcode = '" + ctaxcodeid+ "' and dr=0 ");
String sql1 ="select taxrate from bd_taxrate where pk_taxcode = '1002Z01000000001CNE2' and dr=0 ";
Object ntaxrateVal =new BaseDAO().executeQuery(sql1, new ColumnProcessor());
// Object ntaxrateVal = hy1.findColValue("bd_taxrate", "taxrate",
// " pk_taxcode = '" + ctaxcodeid+ "' and dr=0 ");
if (ntaxrateVal != null) {
bodyVO.setNtaxrate(new UFDouble(String.valueOf(ntaxrateVal)));
}
@ -382,9 +390,17 @@ public class ErpIaI2billFromGyImsPlugin implements IBackgroundWorkPlugin {
// Ìí¼Óµ½¼¯ºÏ
list.add(vo);
}
BillMaintainTool<PurchaseInVO> tool = new BillMaintainTool<PurchaseInVO>(
PurchaseInVO.class, ICBillType.PurchaseIn.getCode());
tool.insert(list.toArray(new PurchaseInVO[list.size()]));
try{
// InsertBP insertBP=new InsertBP();
// insertBP.insert(list.toArray(new PurchaseInVO[list.size()]));
BillMaintainTool<PurchaseInVO> tool = new BillMaintainTool<PurchaseInVO>(
PurchaseInVO.class, ICBillType.PurchaseIn.getCode());
tool.insert(list.toArray(new PurchaseInVO[list.size()]));
} catch (Exception e) {
throw new BusinessException("ͬ²½Ê§°Ü£º" + e.getMessage(), e);
}
}