violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：

Browse Source 
1.配件发货明细表（已发货）
2.单一窗口报关单对比
This commit is contained in:
25655 2025-02-10 09:41:02 +08:00
parent 1f852a0931
commit b933551b42
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
View File

@ -116,11 +116,13 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin {
int i = 0;
for (DynamicObject dynamicObject : yem_bd_producttype) {
String name = dynamicObject.getString("name");
if (i == 0) {
sb.append(" (AND yem_fittingtype = ").append("'" + name + "'");
} else if (i == yem_bd_producttype.size()) {
if (yem_bd_producttype.size() - 1 == 0) {
sb.append(" AND yem_fittingtype = ").append("'" + name + "'");
} else if (i == 0) {
sb.append(" AND( yem_fittingtype = ").append("'" + name + "'");
} else if (i == yem_bd_producttype.size() - 1) {
sb.append(" OR yem_fittingtype = ").append("'" + name + "')");
}else {
} else {
sb.append(" OR yem_fittingtype = ").append("'" + name + "'");
}
// names.add(name);

4
src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
View File

@ -179,9 +179,9 @@ public class CusdecToDeclaredocxTask extends AbstractTask {
, BigDecimalUtils.div((user.getBigDecimal("yem_feerate").multiply(declaredocx.getBigDecimal("yem_reightamtrate")))
,declaredocx.getBigDecimal("yem_exrate"),2));
BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_currencybase")
, declaredocx.getDynamicObject("yem_exratetable")
BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_exratetable")
, declaredocx.getDynamicObject("yem_usdcurrency")
, declaredocx.getDynamicObject("yem_currencybase")
, yemFiedatets);
declaredocx.set("yem_usbexrate", exchangeRate);
declaredocx.set("yem_despportcodebase",user.getDynamicObject("yem_despportcodebase") );