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-01-25 12:47:48 +08:00
parent e0e0835f4c
commit 396c9fdb2a
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,15 +112,24 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin {
sb.append(" AND yem_shipdate <= '").append("%").append(yem_shipdatesdis).append("%").append("'"); sb.append(" AND yem_shipdate <= '").append("%").append(yem_shipdatesdis).append("%").append("'");
} }
if (YEM.isNotEmpty(yem_bd_producttype)) { if (YEM.isNotEmpty(yem_bd_producttype)) {
List<String> names = new ArrayList<>(); // List<String> names = new ArrayList<>();
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");
names.add(name); if (i == 0) {
// sb.append(" AND yem_bd_products = ").append("'" +name + "'"); sb.append(" (AND yem_fittingtype = ").append("'" + name + "'");
} else if (i == yem_bd_producttype.size()) {
sb.append(" OR yem_fittingtype = ").append("'" + name + "')");
}else {
sb.append(" OR yem_fittingtype = ").append("'" + name + "'");
} }
Map<String, Object> map = new HashMap<>(); // names.add(name);
map.put("var", names);
result = result.filter("yem_bd_products in var", map); i++;
}
// Map<String, Object> map = new HashMap<>();
// map.put("var", names);
// result = result.filter("yem_fittingtype in var", map);
} }
DataSet where = result.where(sb.toString()); DataSet where = result.where(sb.toString());

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

@ -179,8 +179,8 @@ 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_exratetable") BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_currencybase")
, declaredocx.getDynamicObject("yem_currencybase") , declaredocx.getDynamicObject("yem_exratetable")
, declaredocx.getDynamicObject("yem_usdcurrency") , declaredocx.getDynamicObject("yem_usdcurrency")
, yemFiedatets); , yemFiedatets);
declaredocx.set("yem_usbexrate", exchangeRate); declaredocx.set("yem_usbexrate", exchangeRate);

4
src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java
View File

@ -35,6 +35,10 @@ public class DebCredNewAuditValidatorOp extends AbstractValidator {
if (yem_groupcusfields == null) { if (yem_groupcusfields == null) {
this.addErrorMessage(dataEntitie, "对应集团客户不能为空，如果没有集团客户请在《客户》维护后再尝试操作！"); this.addErrorMessage(dataEntitie, "对应集团客户不能为空，如果没有集团客户请在《客户》维护后再尝试操作！");
} }
String yemGenerate = dataEntity.getString("yem_generate");
if (!"B".equals(yemGenerate)) {
return;
}
//客户 //客户
String customername = ""; String customername = "";
DynamicObject yem_customer = dataEntity.getDynamicObject("yem_customer"); DynamicObject yem_customer = dataEntity.getDynamicObject("yem_customer");