Merge remote-tracking branch 'origin/master'

src/main/java/bamp/basedata/opplugin/SupplierBankChangeOpPlugin.java

@@ -1,9 +1,13 @@
 package bamp.basedata.opplugin;
 
+import com.grapecity.documents.excel.Q;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
+import kd.bos.exception.KDBizException;
+import kd.bos.orm.query.QCP;
+import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 
@@ -16,31 +20,57 @@ public class SupplierBankChangeOpPlugin  extends AbstractOperationServicePlugIn
     @Override
     public void endOperationTransaction(EndOperationTransactionArgs e) {
         super.endOperationTransaction(e);
+        String operationKey = e.getOperationKey();
+        if("save".equals(operationKey) || "submit".equals(operationKey)){
+            checkData(e);
+        }else if("audit".equals(operationKey)) {
+            updateSupplierBankData(e);
+        }
+    }
+
+    private void checkData(EndOperationTransactionArgs e) {
+        DynamicObject[] dynamicObjects = e.getDataEntities();
+        for (int i = 0; i < dynamicObjects.length; i++) {
+            DynamicObject bill = dynamicObjects[i];
+            QFilter qFilter_id = new QFilter("id", QCP.not_equals,bill.getPkValue());
+            QFilter qFilter_status = new QFilter("status", QCP.not_equals,"C");
+            DynamicObject supplier = bill.getDynamicObject("nckd_supplierfield");
+            QFilter qFilter_supplier = new QFilter("nckd_supplierfield",QCP.not_equals,supplier.getPkValue());
+            DynamicObject[] oldBills = BusinessDataServiceHelper.load("nckd_supplierbankchange","id,billno",
+                    new QFilter[]{qFilter_id,qFilter_status,qFilter_supplier});
+            if(oldBills.length>0){
+                DynamicObject oldBill = oldBills[0];
+                throw new KDBizException("供应商银行信息已存在编码为["+oldBill.getString("billno")+"]的未审核变更记录");
+            }
+        }
+    }
+
+    private void updateSupplierBankData(EndOperationTransactionArgs e) {
         DynamicObject[] dynamicObjects = e.getDataEntities();
         for (int i = 0; i < dynamicObjects.length; i++) {
             DynamicObject bill = dynamicObjects[i];
             DynamicObject supplier = BusinessDataServiceHelper.loadSingle(
-                    bill.getDynamicObject("nckd_supplierfield").getLong("id"),"bd_supplier");
+                    bill.getDynamicObject("nckd_supplierfield").getLong("id"), "bd_supplier");
             DynamicObjectCollection supplierBankCol = supplier.getDynamicObjectCollection("entry_bank");
             supplierBankCol.clear();
             DynamicObjectCollection entryCol = bill.getDynamicObjectCollection("nckd_entry_bank");
-            for(DynamicObject entry : entryCol){
+            for (DynamicObject entry : entryCol) {
                 DynamicObject supplierEntryInfo = supplierBankCol.addNew();
-                supplierEntryInfo.set("bankaccount",entry.get("nckd_bankaccount"));
-                supplierEntryInfo.set("accountname",entry.get("nckd_accountname"));
-                supplierEntryInfo.set("iban",entry.get("nckd_iban"));
-                supplierEntryInfo.set("bank",entry.get("nckd_bank"));
-                supplierEntryInfo.set("currency",entry.get("nckd_currency"));
-                supplierEntryInfo.set("payeeadmindivision",entry.get("nckd_payeeadmindivision"));
-                supplierEntryInfo.set("payeeaddress",entry.get("nckd_payeeaddress"));
-                supplierEntryInfo.set("payeephone",entry.get("nckd_payeephone"));
-                supplierEntryInfo.set("isdefault_bank",entry.get("nckd_isdefault_bank"));
-                supplierEntryInfo.set("bankaccounttype",entry.get("nckd_bankaccounttype"));
-                supplierEntryInfo.set("settlment",entry.get("nckd_settlment"));
-                supplierEntryInfo.set("commissionbearer",entry.get("nckd_commissionbearer"));
-                supplierEntryInfo.set("liquidationparam",entry.get("nckd_liquidationparam"));
-                supplierEntryInfo.set("agentbankaccount",entry.get("nckd_agentbankaccount"));
-                supplierEntryInfo.set("agentbank",entry.get("nckd_agentbank"));
+                supplierEntryInfo.set("bankaccount", entry.get("nckd_bankaccount"));
+                supplierEntryInfo.set("accountname", entry.get("nckd_accountname"));
+                supplierEntryInfo.set("iban", entry.get("nckd_iban"));
+                supplierEntryInfo.set("bank", entry.get("nckd_bank"));
+                supplierEntryInfo.set("currency", entry.get("nckd_currency"));
+                supplierEntryInfo.set("payeeadmindivision", entry.get("nckd_payeeadmindivision"));
+                supplierEntryInfo.set("payeeaddress", entry.get("nckd_payeeaddress"));
+                supplierEntryInfo.set("payeephone", entry.get("nckd_payeephone"));
+                supplierEntryInfo.set("isdefault_bank", entry.get("nckd_isdefault_bank"));
+                supplierEntryInfo.set("bankaccounttype", entry.get("nckd_bankaccounttype"));
+                supplierEntryInfo.set("settlment", entry.get("nckd_settlment"));
+                supplierEntryInfo.set("commissionbearer", entry.get("nckd_commissionbearer"));
+                supplierEntryInfo.set("liquidationparam", entry.get("nckd_liquidationparam"));
+                supplierEntryInfo.set("agentbankaccount", entry.get("nckd_agentbankaccount"));
+                supplierEntryInfo.set("agentbank", entry.get("nckd_agentbank"));
             }
             SaveServiceHelper.save(new DynamicObject[]{supplier});
         }

src/main/java/fi/em/formPlugin/SalaryDownloadFilePlugin.java

@@ -34,7 +34,6 @@ public class SalaryDownloadFilePlugin extends AbstractFormPlugin {
         String operateKey = arg.getOperateKey();
         //获取下拉列表字段
         ComboProp comboProp = (ComboProp) getModel().getProperty("nckd_entrytype");
-
         //审核操作代码
         String downloadBut="download";
         DynamicObject dynamicObject=this.getModel().getDataEntity(true);
@@ -42,13 +41,11 @@ public class SalaryDownloadFilePlugin extends AbstractFormPlugin {
         //通过下拉值获取下拉标题
         String displayName = comboProp.getItemByName(nckd_entrytype);
         if (downloadBut.equals(operateKey)) {
-//            downFileToLocal(nckd_entrytype);
             QFilter qFilter=new QFilter("number", QCP.equals,"salaryfile");
             //下载模板表单
             DynamicObject nckd_file= BusinessDataServiceHelper.loadSingle("nckd_file",new QFilter[]{qFilter});
             List<Map<String, Object>> list = AttachmentServiceHelper
                     .getAttachments("nckd_file", nckd_file.getPkValue(), "nckd_attachmentpanelap");
-            String myurl = "";
             //获取下载链接并打开
             for(int i = 0; i < list.size(); i++) {
                 String filename=list.get(i).get("name").toString();
@@ -61,43 +58,5 @@ public class SalaryDownloadFilePlugin extends AbstractFormPlugin {
         }
     }
 
-    //根据分录类型，下载对应的分录模板
-    public void downFileToLocal(String nckd_entrytype) {
-        //获取下拉列表字段
-        ComboProp comboProp = (ComboProp) getModel().getProperty("nckd_entrytype");
-        try {
-            //获取文件上传接口配置信息
-            InterFaceImgUtils interFaceImgUtils=new InterFaceImgUtils("downloadurl");
-            //端口号
-            int port= interFaceImgUtils.getPort();
-            //服务器地址
-            String serverurl= interFaceImgUtils.getServerName();
-            //用户
-            String user= interFaceImgUtils.getServerUser();
-            //密码
-            String password= interFaceImgUtils.getServerPassword();
-            //文件名
-            String filename= interFaceImgUtils.getFileName();
-            //获取文件路径
-            String fileurl= interFaceImgUtils.getServerUrl();
-            //文件保存路径
-            String fileLocalpath= interFaceImgUtils.getFileLocalPath();
-            //通过下拉值获取下拉标题
-            String displayName = comboProp.getItemByName(nckd_entrytype);
-            //文件服务器路径
-            String filepath=fileurl+"/"+nckd_entrytype+".xls";
-            //获取sftp链接对象
-            SftpClient sftpClient=new SftpClient(serverurl,user,password,port);
-            //获取服务器链接
-            sftpClient.connect();
-            sftpClient.downloadFile(filepath,fileLocalpath+"/"+nckd_entrytype+".xls");
-            new File(fileLocalpath+"/"+nckd_entrytype+".xls")
-                    .renameTo(new File(fileLocalpath+"/"+displayName+filename));
-            sftpClient.disconnect();
-            this.getView().showMessage("文件下载成功，文件位置："+fileLocalpath+"/"+displayName+filename);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
 
 }

src/main/java/sys/sc/formplugin/CreatDatPlugin.java

@@ -56,22 +56,6 @@ public class CreatDatPlugin extends AbstractListPlugin {
             //服务器路径
 //            String nckd_url=jkdataDy.getString("nckd_url");
             String nckd_url=dynamicObject.getString("nckd_filepath");
-//            //生成文件的路径
-////            String filePath=nckd_url+filename;
-////            File dir=new File(filePath);
-////            //不存在则创建文件夹
-////            if (!dir.exists()) {
-////                File parentDir = dir.getParentFile();
-////                if (parentDir != null && !parentDir.exists()) {
-////                    parentDir.mkdirs();
-////                }
-////                try {
-////                    dir.createNewFile();
-////                } catch (IOException e) {
-////                    throw new RuntimeException(e);
-////                }
-////                this.getView().showMessage("创建成功"+filePath);
-////            }
             //分割符号
             String spiltsign=jkdataDy.getString("nckd_split");
             //结束符号

src/main/java/sys/sc/formplugin/TestPlugin.java

@@ -459,12 +459,9 @@ public class TestPlugin  extends AbstractListPlugin {
                     }else {
                         bumeninfo.set("post", positionnumber);
                     }
-
                     // 保存新用户信息
                     SaveServiceHelper.save(new DynamicObject[]{userinfo});
                     msg+="工号为 " + gonghao + " 的用户已创建！";
-
-
                     //刷新员工的类型字段
                     DBRoute dbRoute=new DBRoute("sys");
                     //生成id