Merge remote-tracking branch 'origin/main'

main/java/shkd/repc/resm/formplugin/PortraitBasicsFormPlugin.java

@@ -24,38 +24,23 @@ public class PortraitBasicsFormPlugin extends AbstractFormPlugin {
         QFilter q1 = new QFilter("id", QCP.equals, supplierid);
         DynamicObject supplier1 = BusinessDataServiceHelper.loadSingle("resm_official_supplier", new QFilter[]{q1});
 
-        String qeug_historynames = supplier1.getString("qeug_historynames");//曾用名
+        String qeug_controllingperses = supplier1.getString("qeug_controllingperses");//公司实际控制人/权（股份公司）
-        String qeug_regnumber = supplier1.getString("qeug_regnumber");//企业注册号
+        String qeug_regnumberes = supplier1.getString("qeug_regnumberes");//企业注册号
-        String qeug_orgnumber = supplier1.getString("qeug_orgnumber");//组织机构代码
+        String qeug_orgnumberes = supplier1.getString("qeug_orgnumberes");//组织机构代码
-        String qeug_reginstitute = supplier1.getString("qeug_reginstitute");//登记机关
+        String qeug_regstatuses = supplier1.getString("qeug_regstatuses");//经营状态
-        String qeug_regstatus = supplier1.getString("qeug_regstatus");//经营状态
+        String qeug_linkman = supplier1.getString("qeug_linkman");//外部联系人
-        String qeug_companyorgtype = supplier1.getString("qeug_companyorgtype");//企业类型
-        String qeug_canceldate = supplier1.getString("qeug_canceldate");//注销日期
-        String qeug_bases = supplier1.getString("qeug_bases");//省
-        String qeug_city = supplier1.getString("qeug_city");//城市
-        String qeug_socialstaffnum = supplier1.getString("qeug_socialstaffnum");//参保人数
 
 
-        this.getView().getModel().setValue("qeug_historynames", qeug_historynames);
+        this.getView().getModel().setValue("qeug_controllingperson", qeug_controllingperses);
-        this.getView().getModel().setValue("qeug_regnumber", qeug_regnumber);
+        this.getView().getModel().setValue("qeug_regnumber", qeug_regnumberes);
-        this.getView().getModel().setValue("qeug_orgnumber", qeug_orgnumber);
+        this.getView().getModel().setValue("qeug_orgnumber", qeug_orgnumberes);
-        this.getView().getModel().setValue("qeug_reginstitute", qeug_reginstitute);
+        this.getView().getModel().setValue("qeug_regstatus", qeug_regstatuses);
-        this.getView().getModel().setValue("qeug_regstatus", qeug_regstatus);
+        this.getView().getModel().setValue("qeug_linkman", qeug_linkman);
-        this.getView().getModel().setValue("qeug_companyorgtype", qeug_companyorgtype);
+        this.getView().updateView("qeug_controllingperson");
-        this.getView().getModel().setValue("qeug_canceldate", qeug_canceldate);
-        this.getView().getModel().setValue("qeug_bases", qeug_bases);
-        this.getView().getModel().setValue("qeug_city", qeug_city);
-        this.getView().getModel().setValue("qeug_socialstaffnum", qeug_socialstaffnum);
-        this.getView().updateView("qeug_historynames");
         this.getView().updateView("qeug_regnumber");
         this.getView().updateView("qeug_orgnumber");
-        this.getView().updateView("qeug_reginstitute");
         this.getView().updateView("qeug_regstatus");
-        this.getView().updateView("qeug_companyorgtype");
+        this.getView().updateView("qeug_linkman");
-        this.getView().updateView("qeug_canceldate");
-        this.getView().updateView("qeug_bases");
-        this.getView().updateView("qeug_city");
-        this.getView().updateView("qeug_socialstaffnum");
 
 //        this.getView().updateView();
     }

main/java/shkd/repc/resm/formplugin/RegisteredFormPlugin.java

@@ -0,0 +1,48 @@
+package shkd.repc.resm.formplugin;
+
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.form.events.AfterDoOperationEventArgs;
+import kd.bos.form.plugin.AbstractFormPlugin;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
+import kd.bos.servicehelper.operation.SaveServiceHelper;
+import shkd.utils.DobeDWUtils;
+
+/**
+ * 供应商注册表单插件
+ * qeug_resp_registered_ext
+ */
+public class RegisteredFormPlugin extends AbstractFormPlugin {
+
+    @Override
+    public void afterDoOperation(AfterDoOperationEventArgs args) {
+        super.afterDoOperation(args);
+        String operateKey = args.getOperateKey();
+        switch (operateKey) {
+            // 注册完成时将信息携带到潜在供应商
+            case "finishregistered":
+                DynamicObject dataEntity = this.getModel().getDataEntity();
+                //注册供应商
+                DynamicObject resp_registered = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), "resp_registered");
+                if (null != resp_registered) {
+                    DynamicObject regSupplier = resp_registered.getDynamicObject("regsuppplier");
+                    //潜在供应商
+                    if (regSupplier != null) {
+                        regSupplier = BusinessDataServiceHelper.loadSingle(regSupplier.getPkValue(), "resm_regsupplier");
+                        regSupplier.set("qeug_controllingperses",resp_registered.getString("qeug_controllingperses"));//公司实际控制人/权（股份公司）
+                        regSupplier.set("qeug_regnumberes",resp_registered.getString("qeug_regnumberes"));//企业注册号
+                        regSupplier.set("qeug_orgnumberes",resp_registered.getString("qeug_orgnumberes"));//组织机构代码
+                        regSupplier.set("qeug_regstatuses",resp_registered.getString("qeug_regstatuses"));//经营状态
+                        regSupplier.set("qeug_linkman",resp_registered.getString("qeug_linkman"));//外部联系人
+                        regSupplier.set("recommender",resp_registered.getDynamicObject("recommender"));//外部联系人
+                        SaveServiceHelper.save(new DynamicObject[]{regSupplier});
+                        DobeDWUtils.saveLog("注册供应商",
+                                "注册供应商",null,	null,
+                                true,"注册供应商成功带入潜在供应商");
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
+}

main/java/shkd/utils/OAUtils.java

@@ -28,7 +28,7 @@ import static shkd.repc.resm.opplugin.PushOASupplierOPPlugin.assembleBody;
 public class OAUtils {
 
     private static final Log logger = LogFactory.getLog(OAUtils.class);
-    public static final String oaUrl = System.getProperty("oaurl");//(测试环境外网地址)
+    public static final String oaUrl = System.getProperty("oaurl");//(测试环境外网地址)http://140.206.96.138:9091
 //    public static final String oaUrl = "http://172.31.254.240:9090";//本地(内网地址)
 
     //致远服务前获取token接口