zhangyao 1 месяц назад
Родитель
Сommit
094332dad8

+ 9 - 2
com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/controller/contractCreateController.java

@@ -14,6 +14,7 @@ import com.actionsoft.bpms.util.DBSql;
 import com.actionsoft.sdk.local.SDK;
 import com.actionsoft.sdk.local.api.Logger;
 import com.awspaas.user.apps.donenow_ctt.service.contractService;
+import com.awspaas.user.apps.donenow_ctt.service.contractServiceAdj;
 import org.apache.commons.lang3.StringUtils;
 
 import java.sql.Connection;
@@ -448,11 +449,17 @@ public class contractCreateController {
         } finally {
             if (conn != null) DBSql.close(conn);
         }
-
         if (errMsg.length() > 0) {
-            if (succMsg.length() > 0) return ResponseObject.newWarnResponse(succMsg.toString() + errMsg.toString());
+            if (succMsg.length() > 0)
+                return ResponseObject.newWarnResponse(succMsg.toString() + errMsg.toString());
             return ResponseObject.newErrResponse(errMsg.toString());
         }
+
+        //分摊成本
+        for (BO contraService : services) {
+            contractServiceAdj.getInstance().paySplitServiceMonth(uc, contraService.getString("ID"));
+        }
+
         return ResponseObject.newOkResponse();
     }
 

+ 5 - 4
com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/service/contractService.java

@@ -391,6 +391,11 @@ public class contractService {
 
                 //采购--付款计划
                 contractServiceAdj.getInstance().editServicePurchaseEndDate(uc, contractServiceId, END_DATE);
+
+
+                //分摊成本
+                contractServiceAdj.getInstance().paySplitServiceMonth(uc, contractServiceId);
+
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -1225,10 +1230,6 @@ public class contractService {
             service.set("PERIOD", PERIOD);
             service.set("ADJUST_PERIOD", StringUtils.EMPTY);
         }
-
-        //分摊成本
-        contractServiceAdj.getInstance().paySplitServiceMonth(uc, service.getString("ID"));
-
         return true;
     }