From bc883f613abbae91ea283aed72965905c03a9b60 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Tue, 11 Feb 2025 08:59:09 +0800 Subject: [PATCH] =?UTF-8?q?refactor(deletedata):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增取消签字、弃审等功能 - 优化查询接口，精确匹配业务类型 - 添加应收单、销售发票等数据的删除和弃审方法 - 更新实体类和XML配置，支持新增功能 --- .../SoSaleReturnPluginInitializerToCTest.java | 7 +- .../lets/util/DeleteU8cDataUtilTest.java | 26 ++- .../lets/util/DeleteU8cDataUtilTest2.java | 65 ++++++ .../frame/deletedata/DeleteU8cDataUtil.java | 202 +++++++++++++++--- .../deletedata/dao/DeleteU8cDataUtilDao.java | 31 +++ .../dao/impl/DeleteU8cDataUtilDaoImpl.java | 25 +++ .../entity/DeleteU8cDataUtilEntity.java | 28 +++ .../entity/DeleteU8cDataUtilEntity.xml | 100 +++++++-- .../frame/deletedata/vo/DeleteArapDjzbVo.java | 57 +++++ .../frame/deletedata/vo/JsonRootBean.java | 10 + 10 files changed, 502 insertions(+), 49 deletions(-) create mode 100644 buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest2.java create mode 100644 service/src/main/java/com/hzya/frame/deletedata/vo/DeleteArapDjzbVo.java 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 fd0ebd22..34862e1e 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 @@ -48,7 +48,7 @@ public class SoSaleReturnPluginInitializerToCTest { try { // soSaleReturnPluginInitializerToC.startImplementByTradeTime("2024-12-23 23:05:34", "2024-12-23 23:05:34", "2"); - soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025010900002384", "tran"); +// soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025010900002384", "tran"); // soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-12-24 16:02:17", "2024-12-24 16:02:17", "0"); @@ -81,7 +81,8 @@ public class SoSaleReturnPluginInitializerToCTest { // 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 86161c5a..f0ab9a05 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,33 @@ public class DeleteU8cDataUtilTest { //删除销售出库单 // deleteU8cDataUtil.deleteIcGeneralH(); //删除销售订单 - deleteU8cDataUtil.deleteSoSale(); +// deleteU8cDataUtil.deleteSoSale(); //销售订单取消审核 // deleteU8cDataUtil.cancelSignatureSoSale(); + + + //2025年2月10日 20:20:39 + //销售出库单取消签字：TOC冲发出商品 +// deleteU8cDataUtil.cancelSignatureIcGeneralH(); + + //弃审应收单 * + deleteU8cDataUtil.abandoningReviewAccReceDoc(); + //删除应收单 +// deleteU8cDataUtil.deleteReviewAccReceDoc(); + + //弃审销售发票 * + deleteU8cDataUtil.abandonmentReviewSoSaleinvoice(); + //删除销售发票 * + deleteU8cDataUtil.deleteSoSaleinvoice(); + + //取消签字销售出库单 * TOC确认收入 注意⚠️ + deleteU8cDataUtil.cancelSignatureIcGeneralH("0001A110000000001TH6"); + //删除销售出库单 * + deleteU8cDataUtil.deleteIcGeneralH(); + + //取消签字销售订单 * + deleteU8cDataUtil.cancelSignatureSoSale(); + } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest2.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest2.java new file mode 100644 index 00000000..8fa401a0 --- /dev/null +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest2.java @@ -0,0 +1,65 @@ +package com.hzya.frame.plugin.lets.util; + +import com.hzya.frame.WebappApplication; +import com.hzya.frame.deletedata.DeleteU8cDataUtil; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.plugin.lets.util + * @Project：kangarooDataCenterV3 + * @name：DeleteU8cDataUtilTest + * @Date：2024/12/18 18:36 + * @Filename：DeleteU8cDataUtilTest + */ +@RunWith(SpringRunner.class) +@SpringBootTest(classes = WebappApplication.class) +public class DeleteU8cDataUtilTest2 { + + @Autowired + private DeleteU8cDataUtil deleteU8cDataUtil; + + @Test + public void deleteSoSaleinvoice() { + try { + //删除销售发票 +// deleteU8cDataUtil.deleteSoSaleinvoice(); + //删除销售出库单 +// deleteU8cDataUtil.deleteIcGeneralH(); + //删除销售订单 +// deleteU8cDataUtil.deleteSoSale(); + //销售订单取消审核 +// deleteU8cDataUtil.cancelSignatureSoSale(); + + + //2025年2月10日 20:20:39 + //销售出库单取消签字 + deleteU8cDataUtil.cancelSignatureIcGeneralH("0001A110000000001TH5"); + + //弃审应收单 +// deleteU8cDataUtil.abandoningReviewAccReceDoc(); + //删除应收单 +// deleteU8cDataUtil.deleteReviewAccReceDoc(); + + //弃审销售发票 +// deleteU8cDataUtil.abandonmentReviewSoSaleinvoice(); + //删除销售发票 +// deleteU8cDataUtil.deleteSoSaleinvoice(); + + //取消签字销售出库单 +// deleteU8cDataUtil.cancelSignatureIcGeneralH(); + //删除销售出库单 +// deleteU8cDataUtil.deleteIcGeneralH(); + + //取消签字销售订单 +// deleteU8cDataUtil.cancelSignatureSoSale(); + + } catch (Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file 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 ce587425..b9de6b7f 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -18,8 +18,8 @@ import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; +import java.text.SimpleDateFormat; +import java.util.*; /** * @Author：liuyang @@ -97,36 +97,36 @@ public class DeleteU8cDataUtil { /** * 删除销售订单 */ - public void deleteSoSale() { - try { - DeleteSoSaleVo deleteSoSaleVo = new DeleteSoSaleVo(); - deleteSoSaleVo.setDataSourceCode("lets_u8c"); - deleteSoSaleVo.setFstatus(1L); - List soSaleinvoiceEntities = deleteU8cDataUtilDao.querySoSaleByDelete(deleteSoSaleVo); - logger.info("条数：{}", soSaleinvoiceEntities.size()); - if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) { - for (int i = 0; i < soSaleinvoiceEntities.size(); i++) { - DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i); - - Deleteinfo deleteinfo = new Deleteinfo(); - deleteinfo.setCoperator("tbadmin"); - - Queryinfo queryinfo = new Queryinfo(); - queryinfo.setCorp(deleteU8cDataUtilEntity.getUnitcode()); - queryinfo.setDate_begin(deleteU8cDataUtilEntity.getDbilldate()); - queryinfo.setDate_end(deleteU8cDataUtilEntity.getDbilldate()); - queryinfo.setCode(deleteU8cDataUtilEntity.getVreceiptcode()); - - JsonRootBean jsonRootBean = new JsonRootBean(); - jsonRootBean.setDeleteinfo(deleteinfo); - jsonRootBean.setQueryinfo(queryinfo); - sendU8C("http://39.170.109.90:8088/u8cloud/api/so/saleorder/delete", JSON.toJSONString(jsonRootBean)); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } +// public void deleteSoSale() { +// try { +// DeleteSoSaleVo deleteSoSaleVo = new DeleteSoSaleVo(); +// deleteSoSaleVo.setDataSourceCode("lets_u8c"); +// deleteSoSaleVo.setFstatus(1L); +// List soSaleinvoiceEntities = deleteU8cDataUtilDao.querySoSaleByDelete(deleteSoSaleVo); +// logger.info("条数：{}", soSaleinvoiceEntities.size()); +// if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) { +// for (int i = 0; i < soSaleinvoiceEntities.size(); i++) { +// DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i); +// +// Deleteinfo deleteinfo = new Deleteinfo(); +// deleteinfo.setCoperator("tbadmin"); +// +// Queryinfo queryinfo = new Queryinfo(); +// queryinfo.setCorp(deleteU8cDataUtilEntity.getUnitcode()); +// queryinfo.setDate_begin(deleteU8cDataUtilEntity.getDbilldate()); +// queryinfo.setDate_end(deleteU8cDataUtilEntity.getDbilldate()); +// queryinfo.setCode(deleteU8cDataUtilEntity.getVreceiptcode()); +// +// JsonRootBean jsonRootBean = new JsonRootBean(); +// jsonRootBean.setDeleteinfo(deleteinfo); +// jsonRootBean.setQueryinfo(queryinfo); +// sendU8C("http://39.170.109.90:8088/u8cloud/api/so/saleorder/delete", JSON.toJSONString(jsonRootBean)); +// } +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } /** * 删除销售出库单 @@ -161,6 +161,40 @@ public class DeleteU8cDataUtil { } } + /** + * 销售出库单取消签字 + */ + public void cancelSignatureIcGeneralH(String cbiztype) { + try { + DeleteIcGeneralHVo deleteIcGeneralHVo = new DeleteIcGeneralHVo(); + deleteIcGeneralHVo.setDataSourceCode("lets_u8c"); + deleteIcGeneralHVo.setCbiztype(cbiztype); + List soSaleinvoiceEntities = deleteU8cDataUtilDao.queryIcGeneralHByCancelSignature(deleteIcGeneralHVo); + logger.info("条数：{}", soSaleinvoiceEntities.size()); + if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) { + for (int i = 0; i < soSaleinvoiceEntities.size(); i++) { + DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i); + + Deleteinfo deleteinfo = new Deleteinfo(); + deleteinfo.setCoperator("tbadmin"); + + Queryinfo queryinfo = new Queryinfo(); + queryinfo.setCorp(deleteU8cDataUtilEntity.getUnitcode()); + queryinfo.setDate_begin(deleteU8cDataUtilEntity.getDbilldate()); + queryinfo.setDate_end(deleteU8cDataUtilEntity.getDbilldate()); + queryinfo.setBillcode(deleteU8cDataUtilEntity.getVbillcode()); + + JsonRootBean jsonRootBean = new JsonRootBean(); + jsonRootBean.setUnsignInfo(deleteinfo); + jsonRootBean.setQueryInfo(queryinfo); + sendU8C("http://39.170.109.90:8088/u8cloud/api/ic/saleout/unsign", JSON.toJSONString(jsonRootBean)); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + /** * 删除销售发票 */ @@ -209,4 +243,108 @@ public class DeleteU8cDataUtil { // result = String.valueOf(jsonObject.get("attribute")); // System.out.println(result); } + + /** + * 弃审应收单 + * + * @author liuyang + */ + public void abandoningReviewAccReceDoc() { + try { + DeleteSoSaleVo deleteSoSaleVo = new DeleteSoSaleVo(); + deleteSoSaleVo.setDataSourceCode("lets_u8c"); + List soSaleinvoiceEntities = deleteU8cDataUtilDao.abandonmentAccountsReceivableDoc(deleteSoSaleVo); + logger.info("条数：{}", soSaleinvoiceEntities.size()); + if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) { + for (int i = 0; i < soSaleinvoiceEntities.size(); i++) { + DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(new Date()); + + Map stringStringMap = new HashMap<>(); + stringStringMap.put("djbh", deleteU8cDataUtilEntity.getDjbh());//单据编码 + stringStringMap.put("dwbm", deleteU8cDataUtilEntity.getUnitcode());//公司编码 + stringStringMap.put("operatorid", "18846145294");//操作人编码 + stringStringMap.put("operatedate", dateString);//操作日期 + + List> mapList = new ArrayList<>(); + mapList.add(stringStringMap); + + Map>> stringStringMap2 = new HashMap<>(); + stringStringMap2.put("bills", mapList); + sendU8C("http://39.170.109.90:8088/u8cloud/api/arap/ys/unaudit", JSON.toJSONString(stringStringMap2)); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 删除自由态的应收单 + * + * @author liuyang + */ + public void deleteReviewAccReceDoc() { + try { + DeleteSoSaleVo deleteSoSaleVo = new DeleteSoSaleVo(); + deleteSoSaleVo.setDataSourceCode("lets_u8c"); + List soSaleinvoiceEntities = deleteU8cDataUtilDao.abandonmentAccountsReceivableDocFreeState(deleteSoSaleVo); + logger.info("条数：{}", soSaleinvoiceEntities.size()); + if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) { + for (int i = 0; i < soSaleinvoiceEntities.size(); i++) { + DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i); + + Map stringStringMap = new HashMap<>(); + stringStringMap.put("coperator", "tbadmin"); + + Map stringStringMap2 = new HashMap<>(); + stringStringMap2.put("dwbm", deleteU8cDataUtilEntity.getUnitcode()); + stringStringMap2.put("djbh_from", deleteU8cDataUtilEntity.getDjbh()); + stringStringMap2.put("djbh_to", deleteU8cDataUtilEntity.getDjbh()); + + Map> stringStringMap3 = new HashMap<>(); + stringStringMap3.put("deleteinfo", stringStringMap); + stringStringMap3.put("queryinfo", stringStringMap2); + sendU8C("http://39.170.109.90:8088/u8cloud/api/arap/ys/delete", JSON.toJSONString(stringStringMap3)); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 弃审销售发票 + */ + public void abandonmentReviewSoSaleinvoice() { + try { + DeleteU8cDataUtilEntity soSaleinvoiceEntity = new DeleteU8cDataUtilEntity(); + soSaleinvoiceEntity.setDataSourceCode("lets_u8c"); + List soSaleinvoiceEntities = deleteU8cDataUtilDao.querySoSaleinvoiceByCancelApproval(soSaleinvoiceEntity); + logger.info("条数：{}", soSaleinvoiceEntities.size()); + if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) { + for (int i = 0; i < soSaleinvoiceEntities.size(); i++) { + DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i); + + Map stringStringMap = new HashMap<>(); + stringStringMap.put("approvid", "tbadmin"); + + Map stringStringMap2 = new HashMap<>(); + stringStringMap2.put("corp", deleteU8cDataUtilEntity.getUnitcode()); + stringStringMap2.put("code", deleteU8cDataUtilEntity.getVreceiptcode()); + stringStringMap2.put("date_begin", deleteU8cDataUtilEntity.getDbilldate()); + stringStringMap2.put("date_end", deleteU8cDataUtilEntity.getDbilldate()); + + Map> stringStringMap3 = new HashMap<>(); + stringStringMap3.put("approveinfo", stringStringMap); + stringStringMap3.put("queryinfo", stringStringMap2); + sendU8C("http://39.170.109.90:8088/u8cloud/api/so/saleinvoice/unapprove", JSON.toJSONString(stringStringMap3)); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java b/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java index 15a9c90b..705c1e3a 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java +++ b/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java @@ -2,6 +2,7 @@ package com.hzya.frame.deletedata.dao; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity; +import com.hzya.frame.deletedata.vo.DeleteArapDjzbVo; import com.hzya.frame.deletedata.vo.DeleteIcGeneralHVo; import com.hzya.frame.deletedata.vo.DeleteSoSaleVo; @@ -28,10 +29,40 @@ public interface DeleteU8cDataUtilDao extends IBaseDao queryIcGeneralHByDelete(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception; + + /** + * 查询需要取消签字的销售出库单 + * + * @author liuyang + */ + List queryIcGeneralHByCancelSignature(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception; + /** * 查询需要删除的销售订单 * * @author liuyang */ List querySoSaleByDelete(DeleteSoSaleVo deleteSoSaleVo) throws Exception; + + /** + * 弃审应收单 + * + * @author liuyang + */ + List abandonmentAccountsReceivableDoc(DeleteSoSaleVo deleteSoSaleVo) throws Exception; + + /** + * 自由态应收单 + * + * @author liuyang + */ + List abandonmentAccountsReceivableDocFreeState(DeleteSoSaleVo deleteSoSaleVo) throws Exception; + + /** + * 查询需要审批的销售发票 + * + * @author liuyang + */ + List querySoSaleinvoiceByCancelApproval(DeleteU8cDataUtilEntity deleteU8cDataUtilEntity) throws Exception; + } \ No newline at end of file diff --git a/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java b/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java index a7b10486..d81e1fd2 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java @@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.deletedata.dao.DeleteU8cDataUtilDao; import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity; +import com.hzya.frame.deletedata.vo.DeleteArapDjzbVo; import com.hzya.frame.deletedata.vo.DeleteIcGeneralHVo; import com.hzya.frame.deletedata.vo.DeleteSoSaleVo; import org.springframework.stereotype.Repository; @@ -31,10 +32,34 @@ public class DeleteU8cDataUtilDaoImpl extends MybatisGenericDao queryIcGeneralHByCancelSignature(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception { + return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.queryIcGeneralHByCancelSignature", deleteIcGeneralHVo); + } + @DS("lets_u8c") @Override public List querySoSaleByDelete(DeleteSoSaleVo deleteIcGeneralHVo) throws Exception { return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleByDelete", deleteIcGeneralHVo); } + + @DS("lets_u8c") + @Override + public List abandonmentAccountsReceivableDoc(DeleteSoSaleVo deleteSoSaleVo) throws Exception { + return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.abandonmentAccountsReceivableDoc", deleteSoSaleVo); + } + + @DS("lets_u8c") + @Override + public List abandonmentAccountsReceivableDocFreeState(DeleteSoSaleVo deleteSoSaleVo) throws Exception { + return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.abandonmentAccountsReceivableDocFreeState", deleteSoSaleVo); + } + + @DS("lets_u8c") + @Override + public List querySoSaleinvoiceByCancelApproval(DeleteU8cDataUtilEntity soSaleinvoiceEntity) throws Exception { + return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleinvoiceByCancelApproval", soSaleinvoiceEntity); + } } diff --git a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java index 9f66a49d..e26bcf89 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java +++ b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java @@ -16,6 +16,34 @@ public class DeleteU8cDataUtilEntity extends BaseEntity { private String unitcode; private String vbillcode; + private String djbh; + private String dwbm; +// private String vouchid; + + public String getDjbh() { + return djbh; + } + + public void setDjbh(String djbh) { + this.djbh = djbh; + } + + public String getDwbm() { + return dwbm; + } + + public void setDwbm(String dwbm) { + this.dwbm = dwbm; + } + +// public String getVouchid() { +// return vouchid; +// } +// +// public void setVouchid(String vouchid) { +// this.vouchid = vouchid; +// } + public String getVbillcode() { return vbillcode; } 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 0c876fac..71373523 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 @@ -7,10 +7,13 @@ + + + - SELECT a.csaleid, a.vreceiptcode, @@ -24,9 +27,7 @@ so_saleinvoice a LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp WHERE - a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6','0001A11000000000H1FM') - AND a.dbilldate >= '2024-11-01 00:00:00' - AND a.dbilldate <= '2024-11-30 23:59:59' + a.cbiztype IN ( '0001A110000000001TH6' ) AND a.FSTATUS = 1 AND a.dr = 0 @@ -50,13 +51,31 @@ b.unitcode FROM ic_general_h a - LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp + LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp WHERE - 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 - AND a.dr = 0 + a.cbiztype IN ('0001A110000000001TH6') + AND a.fbillflag = 2 + AND a.dr = 0 + + + + @@ -81,13 +100,68 @@ so_sale a LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp WHERE - a.cbiztype IN ( '0001A110000000001TH5', '0001A110000000001TH6' ,'0001A11000000000H1FM') - AND a.dbilldate >= '2024-11-01 00:00:00' - AND a.dbilldate <= '2024-11-30 23:59:59' + a.cbiztype IN ('0001A110000000001TH6') AND a.fstatus = #{fstatus} AND a.dr = 0 + + + + + + + + + + diff --git a/service/src/main/java/com/hzya/frame/deletedata/vo/DeleteArapDjzbVo.java b/service/src/main/java/com/hzya/frame/deletedata/vo/DeleteArapDjzbVo.java new file mode 100644 index 00000000..76eab372 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/DeleteArapDjzbVo.java @@ -0,0 +1,57 @@ +package com.hzya.frame.deletedata.vo; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.deletedata.vo + * @Project：kangarooDataCenterV3 + * @name：DeleteArapDjzbVo + * @Date：2025/2/10 19:53 + * @Filename：DeleteArapDjzbVo + */ +public class DeleteArapDjzbVo { + private String djbh; + private String dwbm; + private String vouchid; + private String unitname; + private String unitcode; + + public String getDjbh() { + return djbh; + } + + public void setDjbh(String djbh) { + this.djbh = djbh; + } + + public String getDwbm() { + return dwbm; + } + + public void setDwbm(String dwbm) { + this.dwbm = dwbm; + } + + public String getVouchid() { + return vouchid; + } + + public void setVouchid(String vouchid) { + this.vouchid = vouchid; + } + + public String getUnitname() { + return unitname; + } + + public void setUnitname(String unitname) { + this.unitname = unitname; + } + + public String getUnitcode() { + return unitcode; + } + + public void setUnitcode(String unitcode) { + this.unitcode = unitcode; + } +} diff --git a/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java b/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java index f37dc0ee..60d760b8 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java @@ -17,6 +17,16 @@ public class JsonRootBean { private Deleteinfo deleteInfo; private Queryinfo queryInfo; + private Deleteinfo unsignInfo; + + public Deleteinfo getUnsignInfo() { + return unsignInfo; + } + + public void setUnsignInfo(Deleteinfo unsignInfo) { + this.unsignInfo = unsignInfo; + } + public Deleteinfo getDeleteinfo() { return deleteinfo; }