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 daeb4f03..a188d903 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 @@ -153,7 +153,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } }, "执行插件:" + getPluginName() + " " + requestJsonParam); thread.start(); - + if (requestJson != null && requestJson.get("type") != null && ProfilesActiveConstant.TYPE_DETAIL_ERROR.equals(requestJson.get("type"))) { try { thread.join(); @@ -2869,6 +2869,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { // goodsRertunSonDetailsDto.setReceivedQty("1"); String receivedQty = goodsRertunSonDetailsDto.getReceivedQty(); + //TODO 测试 + receivedQty = "0"; Assert.notNull(receivedQty, "售后订单:{} 存货明细行:{} 请求数量不能为空!", header1.getCode(), goodsRertunSonDetailsDto.getId()); Assert.state(!"".equals(receivedQty), header1.getCode(), goodsRertunSonDetailsDto.getId()); if ("0".equals(new BigDecimal(receivedQty).stripTrailingZeros().toPlainString())) { 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 fe3c7359..bedd6584 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 @@ -34,12 +34,12 @@ public class SoSaleReturnPluginInitializerToCTest { @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-RE2024121200000274"; + soSaleReturnPluginInitializerToC.startImplementByCode(code, "tran"); + } catch (Exception e) { + e.printStackTrace(); + } // List<StartAndEndVo> startAndEndVos = soSaleReturnPluginInitializerToC.calculateCalculateEntireDayPeriod(null); // soSaleReturnPluginInitializerToC.startImplementStockByTime(startAndEndVos.get(0).getStart_time(), startAndEndVos.get(0).getEnd_time()); @@ -58,11 +58,11 @@ public class SoSaleReturnPluginInitializerToCTest { // 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()); +// 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