#校验加班数据、补卡数据不能重复提交 批量加班【制造中心】推送数据接口改造 接口code返回14 billstatus = 2 再传第一次

interface.kr/checkJbrq.jsp

@@ -10,7 +10,8 @@
   Design Ideas：
   康瑞-加班申请【制造中心】流程
     需要：校验明细表加班日期是否重复
-
+    测试环境表名：formtable_main_23、formtable_main_24
+    生产环境表名：formtable_main_19、formtable_main_20
 --%>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%
@@ -32,7 +33,7 @@
                 " SELECT  " +
                 "  count( 1 )   " +
                 " FROM  " +
-                "  formtable_main_23 f  " +
+                "  formtable_main_19 f  " +
                 "  LEFT JOIN workflow_requestbase w ON f.requestid = w.requestid   " +
                 " WHERE  " +
                 "  f.resourceId = '" + xm + "'   " +
@@ -42,8 +43,8 @@
                 " SELECT  " +
                 "  count( 1 )   " +
                 " FROM  " +
-                "  formtable_main_24_dt1 t1  " +
-                "  LEFT JOIN formtable_main_24 t ON t1.mainid = t.id  " +
+                "  formtable_main_20_dt1 t1  " +
+                "  LEFT JOIN formtable_main_20 t ON t1.mainid = t.id  " +
                 "  LEFT JOIN workflow_requestbase w1 ON t.requestid = w1.requestid   " +
                 " WHERE  " +
                 "  t1.xm = '" + xm + "'   " +

interface.kr/checkJbrqCount.jsp

@@ -0,0 +1,70 @@
+<%@ page import="com.alibaba.fastjson.JSONObject" %>
+<%@ page import="weaver.general.Util" %>
+<jsp:useBean id="bb" class="weaver.general.BaseBean"/>
+<%@ page import="weaver.conn.RecordSet" %>
+<%@ page import="com.alibaba.fastjson.JSONArray" %>
+
+
+<%--
+  User: wangj
+  Design Ideas：
+  康瑞-加班申请【制造中心】流程
+    需要：校验明细表加班日期是否重复
+
+--%>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%
+    JSONObject res = new JSONObject();
+    RecordSet rs = new RecordSet();
+
+    String dataStr = Util.null2String(request.getParameter("dataJson"));
+    JSONArray dataArr = JSONArray.parseArray(dataStr);
+    String sql = "";
+    JSONArray resArr = new JSONArray();
+    for (int i = 0; i < dataArr.size(); i++) {
+        JSONObject data = (JSONObject) dataArr.get(i);
+        String xm = Util.null2String(data.get("xm"));
+        String ksrq = Util.null2String(data.get("ksrq"));
+        String index = Util.null2String(data.get("index"));
+
+        sql = "SELECT  \n" +
+                "                 f.requestid as requestid\n" +
+                "                FROM  \n" +
+                "                 formtable_main_19 f  \n" +
+                "                 LEFT JOIN workflow_requestbase w ON f.requestid = w.requestid   \n" +
+                "                WHERE  \n" +
+                "                 f.resourceId = '"+xm+"'   \n" +
+                "                 AND f.fromDate = '"+ksrq+"'   \n" +
+                "                 AND w.currentnodetype IN ( 1, 2, 3 ) union all SELECT  \n" +
+                "                 t.requestid as requestid   \n" +
+                "                FROM  \n" +
+                "                 formtable_main_20_dt1 t1  \n" +
+                "                 LEFT JOIN formtable_main_20 t ON t1.mainid = t.id  \n" +
+                "                 LEFT JOIN workflow_requestbase w1 ON t.requestid = w1.requestid   \n" +
+                "                WHERE  \n" +
+                "                 t1.xm = '"+xm+"'   \n" +
+                "                 AND t1.ksrq = '"+ksrq+"'   \n" +
+                "                AND w1.currentnodetype IN ( 1, 2, 3 )";
+        rs.execute(sql);
+        int count = 0;
+        String requestids = "";
+        while (rs.next()) {
+            count ++;
+            requestids = requestids + "," + Util.null2String(rs.getString("requestid"));
+
+        }
+        JSONObject obj = new JSONObject();
+        obj.put(index,count);
+        obj.put("requestids",requestids.substring(1,requestids.length()));
+        resArr.add(obj);
+    }
+
+
+
+    res.put("resArr", resArr);
+
+    out.print(res.toJSONString());
+%>
+
+
+

src/com/engine/kr/entity/kq/KqGlobal.java

@@ -22,6 +22,11 @@ public class KqGlobal {
      */
     public static final String SUC_CODE = "1";
 
+    /**
+     * 响应 新增时单据编号已存在code
+     */
+    public static final String REPEAT_CODE = "14";
+
     public static final String IGNORE_CODE = "99";
 
 }

src/weaver/interfaces/kr/workflow/action/KrBatchOvertimeCreateAction.java

@@ -125,8 +125,23 @@ public class KrBatchOvertimeCreateAction implements Action {
             JSONObject jsonObject = JSONObject.parseObject(returnStr);
             String code = jsonObject.getString("code");
             if (!KqGlobal.SUC_CODE.equals(code)) {
-                requestInfo.getRequestManager().setMessagecontent(jsonObject.getString("msg"));
-                isRun = false;
+                //判断接口返回id 14 新增时单据重复 修改billStat=2 再推一次数据
+                if(KqGlobal.REPEAT_CODE.equals(code)){
+                    params.put("billStat", 2);
+                    new BaseBean().writeLog("########更新批量加班流程,requestid={" + requestInfo.getRequestid() + "]，传参:"+ JSON.toJSONString(params));
+
+                    String reResStr = HttpUtil.post(KqGlobal.POST_URL + KqInteractiveEnum.OVERTIME_CREATE.getPostPath(), params);
+                    new BaseBean().writeLog("########更新批量加班流程,requestid={" + requestInfo.getRequestid() + "]，接口响应数据:"+ returnStr);
+                    JSONObject reObject = JSONObject.parseObject(reResStr);
+                    String reCode = reObject.getString("code");
+                    if (!KqGlobal.SUC_CODE.equals(reCode)) {
+                        requestInfo.getRequestManager().setMessagecontent(reObject.getString("msg"));
+                        isRun = false;
+                    }
+                }else{
+                    requestInfo.getRequestManager().setMessagecontent(jsonObject.getString("msg"));
+                    isRun = false;
+                }
             }
             index++;
         }