修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/NonContractExpensesServiceImpl.java

@@ -68,12 +68,12 @@ public class NonContractExpensesServiceImpl extends ServiceImpl<NonContractExpen
             //经营费用
             if("1".equals(nonContractExpenses.getExpenseType())){
                 reveExpeInfo.setReexType("经营收入");
-                reveExpeInfo.setReexTypeKey("3");
+                reveExpeInfo.setReexTypeKey("5");
             }
             //仓库费用
             else{
                 reveExpeInfo.setReexType("仓库收入");
-                reveExpeInfo.setReexTypeKey("5");
+                reveExpeInfo.setReexTypeKey("3");
             }
             reveExpeInfo.setAmountMoney(nonContractExpenses.getAmountMoney());
             reveExpeInfo.setExpenseName(nonContractExpenses.getExpenseName());
@@ -134,12 +134,12 @@ public class NonContractExpensesServiceImpl extends ServiceImpl<NonContractExpen
         //经营费用
         if("1".equals(nonContractExpenses.getExpenseType())){
             reveExpeInfo.setReexType("经营支出");
-            reveExpeInfo.setReexTypeKey("4");
+            reveExpeInfo.setReexTypeKey("6");
         }
         //仓库费用
         else{
             reveExpeInfo.setReexType("仓库支出");
-            reveExpeInfo.setReexTypeKey("6");
+            reveExpeInfo.setReexTypeKey("4");
         }
         reveExpeInfo.setAmountMoney(nonContractExpenses.getAmountMoney());
         reveExpeInfo.setExpenseName(nonContractExpenses.getExpenseName());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ReveExpeInfoServiceImpl.java

@@ -70,10 +70,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","2")
                         .eq("delete_flag","0"));
                 if(outContractReveExpeInfoList != null){
-                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
-                        outContractMoney = outContractMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    for(int i = 0;i<outContractReveExpeInfoList.size();i++){
+                        outContractMoney = outContractMoney + outContractReveExpeInfoList.get(i).getAmountMoney();
                     }
-                        reveExpeInfo1.setInContractMoney(outContractMoney);
+                        reveExpeInfo1.setOutContractMoney(outContractMoney);
                 }
                 //定义仓库收入
                 Double inWarehouseMoney = 0.0;
@@ -83,10 +83,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","3")
                         .eq("delete_flag","0"));
                 if(inWarehouseReveExpeInfoList != null){
-                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
-                        inWarehouseMoney = inWarehouseMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    for(int i = 0;i<inWarehouseReveExpeInfoList.size();i++){
+                        inWarehouseMoney = inWarehouseMoney + inWarehouseReveExpeInfoList.get(i).getAmountMoney();
                     }
-                        reveExpeInfo1.setInContractMoney(inWarehouseMoney);
+                        reveExpeInfo1.setInWarehouseMoney(inWarehouseMoney);
                 }
                 //定义仓库支出
                 Double outWarehouseMoney = 0.0;
@@ -96,10 +96,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","4")
                         .eq("delete_flag","0"));
                 if(outWarehouseReveExpeInfoList != null){
-                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
+                    for(int i = 0;i<outWarehouseReveExpeInfoList.size();i++){
                         outWarehouseMoney = outWarehouseMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
                     }
-                        reveExpeInfo1.setInContractMoney(outWarehouseMoney);
+                        reveExpeInfo1.setOutWarehouseMoney(outWarehouseMoney);
                 }
                 //定义经营收入
                 Double inManageMoney = 0.0;
@@ -109,10 +109,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","5")
                         .eq("delete_flag","0"));
                 if(inManageReveExpeInfoList != null){
-                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
-                        inManageMoney = inManageMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    for(int i = 0;i<inManageReveExpeInfoList.size();i++){
+                        inManageMoney = inManageMoney + inManageReveExpeInfoList.get(i).getAmountMoney();
                     }
-                        reveExpeInfo1.setInContractMoney(inManageMoney);
+                        reveExpeInfo1.setInManageMoney(inManageMoney);
                 }
                 //定义经营支出
                 Double outManageMoney = 0.0;
@@ -122,10 +122,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","6")
                         .eq("delete_flag","0"));
                 if(outManageReveExpeInfoList != null){
-                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
-                        outManageMoney = outManageMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    for(int i = 0;i<outManageReveExpeInfoList.size();i++){
+                        outManageMoney = outManageMoney + outManageReveExpeInfoList.get(i).getAmountMoney();
                     }
-                        reveExpeInfo1.setInContractMoney(outManageMoney);
+                        reveExpeInfo1.setOutManageMoney(outManageMoney);
                 }
             }
         }