From 17d42022bf0c40106310f49d4e4aa305b88e3b98 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 19 Dec 2024 17:03:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor(deletedata):=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81-=20=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E3=80=81=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E5=92=8C=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9D=A1=E4=BB=B6-=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=20-=20=E6=B7=BB=E5=8A=A0=20deleteTarget=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AE=9E=E7=8E=B0=E5=BC=82=E6=AD=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SoSaleReturnPluginInitializerToCTest.java | 8 ++++---- .../lets/util/DeleteU8cDataUtilTest.java | 3 ++- .../frame/deletedata/DeleteU8cDataUtil.java | 19 +++++++++++++++++-- .../entity/DeleteU8cDataUtilEntity.xml | 8 ++++---- 4 files changed, 27 insertions(+), 11 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 25c917bf..1fb82abc 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 @@ -57,13 +57,13 @@ public class SoSaleReturnPluginInitializerToCTest { } - BdBusitypeEntity bdBusitypeEntity1 = queryBdBusitypeUtil.queryBdBusitype("TOC销售"); - System.out.println("TOC销售:" + bdBusitypeEntity1.getPkBusitype()); +// 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 e188c125..1be20fa0 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 @@ -29,8 +29,9 @@ public class DeleteU8cDataUtilTest { //删除销售发票 // deleteU8cDataUtil.deleteSoSaleinvoice(); //删除销售出库单 - deleteU8cDataUtil.deleteIcGeneralH(); +// deleteU8cDataUtil.deleteIcGeneralH(); //删除销售订单 + deleteU8cDataUtil.deleteSoSale(); } 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 da56c31c..961b7c37 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -2,7 +2,7 @@ package com.hzya.frame.deletedata; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +//import com.alibaba.fastjson.JSONObject; import com.hzya.frame.deletedata.dao.DeleteU8cDataUtilDao; import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity; //import com.hzya.frame.plugin.lets.dao.ISoSaleinvoiceDao; @@ -11,7 +11,7 @@ import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity; import com.hzya.frame.deletedata.vo.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -33,6 +33,21 @@ public class DeleteU8cDataUtil { protected Logger logger = LogManager.getLogger(super.getClass()); + public void deleteTarget() { + Thread thread = new Thread(new Runnable() { + @Override + public void run() { + //删除销售发票 + deleteSoSaleinvoice(); + //删除销售出库单 + deleteIcGeneralH(); + //删除销售订单 + deleteSoSale(); + } + }, "删除U8C11月份TOC对应的销售发票、销售出库单、销售订单"); + thread.start(); + } + /** * 删除销售订单 */ 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 eea03e32..f903b272 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 ( '0001A110000000000E7S', '0001A110000000001TH5', '0001A110000000001TH6', '0001A11000000000H1FM' ) + a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6') 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 ( '0001A110000000000E7S', '0001A110000000001TH5', '0001A110000000001TH6', '0001A11000000000H1FM' ) + a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6') AND a.dbilldate >= '2024-11-01 00:00:00' AND a.dbilldate <= '2024-11-30 23:59:59' AND a.fbillflag = 2 @@ -80,10 +80,10 @@ so_sale a LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp WHERE - a.cbiztype IN ( '0001A110000000000E7S', '0001A110000000001TH5', '0001A110000000001TH6', '0001A11000000000H1FM' ) + a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6') AND a.dbilldate >= '2024-11-01 00:00:00' AND a.dbilldate <= '2024-11-30 23:59:59' - AND a.fstatus = 2 + AND a.fstatus = 1 AND a.dr = 0