1.供应商区域资质变更

2.物料品牌，带出执行采购

lc123/cloud/app/plugin/form/sys/MaterialBillPlugin.java

@@ -2,8 +2,14 @@ package tqq9.lc123.cloud.app.plugin.form.sys;
 
 import kd.bos.bill.AbstractBillPlugIn;
 import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.utils.StringUtils;
+import kd.bos.entity.datamodel.events.ChangeData;
+import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.form.events.AfterDoOperationEventArgs;
+import kd.bos.orm.query.QCP;
+import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 
 
@@ -57,4 +63,25 @@ public class MaterialBillPlugin extends AbstractBillPlugIn {
             SaveServiceHelper.save(new DynamicObject[]{this.getModel().getDataEntity()});
         }
     }
+
+    @Override
+    public void propertyChanged(PropertyChangedArgs e) {
+        super.propertyChanged(e);
+        String name = e.getProperty().getName();
+        if("tqq9_brand".equals(name)){
+            ChangeData changeData = e.getChangeSet()[0];
+            Object newValue = changeData.getNewValue();
+            if(newValue!=null){
+                DynamicObject newValue1 = (DynamicObject) newValue;
+                DynamicObject tqq9_brand= BusinessDataServiceHelper.loadSingle("tqq9_brand", new QFilter[]{new QFilter("id", QCP.in, newValue1.getLong("id"))});
+                DynamicObjectCollection tqq9_shcg = tqq9_brand.getDynamicObjectCollection("tqq9_shcg");
+                DynamicObjectCollection tqq9_bjcg = tqq9_brand.getDynamicObjectCollection("tqq9_bjcg");
+                DynamicObjectCollection tqq9_gzcg = tqq9_brand.getDynamicObjectCollection("tqq9_gzcg");
+                getModel().setValue("tqq9_shcg",tqq9_shcg);
+                getModel().setValue("tqq9_bjcg",tqq9_bjcg);
+                getModel().setValue("tqq9_gzcg",tqq9_gzcg);
+            }
+
+        }
+    }
 }

lc123/cloud/app/plugin/form/sys/SupplierAreaFormPlugin.java

@@ -2,7 +2,6 @@ package tqq9.lc123.cloud.app.plugin.form.sys;
 
 import kd.bos.dataentity.utils.StringUtils;
 import kd.bos.form.FormShowParameter;
-import kd.bos.form.control.Control;
 import kd.bos.form.control.events.BeforeItemClickEvent;
 import kd.bos.form.control.events.ItemClickEvent;
 import kd.bos.list.plugin.AbstractListPlugin;
@@ -46,7 +45,6 @@ public class SupplierAreaFormPlugin extends AbstractListPlugin implements Plugin
             data.put("isContinue", true);
             this.getView().returnDataToParent(data);
             this.getView().close();
-            Control tqq9_toolbarap = this.getView().getControl("tqq9_toolbarap");
         }
     }
 

lc123/cloud/app/plugin/form/sys/SupplierFormPlugin.java

@@ -58,6 +58,7 @@ public class SupplierFormPlugin extends AbstractListPlugin implements Plugin {
                 }
                 if (errorMsg.length() > 0) {
                     this.getView().showErrorNotification(errorMsg.substring(1));
+                    return;
                 }
                 FormShowParameter param = new FormShowParameter();
                 param.setFormId("tqq9_gysqyzz");
@@ -92,7 +93,10 @@ public class SupplierFormPlugin extends AbstractListPlugin implements Plugin {
                 }
                 HashMap<Object, String> supplierMap = new HashMap<>();
                 StringBuilder stringBuilder = new StringBuilder();
-                DynamicObject[] bd_suppliers = BusinessDataServiceHelper.load("bd_supplier", "id,number,status,enable,tqq9_mulcombofield1,createorg", new QFilter[]{new QFilter("id", QCP.in, longList)});
+                DynamicObject[] bd_suppliers =new DynamicObject[longList.size()];
+                for (int i = 0; i < longList.size(); i++) {
+                    bd_suppliers[i]= BusinessDataServiceHelper.loadSingle("bd_supplier", new QFilter[]{new QFilter("id", QCP.in, longList.get(i))});
+                }
                 for (DynamicObject bd_supplier : bd_suppliers) {
                     supplierMap.put(bd_supplier.get("id"),bd_supplier.getString("number"));
                 }
@@ -102,20 +106,39 @@ public class SupplierFormPlugin extends AbstractListPlugin implements Plugin {
                     List<IOperateInfo> allErrorOrValidateInfo = unauditResult.getAllErrorOrValidateInfo();
                     for (IOperateInfo iOperateInfo : allErrorOrValidateInfo) {
                         String supNumber = supplierMap.get(iOperateInfo.getPkValue());
-                        stringBuilder.append(",").append("编码为 ").append(supNumber).append(" 的供应商反审核失败，请手动修改供应商区域资质变更");
+                        String message = iOperateInfo.getMessage();
+                        stringBuilder.append(",").append("编码为 ").append(supNumber).append(" 的供应商反审核失败,"+message);
+                    }
+                    String message = unauditResult.getMessage();
+                    String simpleMessage = unauditResult.getInteractionContext().getSimpleMessage();
+                    if (message!=null){
+                        stringBuilder.append(",").append(message);
+                    }
+                    if (message!=null){
+                        stringBuilder.append(",").append(simpleMessage);
                     }
                 }
                 List<Object> successPkIds = unauditResult.getSuccessPkIds();
-                DynamicObject[] bd_suppliers1 = BusinessDataServiceHelper.load("bd_supplier", "id,number,status,enable,tqq9_mulcombofield1", new QFilter[]{new QFilter("id", QCP.in, successPkIds)});
+                DynamicObject[] bd_suppliers1 =new DynamicObject[successPkIds.size()];
-                for (DynamicObject dynamicObject : bd_suppliers1) {
+                for (int i = 0; i < successPkIds.size(); i++) {
-                    dynamicObject.set("tqq9_mulcombofield1",tqq9_qyzz);
+                    bd_suppliers1[i]= BusinessDataServiceHelper.loadSingle("bd_supplier", new QFilter[]{new QFilter("id", QCP.in, successPkIds.get(i))});
+                    bd_suppliers1[i].set("tqq9_mulcombofield1",tqq9_qyzz);
                 }
                 OperationResult sumbitResult = OperationServiceHelper.executeOperate(Constants.TYPE_SUBMIT, "bd_supplier", bd_suppliers1, operateOption);
                 if (!sumbitResult.isSuccess()) {
                     List<IOperateInfo> allErrorOrValidateInfo = unauditResult.getAllErrorOrValidateInfo();
                     for (IOperateInfo iOperateInfo : allErrorOrValidateInfo) {
                         String supNumber = supplierMap.get(iOperateInfo.getPkValue());
-                        stringBuilder.append(",").append("编码为 ").append(supNumber).append(" 的供应商提交失败，请手动提交");
+                        String message = iOperateInfo.getMessage();
+                        stringBuilder.append(",").append("编码为 ").append(supNumber).append(" 的供应商提交失败,"+message);
+                    }
+                    String message = sumbitResult.getMessage();
+                    String simpleMessage = sumbitResult.getInteractionContext().getSimpleMessage();
+                    if (message!=null){
+                        stringBuilder.append(",").append(message);
+                    }
+                    if (message!=null){
+                        stringBuilder.append(",").append(simpleMessage);
                     }
                 }
                 if(stringBuilder.length()>0){