hzya
/
kangarooDataCenterV3
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改文件名大小写

This commit is contained in:
liuy 2025-08-25 16:50:32 +08:00
parent 82f0c73c49
commit d4e0a4417c
2 changed files with 280 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
View File

@ -971,10 +971,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
//合并后如果数量为0，则过滤掉
// if ("0".equals(passiveStorageSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) {
// continue;
// }
if (!"0".equals(passiveStorageSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) {
//推送u8c
List<SaleorderRequestDto> saleorderRequestDtoList = new ArrayList<>();
saleorderRequestDtoList.add(saleorderRequestDto);
@ -992,6 +989,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
logger.info("TOC红字销售订单编号：{} 主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp);
updateSuccessOrFail1(value, "Y", "success", vreceiptcode, csaleid);
}
} catch (Exception e) {
//记录失败
logger.error("无源件业务转换成U8C对象过程中、或者单据推送到U8C出现异常！", e);
@ -1079,8 +1077,10 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
BigDecimal groupTotalPayAmount1 = passiveStorageSonDetailsDto2.getGroupTotalPayAmount();
BigDecimal groupShipQty = passiveStorageSonDetailsDto2.getGroupShipQty();
//是否推送红字销售订单
boolean isPushU8CSaleOrder = false;
//当金额>0，但数量为0时，推送红字应收单
// if (groupTotalPayAmount1 != null && groupShipQty != null && groupTotalPayAmount1.compareTo(BigDecimal.ZERO) > 0 && groupShipQty.compareTo(BigDecimal.ZERO) == 0) {
try {
BdBusitypeEntity bdBusitypeEntity = u8cOperationFlowV4();
// 生成业务日期
@ -1210,15 +1210,9 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
}
//如果实推总金额>0、单数量等于0
// for (int i = 0; i < pushScenarioType.size(); i++) {
// ArapDjzbVO.Childrenn childrenn = pushScenarioType.get(i);
// childrenn.setJfbbje("1");
// }
// groupShipQty = new BigDecimal("0");
if ((filterJfbbjeIncludingTax(pushScenarioType)) && groupShipQty.compareTo(BigDecimal.ZERO) == 0) {
List<ArapDjzbVO.Childrenn> childrenns = filterZeroJfbbje(pushScenarioType);
if (childrenns != null && childrenns.size() > 0) {
if (childrenns != null && childrenns.size() > 0 && !"A".equals(newState)) {
// 推送U8C
List<ArapDjzbVO> arapDjzbVOList = new ArrayList<>();
ArapDjzbVO arapDjzbVO = new ArapDjzbVO();
@ -1239,8 +1233,12 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
logger.info("TOC红字应收单：{} 应收单主键：{} 销售公司：{}", djbh, vouchid, dwbm);
// 记录同步状态
updateSuccessOrFail3(value, "Y", "success", djbh, vouchid, value.get(0).getStorageTimeStamp());
updateSuccessOrFail3(value, "A", "success", djbh, vouchid, value.get(0).getStorageTimeStamp());
} else {
updateSuccessOrFail3(value, "N", "不符合条件，不推红字应收单", null, null, value.get(0).getStorageTimeStamp());
}
} else {
isPushU8CSaleOrder = true;
}
} catch (Exception e) {
logger.error("TOC红字应收单转换成U8C对象过程中、或者单据推送到U8C出现异常！", e);
@ -1251,10 +1249,9 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
updateSuccessOrFail3(value, "N", message, null, null, value.get(0).getStorageTimeStamp());
}
// }
//当金额大于或者等于0，数量大于0推送销售订单
// if (groupTotalPayAmount1 != null && groupShipQty != null && groupTotalPayAmount1.compareTo(BigDecimal.ZERO) >= 0 && groupShipQty.compareTo(BigDecimal.ZERO) > 0) {
if (isPushU8CSaleOrder) {
try {
String generateBusinessDate = value.get(0).getTargetBusinessDate().substring(0, 10);
@ -1304,38 +1301,12 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();
saleorderRequestDto.setChildrenvo(saleorderRequestChildrenDtoList);
//验证是否为指定的店铺，如果为true，则取结存价
// Boolean isCheckShopChoose = balanceUnitPriceUtil.checkOfsShop(header.getStoreCode());
//把汇总好的出库单明细行合并成一行
// PassiveStorageSonDetailsDto2 passiveStorageSonDetailsDto2 = groupMergeDetailedRows2(value, isCheckShopChoose);
//存货管理档案：取发货公司的存货管理档案
BdInvmandocEntity bdInvmandocEntity = value.get(0).getBdInvmandocEntity();
//存货基础档案
BdInvbasdocEntity bdInvbasdocEntity = value.get(0).getBdInvbasdocEntity();
//根据存货基础档案编码，查询当前存货的税率
BdTaxitemsEntity bdTaxitemsEntity1 = value.get(0).getBdTaxitemsEntity();
//查询收支项目
// BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
// BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
// String tax = new BigDecimal(bdTaxitemsEntity1.getTaxratio()).divide(new BigDecimal(100), 20, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
// BigDecimal noriginalcurprice = null;//无税单价
// BigDecimal noriginalcurmny = null;//无税金额
// BigDecimal noriginalcurtaxprice = null;//含税单价
// BigDecimal noriginalcursummny = null;//价税合计
// BigDecimal noriginalcurtaxmny = null;//税额=价税合计-无税金额
// try {
// noriginalcurtaxprice = passiveStorageSonDetailsDto2.getGroupTotalPayAmount().divide(passiveStorageSonDetailsDto2.getGroupShipQty(), 20, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP);
// noriginalcurprice = noriginalcurtaxprice.divide(new BigDecimal(1).add(new BigDecimal(tax)), 20, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP);
// noriginalcurmny = noriginalcurprice.multiply(passiveStorageSonDetailsDto2.getGroupShipQty()).setScale(2, BigDecimal.ROUND_HALF_UP);
// noriginalcursummny = noriginalcurtaxprice.multiply(passiveStorageSonDetailsDto2.getGroupShipQty()).setScale(2, BigDecimal.ROUND_HALF_UP);
// noriginalcurtaxmny = noriginalcursummny.subtract(noriginalcurmny).setScale(2, BigDecimal.ROUND_HALF_UP);
// } catch (Exception e) {
// logger.error("TOC退货-确认收入，金额计算错误", e);
// Assert.state(false, "U8C红字销售订单，金额计算错误，原因：{}", e.getMessage());
// }
// 判断是否为赠品
Boolean isblargessflag = false;
@ -1343,11 +1314,6 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
isblargessflag = true;
}
//合并后如果数量为0，则过滤掉
// if ("0".equals(passiveStorageSonDetailsDto2.getGroupShipQty().stripTrailingZeros().toPlainString())) {
// continue;
// }
SaleorderRequestChildrenDto saleorderRequestChildrenDto = new SaleorderRequestChildrenDto();
saleorderRequestChildrenDto.setBlargessflag(isblargessflag);//是否赠品
saleorderRequestChildrenDto.setCadvisecalbodyid(bdCalbodyEntity.getPkCalbody());//发货库存组织
@ -1458,9 +1424,13 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
//数量大于0,推送销售订单
if (groupShipQty.compareTo(BigDecimal.ZERO) > 0) {
// if (groupShipQty.compareTo(BigDecimal.ZERO) > 0) {
//过滤掉实入数量=0的
// checkSaleOrderNnumber(saleorderRequestChildrenDtoList);
boolean oneSuccess = false;
if (!"Y".equals(newState)) {
if (!"0".equals(passiveStorageSonDetailsDto2.getGroupShipQty().stripTrailingZeros().toPlainString())) {
//推送U8C红字销售订单，如果推送失败，抛出异常，那么就会外围的try catch捕获，代码不会往下执行
List<SaleorderRequestDto> saleorderRequestDtoList = new ArrayList<>();
saleorderRequestDtoList.add(saleorderRequestDto);
@ -1478,6 +1448,9 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
logger.info("TOC红字销售订单编号：{} 销售订单主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp);
updateSuccessOrFail3(value, "Y", "success", vreceiptcode, csaleid, value.get(0).getStorageTimeStamp());
oneSuccess = true;
} else {
updateSuccessOrFail3(value, "N", "不符合条件，不推送红字销售订单", null, null, value.get(0).getStorageTimeStamp());
}
} else {
oneSuccess = true;
}
@ -1485,6 +1458,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
//判断关联时间与交易成功时间，推送u8c生成蓝字销售订单,仅满足情况二的条件才生成这张蓝字销售订单
try {
if (!"Y".equals(def10) && oneSuccess && "2".equals(value.get(0).getStorageTimeStamp())) {
if (!"0".equals(passiveStorageSonDetailsDto2.getGroupShipQty().stripTrailingZeros().toPlainString())) {
SaleorderRequestDto saleorderRequestDto1 = transformRedSalesOrderToBlueSalesOrder(saleorderRequestDto, bdBusitypeEntity2);
List<SaleorderRequestDto> saleorderRequestDtoList2 = new ArrayList<>();
@ -1504,6 +1478,9 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
logger.info("TOC蓝字销售订单编号：{} 销售订单主键：{} 销售公司：{}", vreceiptcode2, csaleid2, pk_corp2);
updateSuccessOrFail4(value, "Y", "success", vreceiptcode2, csaleid2, value.get(0).getStorageTimeStamp());
} else {
updateSuccessOrFail4(value, "N", "不符合条件，不推送蓝字销售订单", null, null, value.get(0).getStorageTimeStamp());
}
}
} catch (Exception e) {
//记录蓝字销售订单异常失败
@ -1514,7 +1491,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
updateSuccessOrFail4(value, "N", message, null, null, value.get(0).getStorageTimeStamp());
}
}
// }
} catch (Exception e) {
//记录红字销售订单异常失败
logger.error("TOC退货业务转换成U8C对象过程中、或者单据推送到U8C出现异常！", e);
@ -1524,7 +1501,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
updateSuccessOrFail3(value, "N", message, null, null, value.get(0).getStorageTimeStamp());
}
// }
}
}
} else {
//2024年8月6日 11:28:54此处不记录失败，不认为是错误
@ -3665,6 +3642,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
public void run() {
try {
String successY = "Y";
String successA = "A";
if (value != null && value.size() > 0) {
List<OnlyAfterSalesBEntity> onlyAfterSalesBEntityArrayList = new ArrayList<>();
for (int i = 0; i < value.size(); i++) {
@ -3687,7 +3665,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
ofsPassiveorderDetailEntity.setNewPushDate(getNewDateStr());
ofsPassiveorderDetailEntity.setNewTransmitInfo(finalNewTransmitInfo);
ofsPassiveorderDetailEntity.setNewState(newstate);
if (successY.equals(newstate) || (newsystemnumber != null && newsystemprimary != null)) {
if ((successY.equals(newstate) || successA.equals(newstate)) || (newsystemnumber != null && newsystemprimary != null)) {
ofsPassiveorderDetailEntity.setNewsystemnumber(newsystemnumber);
ofsPassiveorderDetailEntity.setNewsystemprimary(newsystemprimary);
}
@ -3900,9 +3878,10 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
String newstate2 = null;
String storageTimeStamp = rerturnGoodsOrderSearchDetails.getStorageTimeStamp();
if ("2".equals(storageTimeStamp)) {
newstate1 = no2NameMap1.get(rerturnGoodsOrderSearchDetails.getId());
if ("A".equals(newstate1)) {
isSuccess = true;
} else if ("2".equals(storageTimeStamp)) {
newstate2 = no2NameMap2.get(rerturnGoodsOrderSearchDetails.getId());
if (newstate1 != null && !"".equals(newstate1) && (succeseeY.equals(newstate1) || succeseeH.equals(newstate1))) {
if (newstate2 != null && !"".equals(newstate2) && (succeseeY.equals(newstate2) || succeseeH.equals(newstate2))) {
@ -3910,7 +3889,6 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
}
}
} else if ("3".equals(storageTimeStamp)) {
newstate1 = no2NameMap1.get(rerturnGoodsOrderSearchDetails.getId());
if (newstate1 != null && !"".equals(newstate1) && (succeseeY.equals(newstate1) || succeseeH.equals(newstate1))) {
isSuccess = true;
}
@ -5065,4 +5043,29 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
return new BigDecimal(jfbbje).compareTo(BigDecimal.ZERO) != 0;
}).collect(Collectors.toList());
}
/**
* 判断实入数量如果为0，则过滤掉
*
* @param saleorderRequestChildrenDtoList u8c销售订单明细行
*/
// private void checkSaleOrderNnumber(List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList) {
// if (saleorderRequestChildrenDtoList == null || saleorderRequestChildrenDtoList.isEmpty()) {
// return;
// }
//
// // 过滤逻辑：转换为 BigDecimal 后判断是否为 0
// saleorderRequestChildrenDtoList.removeIf(dto -> {
// String numberStr = dto.getNnumber();
// if (numberStr == null) {
// return false; // 保留 null 值（根据业务需求调整）
// }
// try {
// BigDecimal number = new BigDecimal(numberStr);
// return number.compareTo(BigDecimal.ZERO) == 0;
// } catch (NumberFormatException e) {
// return false;
// }
// });
// }
}

52
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
View File

@ -998,8 +998,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
// }
//判断如果实入数量全部为0，则不推送u8c,部分存在0的则过滤掉
checkSaleOrderNnumber(saleorderRequestChildrenDtoList);
if (saleorderRequestChildrenDtoList.size() > 0) {
// checkSaleOrderNnumber(saleorderRequestChildrenDtoList);
if (!"0".equals(goodsRertunSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) {
if (ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType) || ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType)) {
//推送u8c生成红字销售订单
List<SaleorderRequestDto> saleorderRequestDtoList = new ArrayList<>();
@ -1443,11 +1443,13 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
//2025年8月25日10:42:30 不在此处验证，否则影响红字应收单推送
//判断入库时间（关单时间）与交易成功时间，推送u8c生成蓝字销售订单,仅满足情况二的条件才生成这张蓝字销售订单
//2025年8月25日10:59:26 把实入数量=0的明细行去掉
checkSaleOrderNnumber(saleorderRequestChildrenDtoList);
// checkSaleOrderNnumber(saleorderRequestChildrenDtoList);
boolean oneSuccess = false;
if (!"Y".equals(newstate4)) {
if ((ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType) || ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType)) && saleorderRequestChildrenDtoList.size() > 0) {
if ((ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType)
|| ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType))
&& !"0".equals(goodsRertunSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) {
//推送U8C红字销售订单，如果推送失败，抛出异常，那么就会外围的try catch捕获，代码不会往下执行
List<SaleorderRequestDto> saleorderRequestDtoList = new ArrayList<>();
saleorderRequestDtoList.add(saleorderRequestDto);
@ -1483,7 +1485,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
try {
//2025年8月25日10:41:37 如果实入数量全部0，蓝字销售订单则不推送，存在部分数量为0，则过滤
if (!"Y".equals(def15) && oneSuccess && "2".equals(oldValue.get(0).getStorageTimeStamp())) {
if ((ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType) || ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType)) && saleorderRequestChildrenDtoList.size() > 0) {
if ((ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType)
|| ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType))
&& !"0".equals(goodsRertunSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) {
if ("2".equals(oldValue.get(0).getStorageTimeStamp())) {
SaleorderRequestDto saleorderRequestDto1 = transformRedSalesOrderToBlueSalesOrder(saleorderRequestDto, bdBusitypeEntity2);
@ -4308,23 +4312,23 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
*
* @param saleorderRequestChildrenDtoList u8c销售订单明细行
*/
private void checkSaleOrderNnumber(List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList) {
if (saleorderRequestChildrenDtoList == null || saleorderRequestChildrenDtoList.isEmpty()) {
return;
}
// 过滤逻辑：转换为 BigDecimal 后判断是否为 0
saleorderRequestChildrenDtoList.removeIf(dto -> {
String numberStr = dto.getNnumber();
if (numberStr == null) {
return false; // 保留 null 值（根据业务需求调整）
}
try {
BigDecimal number = new BigDecimal(numberStr);
return number.compareTo(BigDecimal.ZERO) == 0;
} catch (NumberFormatException e) {
return false;
}
});
}
// private void checkSaleOrderNnumber(List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList) {
// if (saleorderRequestChildrenDtoList == null || saleorderRequestChildrenDtoList.isEmpty()) {
// return;
// }
//
// // 过滤逻辑：转换为 BigDecimal 后判断是否为 0
// saleorderRequestChildrenDtoList.removeIf(dto -> {
// String numberStr = dto.getNnumber();
// if (numberStr == null) {
// return false; // 保留 null 值（根据业务需求调整）
// }
// try {
// BigDecimal number = new BigDecimal(numberStr);
// return number.compareTo(BigDecimal.ZERO) == 0;
// } catch (NumberFormatException e) {
// return false;
// }
// });
// }
}