zhangyao 3 недель назад
Родитель
Сommit
7ab9db3a9a

+ 0 - 1
com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/service/InvoiceService.java

@@ -453,7 +453,6 @@ public class InvoiceService {
         // 1. 基础校验:空值过滤
         if (StringUtils.isBlank(accDeduIds))
             return "参数错误";
-
         String[] dedIdArr = accDeduIds.split(",");
 
         StringBuilder where = new StringBuilder("(");

+ 31 - 0
com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/controller/ivtOrderController.java

@@ -1129,4 +1129,35 @@ public class ivtOrderController {
     }
 
 
+    /**
+     * 激活采购计划
+     * @param uc
+     * @param bindId
+     * @return
+     */
+    @Mapping("com.awspaas.user.apps.donenow_ivt.ivt_reactivate_pu")
+    public ResponseObject reactivate_pu(UserContext uc, String bindId) {
+        if (StringUtils.isBlank(bindId))
+            return ResponseObject.newErrResponse("参数错误");
+        if (SDK.getProcessAPI().isEndById(bindId)) {
+
+            //未进行 过接收才能 复活
+            if (DBSql.getInt("SELECT COUNT(a.ID) FROM BO_EU_DNIVT_RECEIVE_SUB a JOIN bo_eu_dnivt_order_product b ON a.ORDER_PRODUCT_ID=b.ID JOIN BO_EU_DNIVT_ORDER c ON b.BINDID=c.BINDID OR b.ORDER_ID=c.ID WHERE c.BINDID=? ", new Object[]{bindId}) > 0)
+                return ResponseObject.newErrResponse("已进行接收操作,不允许再复活流程!");
+
+            //如果 关联的服务进行了 付款 也不能 复活
+            if (DBSql.getInt("SELECT COUNT(a.ID)  FROM BO_EU_DNIVT_ORDER_PAYMENT_PLAN a JOIN BO_EU_DNIVT_ORDER b ON a.ORDER_ID=b.ID WHERE b.BINDID=? AND a.PAY_AMOUNT<>0 and a.PAY_AMOUNT is not NULL ", new Object[]{bindId}) > 0)
+                return ResponseObject.newErrResponse("进行了付款操作,不允许再复活流程!");
+
+            SDK.getProcessAPI().reactivateById(bindId, "obj_bfa9227717bb41d69161f1ae8152d9ce", false, uc.getUID(), uc.getUID(), null);
+
+            DBSql.update("update BO_EU_DNIVT_ORDER set STATUS_ID=? where BINDID=?", new Object[]{"2147", bindId});
+
+        } else {
+            return ResponseObject.newErrResponse("流程未结束");
+        }
+        return ResponseObject.newOkResponse();
+    }
+
+
 }