fix:
1.配件发货明细表(已发货) 2.单一窗口报关单对比
This commit is contained in:
parent
1f852a0931
commit
b933551b42
@ -116,9 +116,11 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin {
|
|||||||
int i = 0;
|
int i = 0;
|
||||||
for (DynamicObject dynamicObject : yem_bd_producttype) {
|
for (DynamicObject dynamicObject : yem_bd_producttype) {
|
||||||
String name = dynamicObject.getString("name");
|
String name = dynamicObject.getString("name");
|
||||||
if (i == 0) {
|
if (yem_bd_producttype.size() - 1 == 0) {
|
||||||
sb.append(" (AND yem_fittingtype = ").append("'" + name + "'");
|
sb.append(" AND yem_fittingtype = ").append("'" + name + "'");
|
||||||
} else if (i == yem_bd_producttype.size()) {
|
} 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 + "')");
|
sb.append(" OR yem_fittingtype = ").append("'" + name + "')");
|
||||||
} else {
|
} else {
|
||||||
sb.append(" OR yem_fittingtype = ").append("'" + name + "'");
|
sb.append(" OR yem_fittingtype = ").append("'" + name + "'");
|
||||||
|
@ -179,9 +179,9 @@ public class CusdecToDeclaredocxTask extends AbstractTask {
|
|||||||
, BigDecimalUtils.div((user.getBigDecimal("yem_feerate").multiply(declaredocx.getBigDecimal("yem_reightamtrate")))
|
, BigDecimalUtils.div((user.getBigDecimal("yem_feerate").multiply(declaredocx.getBigDecimal("yem_reightamtrate")))
|
||||||
,declaredocx.getBigDecimal("yem_exrate"),2));
|
,declaredocx.getBigDecimal("yem_exrate"),2));
|
||||||
|
|
||||||
BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_currencybase")
|
BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_exratetable")
|
||||||
, declaredocx.getDynamicObject("yem_exratetable")
|
|
||||||
, declaredocx.getDynamicObject("yem_usdcurrency")
|
, declaredocx.getDynamicObject("yem_usdcurrency")
|
||||||
|
, declaredocx.getDynamicObject("yem_currencybase")
|
||||||
, yemFiedatets);
|
, yemFiedatets);
|
||||||
declaredocx.set("yem_usbexrate", exchangeRate);
|
declaredocx.set("yem_usbexrate", exchangeRate);
|
||||||
declaredocx.set("yem_despportcodebase",user.getDynamicObject("yem_despportcodebase") );
|
declaredocx.set("yem_despportcodebase",user.getDynamicObject("yem_despportcodebase") );
|
||||||
|
Loading…
Reference in New Issue
Block a user