Bläddra i källkod

对接e管家修改

wanwei 7 månader sedan
förälder
incheckning
82191f8195

+ 3 - 11
src/main/java/fi/fa/opplugin/AssetMidBillOpPlugin.java

@@ -72,17 +72,9 @@ public class AssetMidBillOpPlugin extends AbstractListPlugin {
                     busProcess.set("nckd_detailtype", "E");//业务类型(E:资产调拨)
                     busProcess.set("nckd_mid_assert", pk);//中间表id
                     busProcess.set("nckd_source_type", "nckd_e_dispatch_mid");//源单类型
-                    //调出方向
-                    if ("0".equals(direction)) {
-                        busProcess.set("nckd_applierv", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//调出申请人
-                        busProcess.set("nckd_basedatafield4", ChangeDataUtils.getUser(info.getString("nckd_user_in")));//调入负责人
-                        busProcess.set("creator", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//创建人
-                    }//调入方向
-                    else if ("1".equals(direction)) {
-                        busProcess.set("nckd_applierv", ChangeDataUtils.getUser(info.getString("nckd_user_in")));//调出申请人
-                        busProcess.set("nckd_basedatafield4", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//调入负责人
-                        busProcess.set("creator", ChangeDataUtils.getUser(info.getString("nckd_user_in")));//创建人
-                    }
+                    busProcess.set("nckd_applierv", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//调出申请人
+                    busProcess.set("nckd_basedatafield4", ChangeDataUtils.getUser(info.getString("nckd_user_in")));//调入负责人
+                    busProcess.set("creator", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//创建人
 
                     List<String> codeList = ChangeDataUtils.getCardNumber(info);
                     QFilter filter = new QFilter("number", QCP.in, codeList);

+ 2 - 9
src/main/java/fi/fa/opplugin/FaChangeMidOpPlugin.java

@@ -64,15 +64,8 @@ public class FaChangeMidOpPlugin extends AbstractListPlugin {
                     busProcess.set("nckd_detailtype", "N");//业务类型(E:资产调拨)
                     busProcess.set("nckd_mid_assert", pk);//中间表id
                     busProcess.set("nckd_source_type", "nckd_e_change_mid");//源单类型
-                    //调出方向
-                    if("0".equals(direction)){
-                        busProcess.set("creator", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//创建人
-                        busProcess.set("nckd_applierv", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//调拨申请人
-                    }//调入方向
-                    else if ("1".equals(direction)) {
-                        busProcess.set("creator", ChangeDataUtils.getUser(info.getString("nckd_user_in")));//创建人
-                        busProcess.set("nckd_applierv", ChangeDataUtils.getUser(info.getString("nckd_user_in")));//调拨申请人
-                    }
+                    busProcess.set("creator", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//创建人
+                    busProcess.set("nckd_applierv", ChangeDataUtils.getUser(info.getString("nckd_user_out")));//调拨申请人
 
                     List<String> codeList =ChangeDataUtils.getCardNumber(info);
                     QFilter filter = new QFilter("number", QCP.in,codeList);

+ 6 - 3
src/main/java/fi/fa/webService/DispatchMidController.java

@@ -106,16 +106,19 @@ public class DispatchMidController implements Serializable {
         minInfo.set("status", "A");//暂存
         //拼接资产信息的组织和编码
         String cardNumber = "";
+        int counts = 0;
         JSONArray assetArray = jsonObject.getJSONArray("asset");
         for (int j = 0; j < assetArray.size(); j++) {
             //判断资产的组织是否相同
             JSONObject asset = assetArray.getJSONObject(j);
             String number = asset.getString("number");
             String orgId = asset.getString("orgId");
+            int count = asset.getString("count") == null ? 1 : Integer.parseInt(asset.getString("count"));
+            counts += count;
             cardNumber = cardNumber + number+ ":" + orgId + ",";
-            if ("2".equals(jsonObject.getString("dispatchType"))) {
-                minInfo.set("nckd_count", asset.getString("count"));//资产数量
-            }
+        }
+        if ("2".equals(jsonObject.getString("dispatchType"))) {
+            minInfo.set("nckd_count", String.valueOf(counts));//资产数量
         }
         minInfo.set("nckd_card_number", cardNumber);
         SaveServiceHelper.save(new DynamicObject[]{minInfo});