From c9cac990ef6117c90823d4d0cba2afbbb6736dfa Mon Sep 17 00:00:00 2001 From: wangjie <805650258@qq.com> Date: Thu, 29 Jun 2023 09:49:02 +0800 Subject: [PATCH] =?UTF-8?q?#=E6=A0=A1=E9=AA=8C=E5=8A=A0=E7=8F=AD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E3=80=81=E8=A1=A5=E5=8D=A1=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=20=20=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=8A=A0=E7=8F=AD=E3=80=90=E5=88=B6=E9=80=A0=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E3=80=91=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E9=80=A0=20=E6=8E=A5=E5=8F=A3code=E8=BF=94?= =?UTF-8?q?=E5=9B=9E14=20billstatus=20=3D=202=20=E5=86=8D=E4=BC=A0?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interface.kr/checkJbrq.jsp | 9 +-- interface.kr/checkJbrqCount.jsp | 70 +++++++++++++++++++ src/com/engine/kr/entity/kq/KqGlobal.java | 5 ++ .../action/KrBatchOvertimeCreateAction.java | 19 ++++- 4 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 interface.kr/checkJbrqCount.jsp diff --git a/interface.kr/checkJbrq.jsp b/interface.kr/checkJbrq.jsp index e2485ec..fd74cef 100644 --- a/interface.kr/checkJbrq.jsp +++ b/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 + "' " + diff --git a/interface.kr/checkJbrqCount.jsp b/interface.kr/checkJbrqCount.jsp new file mode 100644 index 0000000..3e66b74 --- /dev/null +++ b/interface.kr/checkJbrqCount.jsp @@ -0,0 +1,70 @@ +<%@ page import="com.alibaba.fastjson.JSONObject" %> +<%@ page import="weaver.general.Util" %> + +<%@ 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()); +%> + + + diff --git a/src/com/engine/kr/entity/kq/KqGlobal.java b/src/com/engine/kr/entity/kq/KqGlobal.java index 1aa57b0..ffd305a 100644 --- a/src/com/engine/kr/entity/kq/KqGlobal.java +++ b/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"; } diff --git a/src/weaver/interfaces/kr/workflow/action/KrBatchOvertimeCreateAction.java b/src/weaver/interfaces/kr/workflow/action/KrBatchOvertimeCreateAction.java index 17b2a29..1341274 100644 --- a/src/weaver/interfaces/kr/workflow/action/KrBatchOvertimeCreateAction.java +++ b/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++; }