diff --git a/uapbd/src/private/nc/bs/uapbd/task/ims/ErpIaI2billFromGyImsPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/ims/ErpIaI2billFromGyImsPlugin.java index e5d1a1c8..01b9f76d 100644 --- a/uapbd/src/private/nc/bs/uapbd/task/ims/ErpIaI2billFromGyImsPlugin.java +++ b/uapbd/src/private/nc/bs/uapbd/task/ims/ErpIaI2billFromGyImsPlugin.java @@ -87,9 +87,13 @@ public class ErpIaI2billFromGyImsPlugin implements IBackgroundWorkPlugin { headJson.put("cpayfinorgoid", "C003");// 应付财务组织 headJson.put("creator", "BIP"); headJson.put("billmaker", "BIP"); + if (map.get("dbilldate") != null && map.get("dbilldate") instanceof Timestamp dbilldate) { + String dbilldateStr = DATETIME_FORMATTER.format(dbilldate); + headJson.put("dbilldate", dbilldateStr); // 单据日期 + } if (map.get("dmakedate") != null && map.get("dmakedate") instanceof Timestamp dmakedate1) { String dmakedateStr = DATETIME_FORMATTER.format(dmakedate1); - headJson.put("dmakedate", dmakedateStr); // 单据日期 + headJson.put("dmakedate", dmakedateStr); // 制单日期 } if (map.get("creationtime") != null && map.get("creationtime") instanceof Timestamp creationtime1) { String creationtimeStr = DATETIME_FORMATTER.format(creationtime1); @@ -106,12 +110,27 @@ public class ErpIaI2billFromGyImsPlugin implements IBackgroundWorkPlugin { bodyJson.put("nnum", body.get("nnum"));// 实收主数量 bodyJson.put("nassistnum", body.get("nassistnum"));// 实收数量 bodyJson.put("vchangerate", "1/1");// 换算率 - // bodyJson.put("nqtprice", body.get("nqtprice"));// - // bodyJson.put("nqttaxprice", body.get("nqttaxprice"));// - // bodyJson.put("norigtaxmny", body.get("norigtaxmny"));// - // bodyJson.put("ntaxmny", body.get("ntaxmny"));// - // bodyJson.put("nmny", body.get("nmny"));// - // bodyJson.put("ntax", body.get("ntax"));// + + Object nqtorigprice = body.get("nqtorigprice");// 无税单价 + Object nqtorigtaxprice = body.get("nqtorigtaxprice");// 含税单价 + bodyJson.put("nqtorignetprice", nqtorigprice);// 无税净价 + bodyJson.put("nqtorigtaxnetprice", nqtorigtaxprice);// 含税净价 + bodyJson.put("nqtnetprice", nqtorigprice);// 本币无税净价 + bodyJson.put("nqttaxnetprice", nqtorigtaxprice);// 本币含税净价 + bodyJson.put("norigprice", nqtorigprice);// 主无税单价 + bodyJson.put("norigtaxprice", nqtorigtaxprice);// 主含税单价 + bodyJson.put("nprice", nqtorigprice);// 主本币无税单价 + bodyJson.put("ntaxprice", nqtorigtaxprice);// 主本币含税单价 + bodyJson.put("nqtorigprice", nqtorigprice);// 无税单价 + bodyJson.put("nqtorigtaxprice", nqtorigtaxprice);// 含税单价 + bodyJson.put("nqtprice", nqtorigprice);// 本币无税单价 + bodyJson.put("nqttaxprice", nqtorigtaxprice);// 本币含税单价 + + bodyJson.put("norigmny", body.get("norigmny"));// 无税金额 + bodyJson.put("norigtaxmny", body.get("norigtaxmny"));// 价税合计 + bodyJson.put("nmny", body.get("norigmny"));// 本币无税金额 + bodyJson.put("ntaxmny", body.get("norigtaxmny"));// 本币价税合计 + bodyJson.put("ntaxrate", body.get("ntaxrate"));// 税率 bodyJson.put("vnotebody", body.get("vnotebody"));// 行备注 bodyJsonArr.add(bodyJson); diff --git a/uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java index ed53a191..4e6cfc9e 100644 --- a/uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java +++ b/uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java @@ -116,6 +116,11 @@ public class MaterialOutGyImsPlugin implements IBackgroundWorkPlugin { whereStorSql); // NCCForUAPLogger.debug("cwarehouseid = " + cwarehouseid); hvo.setCwarehouseid(warehousePk); + if (mainMap.get("dbilldate") != null && mainMap.get("dbilldate") instanceof Timestamp dbilldate) { + String dbilldateStr = DATETIME_FORMATTER.format(dbilldate); + UFDate dbilldate1 = new UFDate(dbilldateStr); + hvo.setDbilldate(dbilldate1); + } if (mainMap.get("dmakedate") != null && mainMap.get("dmakedate") instanceof Timestamp dmakedate1) { String dmakedateStr = DATE_FORMATTER.format(dmakedate1); UFDate dmakedate = new UFDate(dmakedateStr); 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 2f1f7ecf..88124174 100644 --- a/uapbd/src/private/nc/bs/uapbd/task/ims/ProductReportGyImsPlugin.java +++ b/uapbd/src/private/nc/bs/uapbd/task/ims/ProductReportGyImsPlugin.java @@ -114,6 +114,11 @@ public class ProductReportGyImsPlugin implements IBackgroundWorkPlugin { UFDateTime creationtime = new UFDateTime(creationtimeStr); hvo.setCreationtime(creationtime); } + if (mainMap.get("dbilldate") != null && mainMap.get("dbilldate") instanceof Timestamp dbilldate) { + String dbilldateStr = DATETIME_FORMATTER.format(dbilldate); + UFDate dbilldate1 = new UFDate(dbilldateStr); + hvo.setDbilldate(dbilldate1); + } for (WrItemVO bvo : bvos) { bvo.setFbproducttype(1);// 产品类型 1.主产品 bvo.setTbstarttime(new UFDateTime(dmakedateStr + " 00:00:00"));// 开始时间