diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/ISoSaleinvoiceDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/ISoSaleinvoiceDao.java index 2017939e..39976c08 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/ISoSaleinvoiceDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/ISoSaleinvoiceDao.java @@ -1,7 +1,9 @@ package com.hzya.frame.plugin.lets.dao; import com.hzya.frame.plugin.lets.entity.SoSaleinvoiceEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; /** * (SO_SALEINVOICE: table)表数据库访问层 @@ -11,5 +13,11 @@ import com.hzya.frame.basedao.dao.IBaseDao; */ public interface ISoSaleinvoiceDao extends IBaseDao { + /** + * 查询需要删除的数据 + * + * @author liuyang + */ +// List querySoSaleinvoiceByDelete(SoSaleinvoiceEntity soSaleinvoiceEntity) throws Exception; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/SoSaleinvoiceDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/SoSaleinvoiceDaoImpl.java index 25209e2f..ed696d7f 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/SoSaleinvoiceDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/SoSaleinvoiceDaoImpl.java @@ -4,13 +4,20 @@ import com.hzya.frame.plugin.lets.entity.SoSaleinvoiceEntity; import com.hzya.frame.plugin.lets.dao.ISoSaleinvoiceDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + /** * (SoSaleinvoice)表数据库访问层 * * @author makejava * @since 2024-08-31 14:43:53 */ -public class SoSaleinvoiceDaoImpl extends MybatisGenericDao implements ISoSaleinvoiceDao{ - +public class SoSaleinvoiceDaoImpl extends MybatisGenericDao implements ISoSaleinvoiceDao { + +// @Override +// public List querySoSaleinvoiceByDelete(SoSaleinvoiceEntity soSaleinvoiceEntity) throws Exception { +// return query("com.hzya.frame.plugin.lets.dao.impl.SoSaleinvoiceDaoImpl.querySoSaleinvoiceByDelete", soSaleinvoiceEntity); +// } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/SoSaleinvoiceEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/SoSaleinvoiceEntity.java index d71719e6..105ac9f7 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/SoSaleinvoiceEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/SoSaleinvoiceEntity.java @@ -9,7 +9,6 @@ import com.hzya.frame.web.entity.BaseEntity; * @since 2024-08-31 14:43:53 */ public class SoSaleinvoiceEntity extends BaseEntity { - private String bfreecustflag; private String binitflag; private String btogoldtax; @@ -125,7 +124,6 @@ public class SoSaleinvoiceEntity extends BaseEntity { // public void setCheckNtotalsummny(String checkNtotalsummny) { // this.checkNtotalsummny = checkNtotalsummny; // } - public String getBfreecustflag() { return bfreecustflag; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/SoSaleinvoiceEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/SoSaleinvoiceEntity.xml index df9697fd..dfb342b8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/SoSaleinvoiceEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/SoSaleinvoiceEntity.xml @@ -1226,6 +1226,5 @@ update SO_SALEINVOICE set sts= 'N' ,modify_time = #{modify_time},modify_user_id delete from SO_SALEINVOICE where CSALEID = #{csaleid} - 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 8468f159..779046a6 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 @@ -1,11 +1,19 @@ package com.hzya.frame.plugin.lets.plugin.sales; +import cn.hutool.core.lang.Assert; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.WebappApplication; +import com.hzya.frame.plugin.lets.constant.OverallConstant; +import com.hzya.frame.plugin.lets.dao.ISoSaleinvoiceDao; +import com.hzya.frame.plugin.lets.entity.SoSaleinvoiceEntity; import com.hzya.frame.plugin.lets.ofs.dao.ITocofsSaleoutDetailedDao; import com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutDetailedEntity; import com.hzya.frame.plugin.lets.ofsvo.QueryOfsSoSaleOutVo; import com.hzya.frame.plugin.lets.u8cdto.ErrorHeaderDetailsDtoDto; +import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; +import com.hzya.frame.plugin.lets.u8cdto.SoSaleResultRootDto; import com.hzya.frame.plugin.lets.util.OfsStandardUtil; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; @@ -112,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-12-01 00:00:00", "2024-12-01 23:59:59"); +// soSaleOutPluginInitializerToC.startImplementStockByTime("2024-10-15 13:47:37", "2024-10-15 13:47:37"); } catch (Exception e) { e.printStackTrace(); } @@ -120,7 +128,7 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.sendU8CTOCOrder("123446"); try { -// soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024113000012787", "stock"); +// soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024101500002500", "stock"); // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110500013375", "tran"); // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024111700013756", "tran"); 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 ece137a8..25c917bf 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 @@ -2,7 +2,9 @@ package com.hzya.frame.plugin.lets.plugin.sales; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.WebappApplication; +import com.hzya.frame.plugin.lets.entity.BdBusitypeEntity; import com.hzya.frame.plugin.lets.queryvo.StartAndEndVo; +import com.hzya.frame.plugin.lets.util.QueryBdBusitypeUtil; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -26,15 +28,18 @@ public class SoSaleReturnPluginInitializerToCTest { @Autowired private SoSaleReturnPluginInitializerToC soSaleReturnPluginInitializerToC; + @Autowired + private QueryBdBusitypeUtil queryBdBusitypeUtil; + @Test public void startImplement() { // soSaleReturnPluginInitializerToC.startImplement(null, null); - try { - String code = "LETS-RE2024112600000411"; - soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock"); - } catch (Exception e) { - e.printStackTrace(); - } +// try { +// String code = "LETS-RE2024112600000411"; +// soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock"); +// } catch (Exception e) { +// e.printStackTrace(); +// } // List startAndEndVos = soSaleReturnPluginInitializerToC.calculateCalculateEntireDayPeriod(null); // soSaleReturnPluginInitializerToC.startImplementStockByTime(startAndEndVos.get(0).getStart_time(), startAndEndVos.get(0).getEnd_time()); @@ -50,5 +55,15 @@ public class SoSaleReturnPluginInitializerToCTest { } catch (Exception e) { 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()); } } \ 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 new file mode 100644 index 00000000..995d921b --- /dev/null +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java @@ -0,0 +1,34 @@ +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 DeleteU8cDataUtilTest { + + @Autowired + private DeleteU8cDataUtil deleteU8cDataUtil; + + @Test + public void deleteSoSaleinvoice() { + try { + deleteU8cDataUtil.querySoSaleinvoice(); + } 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 new file mode 100644 index 00000000..fa13e671 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -0,0 +1,83 @@ +package com.hzya.frame.deletedata; + +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSON; +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; +//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 org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.plugin.lets.util + * @Project：kangarooDataCenterV3 + * @name：DeleteU8cDataUtil + * @Date：2024/12/18 18:35 + * @Filename：DeleteU8cDataUtil + */ +@Component +public class DeleteU8cDataUtil { + + @Autowired + private DeleteU8cDataUtilDao deleteU8cDataUtilDao; + + /** + * 删除销售发票 + */ + public void querySoSaleinvoice() { + try { + DeleteU8cDataUtilEntity soSaleinvoiceEntity = new DeleteU8cDataUtilEntity(); + soSaleinvoiceEntity.setDataSourceCode("lets_u8c"); + List soSaleinvoiceEntities = deleteU8cDataUtilDao.querySoSaleinvoiceByDelete(soSaleinvoiceEntity); + System.out.println("条数：" + 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("2024-11-01"); + queryinfo.setDate_end("2024-11-30"); + queryinfo.setCode(deleteU8cDataUtilEntity.getVreceiptcode()); + + JsonRootBean jsonRootBean = new JsonRootBean(); + jsonRootBean.setDeleteinfo(deleteinfo); + jsonRootBean.setQueryinfo(queryinfo); + sendU8C(JSON.toJSONString(jsonRootBean)); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + + /** + * 2024年8月8日 10:54:48 + * 推送U8C销售订单方法 + * + * @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)//表单内容 + .timeout(600000)//超时，毫秒 + .execute().body(); + + 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 new file mode 100644 index 00000000..d16bb57e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java @@ -0,0 +1,22 @@ +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 java.util.List; + +/** + * 报表授权表(report_accredit: table)表数据库访问层 + * + * @author makejava + * @since 2024-05-21 15:02:11 + */ +public interface DeleteU8cDataUtilDao extends IBaseDao { + /** + * 查询需要删除的数据 + * + * @author liuyang + */ + List querySoSaleinvoiceByDelete(DeleteU8cDataUtilEntity soSaleinvoiceEntity) 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 new file mode 100644 index 00000000..43ff989d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.deletedata.dao.impl; + +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 org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 报表授权表(ReportAccredit)表数据库访问层 + * + * @author makejava + * @since 2024-05-21 15:02:11 + */ +@Repository(value = "DeleteU8cDataUtilDaoImpl") +public class DeleteU8cDataUtilDaoImpl extends MybatisGenericDao implements DeleteU8cDataUtilDao { + + @DS("lets_u8c") + @Override + public List querySoSaleinvoiceByDelete(DeleteU8cDataUtilEntity soSaleinvoiceEntity) throws Exception { + return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleinvoiceByDelete", 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 new file mode 100644 index 00000000..d245ebdd --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java @@ -0,0 +1,50 @@ +package com.hzya.frame.deletedata.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * 报表授权表(ReportAccredit)实体类 + * + * @author makejava + * @since 2024-05-21 15:02:12 + */ +public class DeleteU8cDataUtilEntity extends BaseEntity { + + private String vreceiptcode; + private String pk_corp; + private String dbilldate; + private String unitcode; + + public String getUnitcode() { + return unitcode; + } + + public void setUnitcode(String unitcode) { + this.unitcode = unitcode; + } + + public String getVreceiptcode() { + return vreceiptcode; + } + + public void setVreceiptcode(String vreceiptcode) { + this.vreceiptcode = vreceiptcode; + } + + public String getPk_corp() { + return pk_corp; + } + + public void setPk_corp(String pk_corp) { + this.pk_corp = pk_corp; + } + + public String getDbilldate() { + return dbilldate; + } + + public void setDbilldate(String dbilldate) { + this.dbilldate = dbilldate; + } +} + 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 new file mode 100644 index 00000000..82306de8 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/service/src/main/java/com/hzya/frame/deletedata/vo/Deleteinfo.java b/service/src/main/java/com/hzya/frame/deletedata/vo/Deleteinfo.java new file mode 100644 index 00000000..d06bb68c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/Deleteinfo.java @@ -0,0 +1,24 @@ +/** + * Copyright 2024 bejson.com + */ +package com.hzya.frame.deletedata.vo; + +/** + * Auto-generated: 2024-12-18 19:6:3 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class Deleteinfo { + + private String coperator; + + public void setCoperator(String coperator) { + this.coperator = coperator; + } + + public String getCoperator() { + return coperator; + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..c9feba0e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java @@ -0,0 +1,33 @@ +/** + * Copyright 2024 bejson.com + */ +package com.hzya.frame.deletedata.vo; + +/** + * Auto-generated: 2024-12-18 19:6:3 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class JsonRootBean { + + private Deleteinfo deleteinfo; + private Queryinfo queryinfo; + + public void setDeleteinfo(Deleteinfo deleteinfo) { + this.deleteinfo = deleteinfo; + } + + public Deleteinfo getDeleteinfo() { + return deleteinfo; + } + + public void setQueryinfo(Queryinfo queryinfo) { + this.queryinfo = queryinfo; + } + + public Queryinfo getQueryinfo() { + return queryinfo; + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..072899e2 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/Queryinfo.java @@ -0,0 +1,52 @@ +/** + * Copyright 2024 bejson.com + */ +package com.hzya.frame.deletedata.vo; + +import java.util.Date; + +/** + * Auto-generated: 2024-12-18 19:6:3 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class Queryinfo { + + private String corp; + private String date_begin; + private String date_end; + private String code; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getCorp() { + return corp; + } + + public void setCorp(String corp) { + this.corp = corp; + } + + public String getDate_begin() { + return date_begin; + } + + public void setDate_begin(String date_begin) { + this.date_begin = date_begin; + } + + public String getDate_end() { + return date_end; + } + + public void setDate_end(String date_end) { + this.date_end = date_end; + } +} \ No newline at end of file