From eb93b202bb90d2282d7b54fae4ccca4bb2d20876 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:35:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor(deletedata):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E5=B7=A5=E5=85=B7=E4=BB=A5?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E6=96=B0=E7=9A=84=E4=B8=9A=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B-=20=E5=9C=A8=20DeleteU8cDataUtilEntity.xml=20?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20'0001A11000000000H1FM'=20-=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20SoSaleReturnPluginInitializerToCTest=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=20-=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20DeleteU8cDataUtil=20=E4=B8=AD=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BD=BF=E7=94=A8=20vreceiptcode=20=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=20dbilldate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/sales/SoSaleReturnPluginInitializerToCTest.java | 5 ++--- .../hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java | 4 ++-- .../java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java | 2 +- .../frame/deletedata/entity/DeleteU8cDataUtilEntity.xml | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java index 1fb82abc..fe3c7359 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java @@ -56,14 +56,13 @@ public class SoSaleReturnPluginInitializerToCTest { e.printStackTrace(); } - // BdBusitypeEntity bdBusitypeEntity1 = queryBdBusitypeUtil.queryBdBusitype("TOC销售"); // System.out.println("TOC销售:" + bdBusitypeEntity1.getPkBusitype()); BdBusitypeEntity bdBusitypeEntity2 = queryBdBusitypeUtil.queryBdBusitype("TOC冲发出商品"); System.out.println("TOC冲发出商品:" + bdBusitypeEntity2.getPkBusitype()); BdBusitypeEntity bdBusitypeEntity3 = queryBdBusitypeUtil.queryBdBusitype("TOC确认收入"); System.out.println("TOC确认收入:" + bdBusitypeEntity3.getPkBusitype()); -// BdBusitypeEntity bdBusitypeEntity4 = queryBdBusitypeUtil.queryBdBusitype("TOC售后完成"); -// System.out.println("TOC售后完成:" + bdBusitypeEntity4.getPkBusitype()); + BdBusitypeEntity bdBusitypeEntity4 = queryBdBusitypeUtil.queryBdBusitype("TOC售后完成"); + System.out.println("TOC售后完成:" + bdBusitypeEntity4.getPkBusitype()); } } \ No newline at end of file diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java index 151f00bd..86161c5a 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java @@ -31,9 +31,9 @@ public class DeleteU8cDataUtilTest { //删除销售出库单 // deleteU8cDataUtil.deleteIcGeneralH(); //删除销售订单 -// deleteU8cDataUtil.deleteSoSale(); + deleteU8cDataUtil.deleteSoSale(); //销售订单取消审核 - deleteU8cDataUtil.cancelSignatureSoSale(); +// deleteU8cDataUtil.cancelSignatureSoSale(); } catch (Exception e) { e.printStackTrace(); } diff --git a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java index 38123070..ce587425 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -71,7 +71,7 @@ public class DeleteU8cDataUtil { DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i); List stringList = new ArrayList<>(); - stringList.add(deleteU8cDataUtilEntity.getDbilldate()); + stringList.add(deleteU8cDataUtilEntity.getVreceiptcode()); JsonRootBeanCancelSignature jsonRootBeanCancelSignature = new JsonRootBeanCancelSignature(); diff --git a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml index c628f858..0c876fac 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml +++ b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml @@ -24,7 +24,7 @@ so_saleinvoice a LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp WHERE - a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6') + a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6','0001A11000000000H1FM') AND a.dbilldate >= '2024-11-01 00:00:00' AND a.dbilldate <= '2024-11-30 23:59:59' AND a.FSTATUS = 1 @@ -52,7 +52,7 @@ ic_general_h a LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp WHERE - a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6') + a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6','0001A11000000000H1FM') AND a.dbilldate >= '2024-11-01 00:00:00' AND a.dbilldate <= '2024-11-30 23:59:59' AND a.fbillflag = 2 @@ -81,7 +81,7 @@ so_sale a LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp WHERE - a.cbiztype IN ( '0001A110000000001TH5', '0001A110000000001TH6' ) + a.cbiztype IN ( '0001A110000000001TH5', '0001A110000000001TH6' ,'0001A11000000000H1FM') AND a.dbilldate >= '2024-11-01 00:00:00' AND a.dbilldate <= '2024-11-30 23:59:59'