diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest3.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest3.java index 8dd761fb..042eb2af 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest3.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest3.java @@ -37,7 +37,7 @@ public class DeleteU8cDataUtilTest3 { // deleteU8cDataUtil.deleteIcGeneralHV2(); //取消签字销售订单 * - deleteU8cDataUtil.cancelSignatureSoSaleV2(); +// deleteU8cDataUtil.cancelSignatureSoSaleV2(); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest4.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest4.java new file mode 100644 index 00000000..cde90faf --- /dev/null +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest4.java @@ -0,0 +1,37 @@ +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 DeleteU8cDataUtilTest4 { + + @Autowired + private DeleteU8cDataUtil deleteU8cDataUtil; + + @Test + public void deleteSoSaleinvoice() { + try { + //取消签字销售出库单 已测试 + deleteU8cDataUtil.cancelSignatureIcGeneralHV2("'0001A110000000001TH6', '0001A1100000000VKCOK'"); + //销售出库单签字 已测试 + deleteU8cDataUtil.saleOutSign("'0001A110000000001TH6', '0001A1100000000VKCOK'"); + } 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 e43ba57e..5ee3dd74 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -374,6 +374,54 @@ public class DeleteU8cDataUtil { } } + + /** + * 销售出库单签字 + */ + public void saleOutSign(String cbiztype) { + try { + DeleteIcGeneralHVo deleteIcGeneralHVo = new DeleteIcGeneralHVo(); + deleteIcGeneralHVo.setDataSourceCode("lets_u8c"); + deleteIcGeneralHVo.setCbiztype(cbiztype); + List soSaleinvoiceEntities = deleteU8cDataUtilDao.queryIcGeneralHBySign(deleteIcGeneralHVo); + logger.info("条数:{}", soSaleinvoiceEntities.size()); + if (soSaleinvoiceEntities != null && soSaleinvoiceEntities.size() > 0) { + List> splitListByCount = SplitListByCountUtil.splitListByCount(soSaleinvoiceEntities, SPLIT_VAR); + + for (int i = 0; i < splitListByCount.size(); i++) { + List deleteU8cDataUtilEntities = splitListByCount.get(i); + Map> stringListMap = groupByDbilldate(deleteU8cDataUtilEntities); + + for (Map.Entry> entry : stringListMap.entrySet()) { + String key = entry.getKey(); + List valueList = entry.getValue(); + List vbillcodeList = valueList.stream().map(DeleteU8cDataUtilEntity::getVbillcode).collect(Collectors.toList()); + + String[] split = key.split("@@@@"); + + Map objectMap1 = new HashMap<>(); + objectMap1.put("coperator", "tbadmin"); + objectMap1.put("date_sign", split[0]); + + Map objectMap2 = new HashMap<>(); + objectMap2.put("corp", split[1]); + objectMap2.put("date_begin", split[0]); + objectMap2.put("date_end", split[0]); + objectMap2.put("billcode", vbillcodeList); + + Map objectMap3 = new HashMap<>(); + objectMap3.put("signInfo", objectMap1); + objectMap3.put("queryInfo", objectMap2); + + sendU8C("http://39.170.109.90:8088/u8cloud/api/ic/saleout/sign", JSON.toJSONString(objectMap3)); + } + } + } + } 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 705c1e3a..a705c924 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 @@ -37,6 +37,13 @@ public interface DeleteU8cDataUtilDao extends IBaseDao queryIcGeneralHByCancelSignature(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception; + /** + * 查询需要取消签字的销售出库单 + * + * @author liuyang + */ + List queryIcGeneralHBySign(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception; + /** * 查询需要删除的销售订单 * 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 d81e1fd2..74206150 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 @@ -38,6 +38,13 @@ public class DeleteU8cDataUtilDaoImpl extends MybatisGenericDao queryIcGeneralHBySign(DeleteIcGeneralHVo deleteIcGeneralHVo) throws Exception { + return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.queryIcGeneralHBySign", deleteIcGeneralHVo); + } + + @DS("lets_u8c") @Override public List querySoSaleByDelete(DeleteSoSaleVo deleteIcGeneralHVo) throws Exception { 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 01044b2c..24ba8335 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 @@ -71,13 +71,38 @@ 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 ( #{cbiztype} ) - AND ( a.fbillflag = 3 OR a.fbillflag = 4 ) - AND a.dr = 0 + a.cbiztype IN ( ${cbiztype} ) + AND ( a.fbillflag = 3 OR a.fbillflag = 4 ) + AND a.dr = 0 + AND dbilldate >= '2025-01-01' + AND dbilldate <= '2025-02-28' + + + +