diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 96137bfe..b1f115f8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -257,8 +257,16 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { //满足以下两个场景时:触发Mysql还原O销售出库的对象 //1:中台->u8c TocofsSaleoutDetailedEntity tocofsSaleoutDetailedEntity = new TocofsSaleoutDetailedEntity(); - tocofsSaleoutDetailedEntity.setBusinessDateStart(startTime); - tocofsSaleoutDetailedEntity.setBusinessDateEnd(endTime); + if (startTime.length() == 19) { + tocofsSaleoutDetailedEntity.setBusinessDateStart(startTime); + } else { + tocofsSaleoutDetailedEntity.setBusinessDateStart(startTime + " 00:00:00"); + } + if (endTime.length() == 19) { + tocofsSaleoutDetailedEntity.setBusinessDateEnd(endTime); + } else { + tocofsSaleoutDetailedEntity.setBusinessDateEnd(endTime + " 23:59:59"); + } tocofsSaleoutDetailedEntity.setBusinesstype("TOC_ORDER"); headerDetailsDtoList = queryTocOfsSaleoutDetailed(tocofsSaleoutDetailedEntity); } else { @@ -449,8 +457,16 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { //满足以下两个场景时:触发Mysql还原O销售出库的对象 //1:中台->u8c TocofsSaleoutDetailedEntity tocofsSaleoutDetailedEntity = new TocofsSaleoutDetailedEntity(); - tocofsSaleoutDetailedEntity.setSuccessfultradedateStart(startTime); - tocofsSaleoutDetailedEntity.setSuccessfultradedateEnd(endTime); + if (startTime.length() == 19) { + tocofsSaleoutDetailedEntity.setSuccessfultradedateStart(startTime); + } else { + tocofsSaleoutDetailedEntity.setSuccessfultradedateStart(startTime + " 00:00:00"); + } + if (endTime.length() == 19) { + tocofsSaleoutDetailedEntity.setSuccessfultradedateEnd(endTime); + } else { + tocofsSaleoutDetailedEntity.setSuccessfultradedateEnd(endTime + " 23:59:59"); + } tocofsSaleoutDetailedEntity.setBusinesstype("TOC_ORDER"); headerDetailsDtoList = queryTocOfsSaleoutDetailed(tocofsSaleoutDetailedEntity); } else { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index 68156dcc..3b62c98b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -235,8 +235,16 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); } else if (ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType)) { TocofsReturngoodsDetailedEntity tocofsReturngoodsDetailedEntity = new TocofsReturngoodsDetailedEntity(); - tocofsReturngoodsDetailedEntity.setBusinessDateStart(startTime); - tocofsReturngoodsDetailedEntity.setBusinessDateEnd(endTime); + if (startTime.length() == 19) { + tocofsReturngoodsDetailedEntity.setBusinessDateStart(startTime); + } else { + tocofsReturngoodsDetailedEntity.setBusinessDateStart(startTime + " 00:00:00"); + } + if (endTime.length() == 19) { + tocofsReturngoodsDetailedEntity.setBusinessDateEnd(endTime); + } else { + tocofsReturngoodsDetailedEntity.setBusinessDateEnd(endTime + " 23:59:59"); + } tocofsReturngoodsDetailedEntity.setBusinesstype("TOC_RETURN"); returnGoodHeaderDetailsDataDtoArrayList = queryTocofsReturngoodsDetailed(tocofsReturngoodsDetailedEntity); } else { @@ -356,8 +364,16 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); } else if (ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType)) { TocofsReturngoodsDetailedEntity tocofsReturngoodsDetailedEntity = new TocofsReturngoodsDetailedEntity(); - tocofsReturngoodsDetailedEntity.setRefundedAtStart(startTime); - tocofsReturngoodsDetailedEntity.setRefundedAtEnd(endTime); + if (startTime.length() == 19) { + tocofsReturngoodsDetailedEntity.setRefundedAtStart(startTime); + } else { + tocofsReturngoodsDetailedEntity.setRefundedAtStart(startTime + " 00:00:00"); + } + if (endTime.length() == 19) { + tocofsReturngoodsDetailedEntity.setRefundedAtEnd(endTime); + } else { + tocofsReturngoodsDetailedEntity.setRefundedAtEnd(endTime + " 23:59:59"); + } tocofsReturngoodsDetailedEntity.setBusinesstype("TOC_RETURN"); returnGoodHeaderDetailsDataDtoArrayList = queryTocofsReturngoodsDetailed(tocofsReturngoodsDetailedEntity); } else { @@ -2903,7 +2919,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { //测试 // goodsRertunSonDetailsDto.setReceivedQty("1"); - + String receivedQty = goodsRertunSonDetailsDto.getReceivedQty(); Assert.notNull(receivedQty, "售后订单:{} 存货明细行:{} 请求数量不能为空!", header1.getCode(), goodsRertunSonDetailsDto.getId()); Assert.state(!"".equals(receivedQty), header1.getCode(), goodsRertunSonDetailsDto.getId()); @@ -3083,7 +3099,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { List tocofsReturngoodsDetailedEntityList1 = new ArrayList<>(); for (int j = 0; j < tocofsReturngoodsDetailedEntityList.size(); j++) { TocofsReturngoodsDetailedEntity tocofsReturngoodsDetailedEntity1 = tocofsReturngoodsDetailedEntityList.get(j); - if (tocofsReturngoodsDetailedEntity.getMaintableid().equals(tocofsReturngoodsEntity.getId())) { + if (tocofsReturngoodsDetailedEntity1.getMaintableid().equals(tocofsReturngoodsEntity.getId())) { tocofsReturngoodsDetailedEntityList1.add(tocofsReturngoodsDetailedEntity1); } } 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 d80245aa..1fff08c5 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 @@ -46,7 +46,7 @@ public class SoSaleReturnPluginInitializerToCTest { try { - soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-12-24 16:02:17", "2024-12-24 16:02:17","0"); + soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-12-24 16:02:17", "2024-12-24 16:02:17", "2"); // JSONObject jsonObject = new JSONObject(); // soSaleReturnPluginInitializerToC.executeBusiness(jsonObject);