fix:
1.生成随机资料时,只有业务分类为整机,且是否赠品为否的行生成
(cherry picked from commit 1d45f34ef8
)
This commit is contained in:
parent
cb5a3bbaca
commit
2e71eb7779
@ -816,6 +816,8 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
|
|||||||
DynamicObject productModel = (DynamicObject) model.getValue("yem_productmodel", i);
|
DynamicObject productModel = (DynamicObject) model.getValue("yem_productmodel", i);
|
||||||
if (YEM.isNotEmpty(materialClass) && YEM.isNotEmpty(productModel)) {
|
if (YEM.isNotEmpty(materialClass) && YEM.isNotEmpty(productModel)) {
|
||||||
if ("Z".equals(materialClass)) {
|
if ("Z".equals(materialClass)) {
|
||||||
|
boolean yemIfgift =(boolean) model.getValue("yem_ifgift");
|
||||||
|
if (!yemIfgift) {
|
||||||
DynamicObject products = productModel.getDynamicObject("yem_products");
|
DynamicObject products = productModel.getDynamicObject("yem_products");
|
||||||
if (YEM.isNotEmpty(products)) {
|
if (YEM.isNotEmpty(products)) {
|
||||||
Long id = products.getLong("id");
|
Long id = products.getLong("id");
|
||||||
@ -825,7 +827,7 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
|
|||||||
map.put(id, (BigDecimal) model.getValue("yem_qty", i));
|
map.put(id, (BigDecimal) model.getValue("yem_qty", i));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user