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'