diff --git a/src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java b/src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java index 0fb6dffe..5a5f5aa5 100644 --- a/src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java +++ b/src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java @@ -80,37 +80,40 @@ public class InquirylistEdit extends AbstractBillPlugIn implements BeforeF7Selec public static void optionalOperation(IDataModel model, IFormView view, String formId, String operationNumber) { String name = model.getDataEntity().getDataEntityType().getName(); int currentRowIndex = -1; - if("yem_es_salesorder".equals(name)||"yem_es_xsalesorder".equals(name)){ + if ("yem_es_salesorder".equals(name) || "yem_es_xsalesorder".equals(name)) { currentRowIndex = model.getEntryCurrentRowIndex("yem_es_materialinfo"); } - if("yem_im_clientdemand".equals(name) || "yem_im_inquirylist".equals(name)){ + if ("yem_im_clientdemand".equals(name) || "yem_im_inquirylist".equals(name)) { currentRowIndex = model.getEntryCurrentRowIndex("yem_im_detailedinfor"); } DynamicObject billType = (DynamicObject) model.getValue("yem_billtype"); DynamicObjectCollection yem_im_detailedinfor = model.getEntryEntity("yem_im_detailedinfor"); + Map map = new HashMap<>(); + List ids = new ArrayList(); + DynamicObject productModel = (DynamicObject) model.getValue("yem_productmodel", currentRowIndex); + DynamicObject products = yem_im_detailedinfor.get(0).getDynamicObject("yem_productmodel.yem_products"); for (DynamicObject dynamicObject : yem_im_detailedinfor) { - DynamicObject productModel = (DynamicObject)model.getValue("yem_productmodel",currentRowIndex); - DynamicObject products = dynamicObject.getDynamicObject("yem_productmodel.yem_products"); DynamicObjectCollection yem_multiconfig = dynamicObject.getDynamicObjectCollection("yem_multiconfig"); if (yem_multiconfig != null) { - Map map = new HashMap<>(); - List ids = new ArrayList(); + // int multiConfigRows = model.getEntryRowCount("yem_multiconfig"); for (DynamicObject object : yem_multiconfig) { // String configurType = (String) model.getValue("yem_configurtype", i); Long configEntryId = object.getLong("yem_configentryid"); ids.add(configEntryId); } - map.put("billTypeNumber", billType.getString("number")); - map.put("products", products.getPkValue()); - map.put("operationNumber", operationNumber); - map.put("type", "B"); - map.put("ids", ids); - map.put("productModel", productModel); - viewForm(formId, map, view); + + } } + map.put("billTypeNumber", billType.getString("number")); + map.put("products", products.getPkValue()); + map.put("operationNumber", operationNumber); + map.put("type", "B"); + map.put("ids", ids); + map.put("productModel", productModel); + viewForm(formId, map, view); }