From 1879c102407b55455ce7d0d7ef34e10325bf6ff2 Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Mon, 23 Dec 2024 17:28:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4OA=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=90=8C=E6=AD=A5=E5=88=B0U8C=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=9C=AA=E7=94=9F=E6=88=90=E4=B8=8B=E6=B8=B8=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E8=B0=83=E7=94=A8U8C=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalesBillingServiceImpl.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java index 4b943082..693dace6 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java @@ -29,9 +29,10 @@ public class SalesBillingServiceImpl implements ISalesBillingService { private IU8cSalesBillingService iu8cSalesBillingService; private final String appId = "800035"; + + private final String apiCode = "8000350047"; //这个接口调错了。要用开发的那个审批接口 - //private final String apiCode = "8000350047"; - private final String apiCode = "8000350060"; +// private final String apiCode = "8000350060"; private final String publicKey = "ZJYATW/MfYZX7zF0eAh4DJXbyTLwUtwSoSz5Y/o1ksAaN/dCe7eDIk+3zDUT+v578prj"; private final String secretKey = "+5BUkLQh3iX3VHgEt5bE2IPh+ZeebGvDaEspsvVu739Ar6sFnwg+fpPod4t6XhoTj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="; @@ -124,9 +125,11 @@ public class SalesBillingServiceImpl implements ISalesBillingService { queryinfo.put("code", code); queryinfo.put("corp", entity.getCorp());//公司编码 queryinfo.put("date_begin", entity.getDateBegin());//单据开始日期 - queryinfo.put("date_end", entity.getDateEnd());//单据结束日期 - approveinfo.put("approvid", entity.getApprovid());//审批人 - approveinfo.put("approveDate", entity.getApprovedate());//审核时间 +// queryinfo.put("date_end", entity.getDateEnd());//单据结束日期 + queryinfo.put("date_end", "2099-05-24");//单据结束日期 +// approveinfo.put("approvid", entity.getApprovid());//审批人 + approveinfo.put("approvid", "15715849962");//审批人 + approveinfo.put("approveDate", "entity.getApprovedate()");//审核时间 approveinfo.put("status", entity.getStatus());//审批状态（Y：通过，N：不通过，R：驳回） approveinfo.put("note", entity.getNote());//批语 @@ -135,14 +138,14 @@ public class SalesBillingServiceImpl implements ISalesBillingService { params = data.toJSONString(); //用新的审批接口 - JSONObject jsonObject = new JSONObject(); - jsonObject.put("billno",entity.getCode()); - jsonObject.put("corpcode",entity.getCorp()); - jsonObject.put("billType","saleinvoice"); - jsonObject.put("userCode","15715849962"); - jsonObject.put("ckeckResult","Y"); - jsonObject.put("ckeckNote","审批通过"); - params = jsonObject.toString(); +// JSONObject jsonObject = new JSONObject(); +// jsonObject.put("billno",entity.getCode()); +// jsonObject.put("corpcode",entity.getCorp()); +// jsonObject.put("billType","saleinvoice"); +// jsonObject.put("userCode","15715849962"); +// jsonObject.put("ckeckResult","Y"); +// jsonObject.put("ckeckNote","审批通过"); +// params = jsonObject.toString(); return params; } From 0890064d6ea52097cb8dcd921a7f6c580a8ac34c Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Sat, 28 Dec 2024 15:13:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=90=8C=E6=AD=A5=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java index 693dace6..2dea2d9b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java @@ -129,7 +129,7 @@ public class SalesBillingServiceImpl implements ISalesBillingService { queryinfo.put("date_end", "2099-05-24");//单据结束日期 // approveinfo.put("approvid", entity.getApprovid());//审批人 approveinfo.put("approvid", "15715849962");//审批人 - approveinfo.put("approveDate", "entity.getApprovedate()");//审核时间 + approveinfo.put("approveDate", entity.getApprovedate());//审核时间 approveinfo.put("status", entity.getStatus());//审批状态（Y：通过，N：不通过，R：驳回） approveinfo.put("note", entity.getNote());//批语 From b4475469515868c15566da2c0fabd7899b65c284 Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Mon, 13 Jan 2025 09:49:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=9B=86=E6=88=90=E6=8F=92=E4=BB=B6=E5=86=85=E5=AE=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=A0=B9=E6=8D=AE=E6=8F=92=E4=BB=B6?= =?UTF-8?q?idlike=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA=3D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysIntegratedForegroundTaskEntity.xml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml index 617674c7..e99309ea 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml @@ -19,24 +19,24 @@ id - ,workshop_name - ,plug_id - ,plug_name - ,remark - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id + ,workshop_name + ,plug_id + ,plug_name + ,remark + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id - +