采购

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/at/getFormField.java

@@ -46,9 +46,9 @@ public class getFormField extends AbstExpression {
             return null;
         fieldName = boItemModel.getName();
         if (boName.equals("BO_EU_DND_GENERAL"))
-            return DBSql.getString("select " + fieldName + " FROM " + boName + " where ID =? OR OID=?", new Object[]{boIdOrBindid, boIdOrBindid});
+            return DBSql.getString("select " + fieldName + " FROM " + boName + " where (ID =? OR OID=?) ", new Object[]{boIdOrBindid, boIdOrBindid});
         else
-            return DBSql.getString("select " + fieldName + " FROM " + boName + " where ID =? OR BINDID=?", new Object[]{boIdOrBindid, boIdOrBindid});
+            return DBSql.getString("select " + fieldName + " FROM " + boName + " where (ID =? OR BINDID=?)", new Object[]{boIdOrBindid, boIdOrBindid});
     }
 }
 

com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/controller/ivtOrderController.java

@@ -621,7 +621,24 @@ public class ivtOrderController {
         if (costList.isEmpty())
             return ResponseObject.newErrResponse("没有找到对应的合同产品");
 
+
         String costIds = costList.stream().map(cost -> cost.getString("ID")).collect(Collectors.joining(","));
+
+        List<String> bindids = DBSql.getList("select BINDID from BO_EU_DNIVT_ORDER_PRODUCT where ISEND=0 AND FIND_IN_SET(CONTRACT_COST_ID,'" + costIds + "')>0", String.class);
+
+        if (!bindids.isEmpty()) {
+            for (String bindid : bindids) {
+                if (!SDK.getProcessAPI().isEndById(bindid)) {
+
+                    String processUrl = SDK.getFormAPI().getFormURL(SDK.getPortalAPI().getPortalUrl(), uc.getSessionId(), bindid, null, 1, null, null, null, true);
+
+                    ResponseObject responseObject = ResponseObject.newOkResponse();
+                    responseObject.setData(processUrl);
+                    return responseObject;
+                }
+            }
+        }
+
         return createPurchaseOrder(uc, costIds);
     }
 
@@ -673,11 +690,18 @@ public class ivtOrderController {
                     continue;
                 }
 
-                List<String> bindids = DBSql.getList("select BINDID from BO_EU_DNIVT_ORDER_PRODUCT where CONTRACT_COST_ID=? or (CONTRACT_SERVICE_ID=? AND CONTRACT_SERVICE_ID IS NOT NULL AND CONTRACT_SERVICE_ID<>'') ", String.class, new Object[]{cost.getString("ID"), cost.getString("SERVICE_ID")});
+                List<String> bindids = DBSql.getList("select BINDID from BO_EU_DNIVT_ORDER_PRODUCT where ISEND=0 AND (CONTRACT_COST_ID=? or (CONTRACT_SERVICE_ID=? AND CONTRACT_SERVICE_ID IS NOT NULL AND CONTRACT_SERVICE_ID<>'')) ", String.class, new Object[]{cost.getString("ID"), cost.getString("SERVICE_ID")});
                 if (!bindids.isEmpty()) {
                     for (String bindid : bindids) {
                         if (!SDK.getProcessAPI().isEndById(bindid)) {
-                            return ResponseObject.newErrResponse("有订单正在处理中，请勿重复提交");
+                            // return ResponseObject.newErrResponse("有订单正在处理中，请勿重复提交");
+
+                            String processUrl = SDK.getFormAPI().getFormURL(SDK.getPortalAPI().getPortalUrl(), uc.getSessionId(), bindid, null, 1, null, null, null, true);
+
+                            ResponseObject responseObject = ResponseObject.newOkResponse();
+                            responseObject.setData(processUrl);
+                            return responseObject;
+
                         }
                     }
                 }

com.awspaas.user.apps.donenow_sys/template/page/UDF.html

@@ -7,11 +7,25 @@
     <link rel="stylesheet" href="../commons/css/awsui.css"/>
     <style>
         .awsui-col-lg-10 {
-            width:80%;
+            width: 80%;
         }
+
         .awsui-col-lg-2 {
-            width:15%;
+            width: 15%;
+        }
+
+        .awsui-text {
+            font-size: 15px;
+        }
+
+        .awsui-input {
+            font-size: 15px;
         }
+
+        body {
+            font-size: 15px;
+        }
+
     </style>
 </head>
 <body>
@@ -19,7 +33,6 @@
     <div class="awsui-container-fluid" id="udfForm">
 
 
-
     </div>
 </div>