fix:
1.申报要素改变过滤值
This commit is contained in:
parent
45a8bf6585
commit
f0c13f3856
@ -794,11 +794,11 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
|
|||||||
|
|
||||||
DynamicObject billtype = (DynamicObject) model.getValue("yem_billtype");
|
DynamicObject billtype = (DynamicObject) model.getValue("yem_billtype");
|
||||||
String type = billtype.getString("number");
|
String type = billtype.getString("number");
|
||||||
if (org.apache.commons.lang3.StringUtils.containsIgnoreCase(type, "zj")) {
|
if (org.apache.commons.lang3.StringUtils.containsIgnoreCase(type, "zj")||"yem_es_storagetrans".equals(type)) {
|
||||||
if ("Z".equals(businesssort)) {
|
if ("Z".equals(businesssort)) {
|
||||||
if (YEM.isNotEmpty(productmodel)) {
|
if (YEM.isNotEmpty(productmodel)) {
|
||||||
id = productmodel.getLong("id");
|
id = productmodel.getLong("id");
|
||||||
qFilter.and(new QFilter("yem_bd_declarationele", QCP.equals, id));
|
qFilter.and(new QFilter("yem_bd_declarationele.yem_baseproductstree.id", QCP.equals, id));
|
||||||
qFilter.and(new QFilter("enable", QCP.equals, "1"));
|
qFilter.and(new QFilter("enable", QCP.equals, "1"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -865,11 +865,11 @@ public class SalesOrderUtils {
|
|||||||
|
|
||||||
DynamicObject billtype = (DynamicObject) model.getValue("yem_billtype");
|
DynamicObject billtype = (DynamicObject) model.getValue("yem_billtype");
|
||||||
String type = billtype.getString("number");
|
String type = billtype.getString("number");
|
||||||
if (StringUtils.containsIgnoreCase(type, "zj")) {
|
if (StringUtils.containsIgnoreCase(type, "zj")||"yem_es_storagetrans".equals(type)) {
|
||||||
if ("Z".equals(businesssort)) {
|
if ("Z".equals(businesssort)) {
|
||||||
if (YEM.isNotEmpty(productmodel)) {
|
if (YEM.isNotEmpty(productmodel)) {
|
||||||
id = productmodel.getLong("yem_products.id");
|
id = productmodel.getLong("id");
|
||||||
qFilter.and(new QFilter("yem_bd_declarationele.yem_productstree.id", QCP.equals, id));
|
qFilter.and(new QFilter("yem_bd_declarationele.yem_baseproductstree.id", QCP.equals, id));
|
||||||
qFilter.and(new QFilter("enable", QCP.equals, "1"));
|
qFilter.and(new QFilter("enable", QCP.equals, "1"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user