待办消息优化,资质预审校验优化,供应商携带字段变更(内部推荐人)

main/java/shkd/repc/recon/formplugin/WorkloadcfmbillFormPlugin.java

@@ -185,9 +185,7 @@ public class WorkloadcfmbillFormPlugin extends AbstractFormPlugin implements Tab
                                     "qeug_unit,qeug_decimalqty,qeug_unitprice,qeug_amounttotal,qeug_artificial,qeug_provisional," +
                                     "qeug_remarks,qeug_contractid,qeug_sheetname,qeug_cumulativepreofpro,qeug_mechanicalunitprice," +
                                     "qeug_unitpriceofmainmater", new QFilter[]{q3,q4,q5});
-                    if (recon_contractbills.length > 0) {
+                    for (DynamicObject contractsummarylist : recon_contractbills) {
-                        for (int i = 0; i < recon_contractbills.length; i++) {
-                            DynamicObject contractsummarylist = recon_contractbills[i];
                         DynamicObject add = BusinessDataServiceHelper.newDynamicObject("qeug_contractsummarylist");
                         add.set("qeug_seqs", contractsummarylist.getString("qeug_seqs"));
                         add.set("qeug_projectnumber", contractsummarylist.getString("qeug_projectnumber").trim());
@@ -212,7 +210,6 @@ public class WorkloadcfmbillFormPlugin extends AbstractFormPlugin implements Tab
                         SaveServiceHelper.save(new DynamicObject[]{add});
                     }
                 }
-                }
 
                 break;
             default:

main/java/shkd/repc/recon/listplugin/ContractSummaryListPlugin.java

@@ -38,7 +38,6 @@ public class ContractSummaryListPlugin extends AbstractListPlugin implements ILi
     @Override
     public void beforeDoOperation(BeforeDoOperationEventArgs args) {
         super.beforeDoOperation(args);
-
         Map<String, Object> customParams = this.getView().getFormShowParameter().getCustomParams();
         Object Workloadcfmbill_id = customParams.get("Workloadcfmbill_id");
 

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

@@ -29,6 +29,7 @@ public class PortraitBasicsFormPlugin extends AbstractFormPlugin {
         String qeug_orgnumberes = supplier1.getString("qeug_orgnumberes");//组织机构代码
         String qeug_regstatuses = supplier1.getString("qeug_regstatuses");//经营状态
         String qeug_linkman = supplier1.getString("qeug_linkman");//外部联系人
+        String qeug_recommender = supplier1.getString("qeug_recommender");//内部推荐人
 
 
         this.getView().getModel().setValue("qeug_controllingperson", qeug_controllingperses);
@@ -36,11 +37,13 @@ public class PortraitBasicsFormPlugin extends AbstractFormPlugin {
         this.getView().getModel().setValue("qeug_orgnumber", qeug_orgnumberes);
         this.getView().getModel().setValue("qeug_regstatus", qeug_regstatuses);
         this.getView().getModel().setValue("qeug_linkman", qeug_linkman);
+        this.getView().getModel().setValue("qeug_recommender", qeug_recommender);
         this.getView().updateView("qeug_controllingperson");
         this.getView().updateView("qeug_regnumber");
         this.getView().updateView("qeug_orgnumber");
         this.getView().updateView("qeug_regstatus");
         this.getView().updateView("qeug_linkman");
+        this.getView().updateView("qeug_recommender");
 
 //        this.getView().updateView();
     }

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

@@ -47,6 +47,7 @@ public class TycQzSupplierFormPlugin extends AbstractFormPlugin {
 
     public void beforeItemClick(BeforeItemClickEvent evt) {
         if (evt.getItemKey().equals("qeug_preaudit")) {
+            try {
                 DynamicObject regSupplier = BusinessDataServiceHelper.loadSingle(this.getModel().getDataEntity().getPkValue(), "resm_regsupplier");
                 String socode = regSupplier.getString("societycreditcode");
                 String personType = regSupplier.getString("persontype");
@@ -55,7 +56,6 @@ public class TycQzSupplierFormPlugin extends AbstractFormPlugin {
                     evt.setCancel(true);
                     return;
                 }
-
                 OperationResult result = OperationServiceHelper.executeOperate("save", "resm_regsupplier", new DynamicObject[]{regSupplier}, OperateOption.create());
                 if (!result.isSuccess()) {
                     evt.setCancel(true);
@@ -72,6 +72,13 @@ public class TycQzSupplierFormPlugin extends AbstractFormPlugin {
                     evt.setCancel(true);
                     return;
                 }
+            }catch (Exception e){
+                this.getView().showMessage(ResManager.loadKDString("请先保存", "ImportRegSupplierList_2", "repc-resm-formplugin", new Object[0]));
+                evt.setCancel(true);
+            }
+
+
+
         }
 
     }

main/java/shkd/repc/resm/opplugin/RegisteredFinishregOPPlugin.java

@@ -35,7 +35,8 @@ public class RegisteredFinishregOPPlugin  extends AbstractOperationServicePlugIn
                     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"));//外部联系人
+//                    regSupplier.set("recommender",resp_registered.getDynamicObject("recommender"));//外部联系人
+                    regSupplier.set("qeug_recommender",resp_registered.getDynamicObject("qeug_recommender"));//内部推荐人
                     SaveServiceHelper.save(new DynamicObject[]{regSupplier});
                     DobeDWUtils.saveLog("注册供应商",
                             "注册供应商",null,	null,

main/java/shkd/todotask/todoZyTaskServiceHandler.java

@@ -28,6 +28,7 @@ public class todoZyTaskServiceHandler  extends AbstractMessageServiceHandler {
 
     /**
      * 通过人员id获取人员信息
+     *
      * @param userIds   人员id集合
      * @param approvers 人员信息集合
      */
@@ -38,6 +39,7 @@ public class todoZyTaskServiceHandler  extends AbstractMessageServiceHandler {
         }
         return approvers;
     }
+
     @Override
     public void createToDo(MessageContext messageContext, ToDoInfo toDoInfo) {
         System.out.println("createToDo");
@@ -211,9 +213,20 @@ public class todoZyTaskServiceHandler  extends AbstractMessageServiceHandler {
     @Override
     public void sendMessage(MessageContext messageContext, MessageInfo message) {
         super.sendMessage(messageContext, message);
-        //获取单据编码
+        //https://developer.kingdee.com/article/195641480978054400?productLineId=29&lang=zh-CN
-//        String billNo = messageContext.getBillNo();
+        //JSONObject.parseObject(String.valueOf(message.getParams().get("messageContext")));
-        String billNo =message.getNestBillno();
+
+        Map<String, Object> params = message.getParams();
+        String billNo = "";
+        Long taskId = 0L;
+        if (params != null) {
+            String messagContext = String.valueOf(params.get("messageContext"));
+            JSONObject jsonObject = JSONObject.parseObject(messagContext);
+            if (null != jsonObject) {
+                billNo = jsonObject.getString("billNo");//获取单据编码
+                taskId = jsonObject.getLong("taskId");//获取当前任务ID
+            }
+        }
         //消息内容
         String content = message.getContent();
         //消息时间
@@ -222,9 +235,7 @@ public class todoZyTaskServiceHandler  extends AbstractMessageServiceHandler {
         Date createDate = message.getSendTime();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String createDateStr = sdf.format(createDate);
-        //获取当前任务ID
+
-//        Long taskId = messageContext.getTaskId();
-        Long taskId = message.getId();
 
         //获取审批人集合
         List<DynamicObject> approvers = new ArrayList<>();