From 5a6de22f5553f3e214f322bb7243ee6b3a0c7b0c Mon Sep 17 00:00:00 2001 From: erzhongxmu Date: Tue, 7 Feb 2023 13:47:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E6=8E=A8=E8=8D=90=E5=82=A8?= =?UTF-8?q?=E4=BD=8D=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/system/sms/util/task/SmsSendTask.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 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 1806f8ef..b4e253ce 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 @@ -24,6 +24,7 @@ import com.zzjee.wm.entity.WmOmQmIEntity; import com.zzjee.wm.entity.WmToDownGoodsEntity; import com.zzjee.wm.entity.WmToMoveGoodsEntity; import com.zzjee.wm.entity.WmToUpGoodsEntity; +import org.springframework.util.CollectionUtils; /** * @@ -88,16 +89,12 @@ public class SmsSendTask { + " ' and t.bin_sta = 'N' and ( t.bin_id <> '' or t.bin_id <> null) limit 1"; Map binMap = systemService.findOneForJdbc(sql); if(binMap==null){ - if(wmInQmIEntity.getTinTj()==null){ - wmInQmIEntity.setTinTj("0"); + if(StringUtil.isEmpty(wmInQmIEntity.getTinTj())){ + wmInQmIEntity.setTinTj("1"); } String zuidatiji = null; try { - if(StringUtil.isEmpty( wmInQmIEntity.getTinTj())){ - zuidatiji = "1"; - }else{ zuidatiji = wmInQmIEntity.getTinTj(); - } } catch (Exception e) { zuidatiji = "1"; } @@ -111,17 +108,14 @@ public class SmsSendTask { }catch (Exception e){ } - String hqllastbin = "from WmInQmIEntity t where t.binSta= 'Y' and (t.binId is not null or t.binId <> '' ) and imNoticeItem = ? order by updateDate desc "; - List WmInQmbinlist = systemService.findHql(hqllastbin,wmInQmIEntity.getImNoticeItem()); - String lastbin = ""; //本单上一个储位 String lastbinfenzu = ""; //本单上一个储位分组 if(WmInQmbinlist!=null&&WmInQmbinlist.size()>0){ lastbin = WmInQmbinlist.get(0).getBinId(); List mdblist = systemService.findByProperty(MdBinEntity.class, "kuWeiBianMa", lastbin); - if(mdblist!=null&&mdblist.size()>0){ + if(!CollectionUtils.isEmpty(mdblist) ){ lastbinfenzu = mdblist.get(0).getZuiDaMianJi(); } }