From 4b0473e700603360918a1e43a01a6a3ccf7d2cd2 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:27:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(deletedata):=20=E6=96=B0=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=92=8C=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 DeleteIcGeneralHVo 和 DeleteSoSaleVo 类用于查询销售出库单和销售订单 - 在 DeleteU8cDataUtilDao 中添加 queryIcGeneralHByDelete 和 querySoSaleByDelete 方法 - 在 DeleteU8cDataUtil 中实现 deleteSoSale 和 deleteIcGeneralH 方法 - 优化 deleteSoSaleinvoice 方法，使用日志记录条数 - 重构 sendU8C 方法，增加 URL 参数 --- .../SoSaleOutPluginInitializerToCTest.java | 2 +- .../lets/util/DeleteU8cDataUtilTest.java | 2 +- .../frame/deletedata/DeleteU8cDataUtil.java | 104 +++++++++++++++--- .../deletedata/dao/DeleteU8cDataUtilDao.java | 19 +++- .../dao/impl/DeleteU8cDataUtilDaoImpl.java | 14 +++ .../entity/DeleteU8cDataUtilEntity.java | 9 ++ .../entity/DeleteU8cDataUtilEntity.xml | 57 ++++++++++ .../deletedata/vo/DeleteIcGeneralHVo.java | 87 +++++++++++++++ .../frame/deletedata/vo/DeleteSoSaleVo.java | 86 +++++++++++++++ .../hzya/frame/deletedata/vo/Queryinfo.java | 9 ++ 10 files changed, 367 insertions(+), 22 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/deletedata/vo/DeleteIcGeneralHVo.java create mode 100644 service/src/main/java/com/hzya/frame/deletedata/vo/DeleteSoSaleVo.java diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index 779046a6..8894ffef 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -120,7 +120,7 @@ class SoSaleOutPluginInitializerToCTest { // String aaa = "LETS-SH2024102800021196"; // soSaleOutPluginInitializerToC.startImplementStockByTime("2024-12-06 09:25:39", "2024-12-06 09:25:39"); -// soSaleOutPluginInitializerToC.startImplementStockByTime("2024-10-15 13:47:37", "2024-10-15 13:47:37"); + soSaleOutPluginInitializerToC.startImplementStockByTime("2024-11-27 17:44:19", "2024-11-27 17:44:19"); } catch (Exception e) { e.printStackTrace(); } 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 995d921b..1ca4ea9f 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 @@ -26,7 +26,7 @@ public class DeleteU8cDataUtilTest { @Test public void deleteSoSaleinvoice() { try { - deleteU8cDataUtil.querySoSaleinvoice(); + deleteU8cDataUtil.deleteSoSaleinvoice(); } 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 fa13e671..a0c9bd4c 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -8,9 +8,9 @@ import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity; //import com.hzya.frame.plugin.lets.dao.ISoSaleinvoiceDao; //import com.hzya.frame.plugin.lets.entity.SoSaleinvoiceEntity; //import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; -import com.hzya.frame.deletedata.vo.Deleteinfo; -import com.hzya.frame.deletedata.vo.JsonRootBean; -import com.hzya.frame.deletedata.vo.Queryinfo; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,15 +31,17 @@ public class DeleteU8cDataUtil { @Autowired private DeleteU8cDataUtilDao deleteU8cDataUtilDao; + protected Logger logger = LogManager.getLogger(super.getClass()); + /** - * 删除销售发票 + * 删除销售订单 */ - public void querySoSaleinvoice() { + public void deleteSoSale() { try { - DeleteU8cDataUtilEntity soSaleinvoiceEntity = new DeleteU8cDataUtilEntity(); - soSaleinvoiceEntity.setDataSourceCode("lets_u8c"); - List soSaleinvoiceEntities = deleteU8cDataUtilDao.querySoSaleinvoiceByDelete(soSaleinvoiceEntity); - System.out.println("条数：" + soSaleinvoiceEntities.size()); + DeleteSoSaleVo deleteSoSaleVo = new DeleteSoSaleVo(); + deleteSoSaleVo.setDataSourceCode("lets_u8c"); + 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); @@ -49,14 +51,80 @@ public class DeleteU8cDataUtil { Queryinfo queryinfo = new Queryinfo(); queryinfo.setCorp(deleteU8cDataUtilEntity.getUnitcode()); - queryinfo.setDate_begin("2024-11-01"); - queryinfo.setDate_end("2024-11-30"); + 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(JSON.toJSONString(jsonRootBean)); + sendU8C("http://39.170.109.90:8088/u8cloud/api/so/saleorder/delete", JSON.toJSONString(jsonRootBean)); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 删除销售出库单 + */ + public void deleteIcGeneralH() { + try { + DeleteIcGeneralHVo deleteIcGeneralHVo = new DeleteIcGeneralHVo(); + deleteIcGeneralHVo.setDataSourceCode("lets_u8c"); + List soSaleinvoiceEntities = deleteU8cDataUtilDao.queryIcGeneralHByDelete(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.setDeleteinfo(deleteinfo); + jsonRootBean.setQueryinfo(queryinfo); + sendU8C("http://39.170.109.90:8088/u8cloud/api/ic/saleout/delete", JSON.toJSONString(jsonRootBean)); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 删除销售发票 + */ + public void deleteSoSaleinvoice() { + try { + DeleteU8cDataUtilEntity soSaleinvoiceEntity = new DeleteU8cDataUtilEntity(); + soSaleinvoiceEntity.setDataSourceCode("lets_u8c"); + List soSaleinvoiceEntities = deleteU8cDataUtilDao.querySoSaleinvoiceByDelete(soSaleinvoiceEntity); + 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/saleinvoice/delete", JSON.toJSONString(jsonRootBean)); } } } catch (Exception e) { @@ -71,13 +139,13 @@ public class DeleteU8cDataUtil { * * @author liuyang */ - public void sendU8C(String param) throws Exception { - String result = HttpRequest.post("http://39.170.109.90:8088/u8cloud/api/so/saleinvoice/delete").header("usercode", "admin1").header("password", "f7fcde654e968541cc803c4b08c30abb").header("system", "lz1").header("trantype", "code").body(param)//表单内容 + public void sendU8C(String url, String param) throws Exception { + String result = HttpRequest.post(url).header("usercode", "admin1").header("password", "f7fcde654e968541cc803c4b08c30abb").header("system", "lz1").header("trantype", "code").body(param)//表单内容 .timeout(600000)//超时，毫秒 .execute().body(); - - JSONObject jsonObject = JSON.parseObject(result); - result = String.valueOf(jsonObject.get("attribute")); - System.out.println(result); + logger.info(result); +// JSONObject jsonObject = JSON.parseObject(result); +// result = String.valueOf(jsonObject.get("attribute")); +// System.out.println(result); } } 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 d16bb57e..15a9c90b 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 @@ -1,8 +1,9 @@ package com.hzya.frame.deletedata.dao; -import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity; +import com.hzya.frame.deletedata.vo.DeleteIcGeneralHVo; +import com.hzya.frame.deletedata.vo.DeleteSoSaleVo; import java.util.List; @@ -14,9 +15,23 @@ import java.util.List; */ public interface DeleteU8cDataUtilDao extends IBaseDao { /** - * 查询需要删除的数据 + * 查询需要删除的销售发票 * * @author liuyang */ List querySoSaleinvoiceByDelete(DeleteU8cDataUtilEntity soSaleinvoiceEntity) throws Exception; + + /** + * 查询需要删除的销售出库单 + * + * @author liuyang + */ + List queryIcGeneralHByDelete(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception; + + /** + * 查询需要删除的销售订单 + * + * @author liuyang + */ + List querySoSaleByDelete(DeleteSoSaleVo deleteSoSaleVo) 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 43ff989d..a7b10486 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,8 @@ 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.DeleteIcGeneralHVo; +import com.hzya.frame.deletedata.vo.DeleteSoSaleVo; import org.springframework.stereotype.Repository; import java.util.List; @@ -22,5 +24,17 @@ public class DeleteU8cDataUtilDaoImpl extends MybatisGenericDao querySoSaleinvoiceByDelete(DeleteU8cDataUtilEntity soSaleinvoiceEntity) throws Exception { return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleinvoiceByDelete", soSaleinvoiceEntity); } + + @DS("lets_u8c") + @Override + public List queryIcGeneralHByDelete(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception { + return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.queryIcGeneralHByDelete", deleteIcGeneralHVo); + } + + @DS("lets_u8c") + @Override + public List querySoSaleByDelete(DeleteSoSaleVo deleteIcGeneralHVo) throws Exception { + return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleByDelete", deleteIcGeneralHVo); + } } 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 d245ebdd..9f66a49d 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 @@ -14,6 +14,15 @@ public class DeleteU8cDataUtilEntity extends BaseEntity { private String pk_corp; private String dbilldate; private String unitcode; + private String vbillcode; + + public String getVbillcode() { + return vbillcode; + } + + public void setVbillcode(String vbillcode) { + this.vbillcode = vbillcode; + } public String getUnitcode() { return unitcode; 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 82306de8..eea03e32 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 @@ -1,6 +1,7 @@ + @@ -29,5 +30,61 @@ AND a.FSTATUS = 1 AND a.dr = 0 + + + + + + + + + + + + + + + + + + diff --git a/service/src/main/java/com/hzya/frame/deletedata/vo/DeleteIcGeneralHVo.java b/service/src/main/java/com/hzya/frame/deletedata/vo/DeleteIcGeneralHVo.java new file mode 100644 index 00000000..26eee036 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/DeleteIcGeneralHVo.java @@ -0,0 +1,87 @@ +package com.hzya.frame.deletedata.vo; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.deletedata.vo + * @Project：kangarooDataCenterV3 + * @name：DeleteIcGeneralHVo + * @Date：2024/12/19 10:32 + * @Filename：DeleteIcGeneralHVo + */ +public class DeleteIcGeneralHVo extends BaseEntity { + + private String cgeneralhid; + private String vbillcode; + private String dbilldate; + private String cbiztype; + private String fbillflag; + private String pk_corp; + private String unitname; + private String unitcode; + + public String getCgeneralhid() { + return cgeneralhid; + } + + public void setCgeneralhid(String cgeneralhid) { + this.cgeneralhid = cgeneralhid; + } + + public String getVbillcode() { + return vbillcode; + } + + public void setVbillcode(String vbillcode) { + this.vbillcode = vbillcode; + } + + public String getDbilldate() { + return dbilldate; + } + + public void setDbilldate(String dbilldate) { + this.dbilldate = dbilldate; + } + + public String getCbiztype() { + return cbiztype; + } + + public void setCbiztype(String cbiztype) { + this.cbiztype = cbiztype; + } + + public String getFbillflag() { + return fbillflag; + } + + public void setFbillflag(String fbillflag) { + this.fbillflag = fbillflag; + } + + public String getPk_corp() { + return pk_corp; + } + + public void setPk_corp(String pk_corp) { + this.pk_corp = pk_corp; + } + + 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/DeleteSoSaleVo.java b/service/src/main/java/com/hzya/frame/deletedata/vo/DeleteSoSaleVo.java new file mode 100644 index 00000000..3b24e625 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/DeleteSoSaleVo.java @@ -0,0 +1,86 @@ +package com.hzya.frame.deletedata.vo; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.deletedata.vo + * @Project：kangarooDataCenterV3 + * @name：DeleteIcGeneralHVo + * @Date：2024/12/19 10:32 + * @Filename：DeleteIcGeneralHVo + */ +public class DeleteSoSaleVo extends BaseEntity { + private String csaleid; + private String vreceiptcode; + private String dbilldate; + private String cbiztype; + private String fstatus; + private String pk_corp; + private String unitname; + private String unitcode; + + public String getCsaleid() { + return csaleid; + } + + public void setCsaleid(String csaleid) { + this.csaleid = csaleid; + } + + public String getVreceiptcode() { + return vreceiptcode; + } + + public void setVreceiptcode(String vreceiptcode) { + this.vreceiptcode = vreceiptcode; + } + + public String getDbilldate() { + return dbilldate; + } + + public void setDbilldate(String dbilldate) { + this.dbilldate = dbilldate; + } + + public String getCbiztype() { + return cbiztype; + } + + public void setCbiztype(String cbiztype) { + this.cbiztype = cbiztype; + } + + public String getFstatus() { + return fstatus; + } + + public void setFstatus(String fstatus) { + this.fstatus = fstatus; + } + + public String getPk_corp() { + return pk_corp; + } + + public void setPk_corp(String pk_corp) { + this.pk_corp = pk_corp; + } + + 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/Queryinfo.java b/service/src/main/java/com/hzya/frame/deletedata/vo/Queryinfo.java index 072899e2..21bc4ef9 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/vo/Queryinfo.java +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/Queryinfo.java @@ -17,6 +17,15 @@ public class Queryinfo { private String date_begin; private String date_end; private String code; + private String billcode; + + public String getBillcode() { + return billcode; + } + + public void setBillcode(String billcode) { + this.billcode = billcode; + } public String getCode() { return code;