1.生成随机资料时,只有业务分类为整机,且是否赠品为否的行生成
This commit is contained in:
ljw 2024-11-26 19:38:47 +08:00
parent 4c04b538aa
commit d2f097d658

View File

@ -1000,16 +1000,18 @@ public class SalesOrderZJEdit 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)) {
DynamicObject products = productModel.getDynamicObject("yem_products"); boolean yemIfgift = (boolean) model.getValue("yem_ifgift");
if (YEM.isNotEmpty(products)) { if (!yemIfgift) {
Long id = products.getLong("id"); DynamicObject products = productModel.getDynamicObject("yem_products");
if (map.containsKey(id)) { if (YEM.isNotEmpty(products)) {
map.put(id, map.get(id).add((BigDecimal) model.getValue("yem_qty", i))); Long id = products.getLong("id");
} else { if (map.containsKey(id)) {
map.put(id, (BigDecimal) model.getValue("yem_qty", i)); map.put(id, map.get(id).add((BigDecimal) model.getValue("yem_qty", i)));
} else {
map.put(id, (BigDecimal) model.getValue("yem_qty", i));
}
} }
} }
} }
} }
} }
@ -1271,7 +1273,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
for (int i = 0; i < materialInfoRows; i++) { for (int i = 0; i < materialInfoRows; i++) {
DynamicObject productModel = (DynamicObject) model.getValue("yem_productmodel", i); DynamicObject productModel = (DynamicObject) model.getValue("yem_productmodel", i);
Boolean yemIfgift = (Boolean) model.getValue("yem_ifgift", i); Boolean yemIfgift = (Boolean) model.getValue("yem_ifgift", i);
if (YEM.isNotEmpty(productModel)&&!yemIfgift) { if (YEM.isNotEmpty(productModel) && !yemIfgift) {
DynamicObject products = productModel.getDynamicObject("yem_products"); DynamicObject products = productModel.getDynamicObject("yem_products");
if (YEM.isNotEmpty(products)) { if (YEM.isNotEmpty(products)) {
Long productsId = products.getLong("id"); Long productsId = products.getLong("id");