Merge remote-tracking branch 'origin/master'

src/main/java/fi/er/formPlugin/ContratBillFormPlugin.java

@@ -26,7 +26,7 @@ public class ContratBillFormPlugin extends AbstractFormPlugin implements HyperLi
         int rowIndex = hyperLinkClickEvent.getRowIndex();
         if (StringUtils.containsIgnoreCase(fieldName,"nckd_pay_billno1")){
             //付款处理id
-            Object id = this.getModel().getValue("nckd_pay_id1");
+            Object id = this.getModel().getValue("nckd_pay_id1", rowIndex);
 
             BillShowParameter billShowParameter = new BillShowParameter();
             // 设置打开单据的标识

src/main/java/fi/fa/opplugin/AssetMidBillOpPlugin.java

@@ -56,9 +56,15 @@ public class AssetMidBillOpPlugin extends AbstractListPlugin {
                     }
                     DynamicObject busProcess = BusinessDataServiceHelper.newDynamicObject("nckd_ywcld");
                     busProcess.set("nckd_bizdate", info.getDate("nckd_date_out"));//业务日期
-                    busProcess.set("nckd_costcompany", ChangeDataUtils.getOrg(info.getString("nckd_org_in")));//资产组织
-                    busProcess.set("nckd_orgfield1", ChangeDataUtils.getOrg(info.getString("nckd_org_out")));//调出组织
-                    busProcess.set("nckd_orgfield2", ChangeDataUtils.getOrg(info.getString("nckd_org_in")));//调入组织
+                    Long orgIdin = ChangeDataUtils.getOrg(info.getString("nckd_org_in"));
+                    Long orgIdout = ChangeDataUtils.getOrg(info.getString("nckd_org_out"));
+
+                    Long relationIdin = ChangeDataUtils.getRelation(orgIdin);
+                    Long relationIdout = ChangeDataUtils.getRelation(orgIdout);
+
+                    busProcess.set("nckd_costcompany", relationIdin);//资产组织
+                    busProcess.set("nckd_orgfield1", relationIdout);//调出组织
+                    busProcess.set("nckd_orgfield2", relationIdin);//调入组织
                     busProcess.set("nckd_textfield1", info.getString("nckd_reason"));//调拨原因
 
 

src/main/java/fi/fa/opplugin/FaChangeMidOpPlugin.java

@@ -55,7 +55,10 @@ public class FaChangeMidOpPlugin extends AbstractListPlugin {
                     }
                     DynamicObject busProcess = BusinessDataServiceHelper.newDynamicObject("nckd_ywcld");
                     busProcess.set("nckd_bizdate", info.getDate("nckd_date_out"));//业务日期
-                    busProcess.set("nckd_costcompany", ChangeDataUtils.getOrg(info.getString("nckd_org_in")));//资产组织
+
+                    Long orgIdin = ChangeDataUtils.getOrg(info.getString("nckd_org_in"));
+                    Long relationIdin = ChangeDataUtils.getRelation(orgIdin);
+                    busProcess.set("nckd_costcompany", relationIdin);//资产组织
                     busProcess.set("nckd_textfield1", info.getString("nckd_reason"));//调拨原因
                     busProcess.set("billstatus", "A");//暂存
                     busProcess.set("nckd_detailtype", "N");//业务类型(E:资产调拨)

src/main/java/fi/fa/opplugin/FaDisCardMidOpPlugin.java

@@ -59,7 +59,9 @@ public class FaDisCardMidOpPlugin extends AbstractListPlugin {
                     DynamicObject busProcess = BusinessDataServiceHelper.newDynamicObject("nckd_ywcld");
                     busProcess.set("nckd_bizdate", info.getDate("nckd_date_out"));//业务日期
                     busProcess.set("nckd_detailtype", "D");//业务类型 D:报废
-                    busProcess.set("nckd_costcompany", ChangeDataUtils.getOrg(info.getString("nckd_org_in")));//资产组织
+                    Long orgIdin = ChangeDataUtils.getOrg(info.getString("nckd_org_in"));
+                    Long relationIdin = ChangeDataUtils.getRelation(orgIdin);
+                    busProcess.set("nckd_costcompany", relationIdin);//资产组织
                     busProcess.set("nckd_textfield1", info.getString("nckd_reason"));//摘要事由
                     busProcess.set("nckd_applierv", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//制单人
 

src/main/java/fi/fa/opplugin/utils/ChangeDataUtils.java

@@ -91,6 +91,25 @@ public class ChangeDataUtils {
         return null;
     }
 
+    /**
+     * @description 查询业务单元id
+     * @param id
+     * @return Long
+     */
+    public static Long getRelation(Long id) {
+
+        QFilter filter = new QFilter("toorg", QCP.equals,id);
+        DynamicObject[] org = BusinessDataServiceHelper.load("bos_org_orgrelation_dept","id",new QFilter[] {filter});
+        if (org.length > 0) {
+            DynamicObject orgInfo = BusinessDataServiceHelper.loadSingle(org[0].getPkValue(), org[0].getDynamicObjectType().getName());
+            DynamicObject ywdyOrg = orgInfo.getDynamicObject("fromorg");
+            if (ywdyOrg != null) {
+                return ywdyOrg.getLong("id");
+            }
+        }
+        return null;
+    }
+
     /**
      * @description 查询用户表获取用户
      * @param eUser

src/main/java/fi/fa/webService/ApisaveDemoPlugin.java

@@ -56,15 +56,28 @@ public class ApisaveDemoPlugin implements ApiSavePlugin {
         String orgNumber = orgControlInfo.getString("nckd_org_number");
 
         if (orgId.equals(deptId)) {
-            // 如果组织 ID 和部门 ID 相同，则都设置为组织编号
-            org.put("id", getOrg(orgNumber));
-            dept.put("id", getOrg(orgNumber));
+            // 行政组织id
+            Long id = getOrg(orgNumber);
+            Long fromorgId = getRelation(id);
+            if (id != null) {
+                dept.put("id", id);
+            }
+            if (fromorgId != null) {
+                org.put("id", fromorgId);
+            }
         } else if (orgControlInfo.getString("nckd_e_org").equals(orgId)) {
-            // 如果当前控制信息的组织 ID 等于 orgId，更新组织 ID
-            org.put("id", getOrg(orgNumber));
+            // 行政组织id
+            Long id = getOrg(orgNumber);
+            Long fromorgId = getRelation(id);
+            if (fromorgId != null) {
+                org.put("id", fromorgId);
+            }
         } else {
             // 否则更新部门 ID
-            dept.put("id", getOrg(orgNumber));
+            Long id = getOrg(orgNumber);
+            if (id != null) {
+                dept.put("id", id);
+            }
         }
     }
 
@@ -83,4 +96,23 @@ public class ApisaveDemoPlugin implements ApiSavePlugin {
         }
         return null;
     }
+
+    /**
+     * @description 查询业务单元id
+     * @param id
+     * @return Long
+     */
+    private Long getRelation(Long id) {
+
+        QFilter filter = new QFilter("toorg", QCP.equals,id);
+        DynamicObject[] org = BusinessDataServiceHelper.load("bos_org_orgrelation_dept","id",new QFilter[] {filter});
+        if (org.length > 0) {
+            DynamicObject orgInfo = BusinessDataServiceHelper.loadSingle(org[0].getPkValue(), org[0].getDynamicObjectType().getName());
+            DynamicObject ywdyOrg = orgInfo.getDynamicObject("fromorg");
+            if (ywdyOrg != null) {
+                return ywdyOrg.getLong("id");
+            }
+        }
+        return null;
+    }
 }

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

@@ -62,22 +62,22 @@ public class CreatDatPlugin extends AbstractListPlugin {
             if (nckd_url.equals("/var/appstatic/")) {
                 nckd_url="/home/kingdee/cosmic/nginx-appstatic/store/appstatic/";
             }
-            //生成文件的路径
-            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 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

@@ -801,8 +801,6 @@ public class TestPlugin  extends AbstractListPlugin {
         if ("connect".equals(e.getOperateKey()))
         {
             InterFaceImgUtils interFaceImgUtils=new InterFaceImgUtils("produceurl");
-            interFaceImgUtils.getServerPassword();
-            interFaceImgUtils.getHost();
 
         }
 

src/main/java/sys/sc/opplugin/utils/InterFaceImgUtils.java

@@ -23,7 +23,7 @@ public class InterFaceImgUtils {
                 .loadSingle(nckd_jkpzxx,new QFilter[]{new QFilter("number","=",URL)});
     }
     //端口号
-    public int getHost() {
+    public int getProt() {
         return jkpzxx.getInt("nckd_port");
     }
     //服务器地址

src/main/java/sys/sc/opplugin/utils/SftpClient.java

@@ -51,8 +51,11 @@ public class SftpClient {
     public void fileCreat(String localFilePath,String remoteFilePath) throws SftpException {
         //本地服务器传到服务器文件
         sftpChannel.put(localFilePath,remoteFilePath);
+    }
 
-
+    //创建文件夹
+    public void creatDir(String path) throws SftpException {
+        sftpChannel.mkdir(path);
     }
 
     // 断开连接

src/main/java/sys/sc/task/CreatDatDailyTask.java

@@ -15,11 +15,14 @@ import kd.bos.schedule.executor.AbstractTask;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import scala.Dynamic;
 import sys.sc.opplugin.utils.DatFileCreatUtils;
+import sys.sc.opplugin.utils.InterFaceImgUtils;
 import sys.sc.opplugin.utils.SftpClient;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -66,45 +69,53 @@ public class CreatDatDailyTask extends AbstractTask {
             String bizappnum=item.getString("nckd_biazppnum");
             //接口配置信息获取
             //读取接口配置信息获取
-            QFilter qFilter=new QFilter("number",QCP.equals,"creatdat");
-            DynamicObject jkdataDy= BusinessDataServiceHelper.loadSingle(nckd_jkpzxx,
-                    "id,number,name,nckd_servername" +
-                            ",nckd_port,nckd_url,nckd_filename,nckd_user" +
-                            ",nckd_password,nckd_split,nckd_endsign",new QFilter[]{qFilter});
+            InterFaceImgUtils interFaceImgUtils=new InterFaceImgUtils("creatdat");
             //服务器路径
-            String nckd_url=jkdataDy.getString("nckd_url");
+            String nckd_url=interFaceImgUtils.getServerUrl();
             if (nckd_url.equals("/var/appstatic/")) {
                 nckd_url="/home/kingdee/cosmic/nginx-appstatic/store/appstatic/";
             }
             //分割符号
-            String spiltsign=jkdataDy.getString("nckd_split");
+            String spiltsign=interFaceImgUtils.getServerSplit();
             //结束符号
-            String endsign=jkdataDy.getString("nckd_endsign");
+            String endsign=interFaceImgUtils.getServerEndsign();
             //上传文件到服务器中
             //服务器端口
-            String host=jkdataDy.getString("nckd_servername");
+            String host=interFaceImgUtils.getServerName();
             //服务器用户名
-            String username=jkdataDy.getString("nckd_user");
+            String username=interFaceImgUtils.getServerUser();
             //服务器密码
-            String password=jkdataDy.getString("nckd_password");
+            String password=interFaceImgUtils.getServerPassword();
             //服务器路径
             //服务器端口号
-            int port=jkdataDy.getInt("nckd_port");
+            int port= interFaceImgUtils.getProt();
             try {
+                //上传文件到服务器中
+                SftpClient sftpClient=new SftpClient(host,username,password,port);
+                //获取服务器连接
+                sftpClient.connect();
+                //创建文件夹，为当天日期
+                Date currentDate=new Date();
+                //设置日期格式
+                SimpleDateFormat sf=new SimpleDateFormat("yyyyMMdd");
+                String dateStr=sf.format(currentDate);
+                String filePathWithDate=nckd_url+dateStr;
+                //创建文件夹，名为当前日期
+                sftpClient.creatDir(filePathWithDate);
                 //临时文件
                 File localFile = File.createTempFile(tablenumber, ".dat");
+                File dest=new File(localFile.getParent()+File.separator+tablenumber.toUpperCase()+".dat");
+                //重命名文件
+                localFile.renameTo(dest);
                 //文件写入
-                DatFileCreatUtils datFileCreatUtils=new DatFileCreatUtils(tablenumber,bizappnum,fileList,localFile.getAbsolutePath(),spiltsign,endsign);
+                DatFileCreatUtils datFileCreatUtils=new DatFileCreatUtils(tablenumber,bizappnum,fileList,dest.getAbsolutePath(),spiltsign,endsign);
                 //生成dat文件到本地
                 datFileCreatUtils.creatDatFile();
-                //上传文件到服务器中
-                SftpClient sftpClient=new SftpClient(host,username,password,port);
-                //获取服务器连接
-                sftpClient.connect();
                 //从本地传文件到服务器
-                sftpClient.fileCreat(localFile.getAbsolutePath(),nckd_url);
+                sftpClient.fileCreat(dest.getAbsolutePath(),filePathWithDate);
                 //上传后删除临时文件
                 localFile.delete();
+                dest.delete();
                 //关闭连接
                 sftpClient.disconnect();
             } catch (IOException e) {