From 3de74393d40fa1db3a9331912679f514b05a299b Mon Sep 17 00:00:00 2001 From: erzhongxmu Date: Wed, 15 Feb 2023 07:53:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E7=AD=96=E7=95=A5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE-=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/system/sms/util/task/SmsSendTask.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java b/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java index 9c8bef03..07f63ced 100644 --- a/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java +++ b/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java @@ -519,7 +519,12 @@ public class SmsSendTask { tsql = tsql + " and ws.goods_id = ? " + " and ws.cus_code = ? " - + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data having sum(ws.base_goodscount) > 0 order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc "; + + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data having sum(ws.base_goodscount) > 0 " ; + if ("no".equals(ResourceUtil.getConfigByName("scrqon"))) { + tsql = tsql + " order by mb.qu_huo_ci_xu, ws.goods_pro_data , ws.goods_qua ,ws.create_date desc "; + }else{ + tsql = tsql + " order by ws.goods_pro_data , mb.qu_huo_ci_xu, ws.goods_qua ,ws.create_date desc "; + } List> resultt = new ArrayList>(); System.out.print(tsql); if (!"off".equals(ResourceUtil.getConfigByName("hiti"))) { @@ -572,7 +577,13 @@ public class SmsSendTask { } tsqlz = tsqlz + " and (ws.base_goodscount + 0) = ? " - + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data having sum(ws.base_goodscount) > 0 order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc"; + + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data having sum(ws.base_goodscount) > 0 " ; + if ("no".equals(ResourceUtil.getConfigByName("scrqon"))) { + tsqlz = tsqlz + "order by mb.qu_huo_ci_xu,ws.goods_pro_data , ws.goods_qua ,ws.create_date desc"; + }else{ + tsqlz = tsqlz + "order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc"; + } + List> resultz = systemService .findForJdbc(tsqlz, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode(), hiti); System.out.print("****************tsqlz" + tsqlz);