refactor(deletedata): 重构删除数据工具类

- 新增取消签字、弃审等功能
- 优化查询接口，精确匹配业务类型
- 添加应收单、销售发票等数据的删除和弃审方法
- 更新实体类和XML配置，支持新增功能

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());
     }
 }

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();
         }

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();
+        }
+    }
+}

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.text.SimpleDateFormat;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Author：liuyang
@@ -97,36 +97,36 @@ public class DeleteU8cDataUtil {
     /**
      * 删除销售订单
      */
-    public void deleteSoSale() {
+//    public void deleteSoSale() {
-        try {
+//        try {
-            DeleteSoSaleVo deleteSoSaleVo = new DeleteSoSaleVo();
+//            DeleteSoSaleVo deleteSoSaleVo = new DeleteSoSaleVo();
-            deleteSoSaleVo.setDataSourceCode("lets_u8c");
+//            deleteSoSaleVo.setDataSourceCode("lets_u8c");
-            deleteSoSaleVo.setFstatus(1L);
+//            deleteSoSaleVo.setFstatus(1L);
-            List<DeleteU8cDataUtilEntity> soSaleinvoiceEntities = deleteU8cDataUtilDao.querySoSaleByDelete(deleteSoSaleVo);
+//            List<DeleteU8cDataUtilEntity> soSaleinvoiceEntities = deleteU8cDataUtilDao.querySoSaleByDelete(deleteSoSaleVo);
-            logger.info("条数：{}", soSaleinvoiceEntities.size());
+//            logger.info("条数：{}", soSaleinvoiceEntities.size());
-            if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) {
+//            if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) {
-                for (int i = 0; i < soSaleinvoiceEntities.size(); i++) {
+//                for (int i = 0; i < soSaleinvoiceEntities.size(); i++) {
-                    DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i);
+//                    DeleteU8cDataUtilEntity deleteU8cDataUtilEntity = soSaleinvoiceEntities.get(i);
-
+//
-                    Deleteinfo deleteinfo = new Deleteinfo();
+//                    Deleteinfo deleteinfo = new Deleteinfo();
-                    deleteinfo.setCoperator("tbadmin");
+//                    deleteinfo.setCoperator("tbadmin");
-
+//
-                    Queryinfo queryinfo = new Queryinfo();
+//                    Queryinfo queryinfo = new Queryinfo();
-                    queryinfo.setCorp(deleteU8cDataUtilEntity.getUnitcode());
+//                    queryinfo.setCorp(deleteU8cDataUtilEntity.getUnitcode());
-                    queryinfo.setDate_begin(deleteU8cDataUtilEntity.getDbilldate());
+//                    queryinfo.setDate_begin(deleteU8cDataUtilEntity.getDbilldate());
-                    queryinfo.setDate_end(deleteU8cDataUtilEntity.getDbilldate());
+//                    queryinfo.setDate_end(deleteU8cDataUtilEntity.getDbilldate());
-                    queryinfo.setCode(deleteU8cDataUtilEntity.getVreceiptcode());
+//                    queryinfo.setCode(deleteU8cDataUtilEntity.getVreceiptcode());
-
+//
-                    JsonRootBean jsonRootBean = new JsonRootBean();
+//                    JsonRootBean jsonRootBean = new JsonRootBean();
-                    jsonRootBean.setDeleteinfo(deleteinfo);
+//                    jsonRootBean.setDeleteinfo(deleteinfo);
-                    jsonRootBean.setQueryinfo(queryinfo);
+//                    jsonRootBean.setQueryinfo(queryinfo);
-                    sendU8C("http://39.170.109.90:8088/u8cloud/api/so/saleorder/delete", JSON.toJSONString(jsonRootBean));
+//                    sendU8C("http://39.170.109.90:8088/u8cloud/api/so/saleorder/delete", JSON.toJSONString(jsonRootBean));
-                }
+//                }
-            }
+//            }
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            e.printStackTrace();
+//            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<DeleteU8cDataUtilEntity> 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<DeleteU8cDataUtilEntity> 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<String, String> stringStringMap = new HashMap<>();
+                    stringStringMap.put("djbh", deleteU8cDataUtilEntity.getDjbh());//单据编码
+                    stringStringMap.put("dwbm", deleteU8cDataUtilEntity.getUnitcode());//公司编码
+                    stringStringMap.put("operatorid", "18846145294");//操作人编码
+                    stringStringMap.put("operatedate", dateString);//操作日期
+
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    mapList.add(stringStringMap);
+
+                    Map<String, List<Map<String, String>>> 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<DeleteU8cDataUtilEntity> 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<String, String> stringStringMap = new HashMap<>();
+                    stringStringMap.put("coperator", "tbadmin");
+
+                    Map<String, String> stringStringMap2 = new HashMap<>();
+                    stringStringMap2.put("dwbm", deleteU8cDataUtilEntity.getUnitcode());
+                    stringStringMap2.put("djbh_from", deleteU8cDataUtilEntity.getDjbh());
+                    stringStringMap2.put("djbh_to", deleteU8cDataUtilEntity.getDjbh());
+
+                    Map<String, Map<String, String>> 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<DeleteU8cDataUtilEntity> 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<String, String> stringStringMap = new HashMap<>();
+                    stringStringMap.put("approvid", "tbadmin");
+
+                    Map<String, String> 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<String, Map<String, String>> 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();
+        }
+    }
 }

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<DeleteU8cDataUtilEntity,
      */
     List<DeleteU8cDataUtilEntity> queryIcGeneralHByDelete(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception;
 
+
+    /**
+     * 查询需要取消签字的销售出库单
+     *
+     * @author liuyang
+     */
+    List<DeleteU8cDataUtilEntity> queryIcGeneralHByCancelSignature(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception;
+
     /**
      * 查询需要删除的销售订单
      *
      * @author liuyang
      */
     List<DeleteU8cDataUtilEntity> querySoSaleByDelete(DeleteSoSaleVo deleteSoSaleVo) throws Exception;
+
+    /**
+     * 弃审应收单
+     *
+     * @author liuyang
+     */
+    List<DeleteU8cDataUtilEntity> abandonmentAccountsReceivableDoc(DeleteSoSaleVo deleteSoSaleVo) throws Exception;
+
+    /**
+     * 自由态应收单
+     *
+     * @author liuyang
+     */
+    List<DeleteU8cDataUtilEntity> abandonmentAccountsReceivableDocFreeState(DeleteSoSaleVo deleteSoSaleVo) throws Exception;
+
+    /**
+     * 查询需要审批的销售发票
+     *
+     * @author liuyang
+     */
+    List<DeleteU8cDataUtilEntity> querySoSaleinvoiceByCancelApproval(DeleteU8cDataUtilEntity deleteU8cDataUtilEntity) throws Exception;
+
 }

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<DeleteU8cDataUti
         return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.queryIcGeneralHByDelete", deleteIcGeneralHVo);
     }
 
+    @DS("lets_u8c")
+    @Override
+    public List<DeleteU8cDataUtilEntity> queryIcGeneralHByCancelSignature(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception {
+        return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.queryIcGeneralHByCancelSignature", deleteIcGeneralHVo);
+    }
+
     @DS("lets_u8c")
     @Override
     public List<DeleteU8cDataUtilEntity> querySoSaleByDelete(DeleteSoSaleVo deleteIcGeneralHVo) throws Exception {
         return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleByDelete", deleteIcGeneralHVo);
     }
+
+    @DS("lets_u8c")
+    @Override
+    public List<DeleteU8cDataUtilEntity> abandonmentAccountsReceivableDoc(DeleteSoSaleVo deleteSoSaleVo) throws Exception {
+        return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.abandonmentAccountsReceivableDoc", deleteSoSaleVo);
+    }
+
+    @DS("lets_u8c")
+    @Override
+    public List<DeleteU8cDataUtilEntity> abandonmentAccountsReceivableDocFreeState(DeleteSoSaleVo deleteSoSaleVo) throws Exception {
+        return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.abandonmentAccountsReceivableDocFreeState", deleteSoSaleVo);
+    }
+
+    @DS("lets_u8c")
+    @Override
+    public List<DeleteU8cDataUtilEntity> querySoSaleinvoiceByCancelApproval(DeleteU8cDataUtilEntity soSaleinvoiceEntity) throws Exception {
+        return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleinvoiceByCancelApproval", soSaleinvoiceEntity);
+    }
 }
 

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;
     }

service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml

@@ -7,10 +7,13 @@
         <result property="pk_corp" column="pk_corp" jdbcType="VARCHAR"/>
         <result property="dbilldate" column="dbilldate" jdbcType="VARCHAR"/>
         <result property="unitcode" column="unitcode" jdbcType="VARCHAR"/>
+
+        <result property="djbh" column="djbh" jdbcType="VARCHAR"/>
+        <result property="dwbm" column="dwbm" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询需要删除的销售发票-->
-    <select id="querySoSaleinvoiceByDelete" parameterType="com.hzya.frame.plugin.lets.entity.SoSaleinvoiceEntity" resultMap="get-DeleteU8cDataUtilEntity-result">
+    <select id="querySoSaleinvoiceByDelete" parameterType="com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity" resultMap="get-DeleteU8cDataUtilEntity-result">
         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')
+            a.cbiztype IN ( '0001A110000000001TH6' )
-          AND a.dbilldate >= '2024-11-01 00:00:00'
-          AND a.dbilldate &lt;= '2024-11-30 23:59:59'
           AND a.FSTATUS = 1
           AND a.dr = 0
     </select>
@@ -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')
+            a.cbiztype IN ('0001A110000000001TH6')
-            AND a.dbilldate >= '2024-11-01 00:00:00'
+          AND a.fbillflag = 2
-            AND a.dbilldate &lt;= '2024-11-30 23:59:59'
+          AND a.dr = 0
-            AND a.fbillflag = 2
+    </select>
-            AND a.dr = 0
+
+
+    <select id="queryIcGeneralHByCancelSignature" parameterType="com.hzya.frame.deletedata.vo.DeleteIcGeneralHVo" resultMap="get-IcGeneralHByDelete-result">
+        SELECT
+            a.cgeneralhid,
+            a.vbillcode,
+            a.dbilldate,
+            a.cbiztype,
+            a.fbillflag,
+            a.pk_corp,
+            b.unitname,
+            b.unitcode
+        FROM
+            ic_general_h a
+                LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp
+        WHERE
+            a.cbiztype IN ( #{cbiztype} )
+          AND ( a.fbillflag = 3 OR a.fbillflag = 4 )
+          AND a.dr = 0
     </select>
 
     <resultMap id="get-SoSaleByDelete-result" type="com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity" >
@@ -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')
+            a.cbiztype IN ('0001A110000000001TH6')
-            AND a.dbilldate >= '2024-11-01 00:00:00'
-            AND a.dbilldate &lt;= '2024-11-30 23:59:59'
             <if test="fstatus!=null and fstatus!=''">
                 AND a.fstatus = #{fstatus}
             </if>
             AND a.dr = 0
     </select>
+
+    <!--查询已审核的应收单-->
+    <select id="abandonmentAccountsReceivableDoc" parameterType="com.hzya.frame.deletedata.vo.DeleteSoSaleVo" resultMap="get-SoSaleByDelete-result">
+        SELECT
+            a.djbh,
+            a.dwbm,
+            a.vouchid,
+            b.unitname,
+            b.unitcode
+        FROM
+            arap_djzb a
+                LEFT JOIN bd_corp b ON b.pk_corp = a.DWBM
+        WHERE
+            a.dr = 0
+          AND a.XSLXBM = '0001A110000000001TH6'
+          AND a.djdl = 'ys'
+          and a.spzt = 1
+    </select>
+
+    <!--查询自由态的应收单-->
+    <select id="abandonmentAccountsReceivableDocFreeState" parameterType="com.hzya.frame.deletedata.vo.DeleteSoSaleVo" resultMap="get-SoSaleByDelete-result">
+        SELECT
+            a.djbh,
+            a.dwbm,
+            a.vouchid,
+            b.unitname,
+            b.unitcode
+        FROM
+            arap_djzb a
+                LEFT JOIN bd_corp b ON b.pk_corp = a.DWBM
+        WHERE
+            a.dr = 0
+          AND a.XSLXBM = '0001A110000000001TH6'
+          AND a.djdl = 'ys'
+          and a.spzt is null
+    </select>
+
+    <!--查询审批状态下的销售发票-->
+    <select id="querySoSaleinvoiceByCancelApproval" parameterType="com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity" resultMap="get-DeleteU8cDataUtilEntity-result">
+        SELECT
+            a.csaleid,
+            a.vreceiptcode,
+            a.dbilldate,
+            a.cbiztype,
+            a.fstatus,
+            a.pk_corp,
+            b.unitname,
+            b.unitcode
+        FROM
+            so_saleinvoice a
+                LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp
+        WHERE
+            a.cbiztype IN ( '0001A110000000001TH6' )
+          AND a.FSTATUS = 2
+          AND a.dr = 0
+    </select>
+
 </mapper>
 

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;
+    }
+}

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;
     }