From 006600ed164dd955ebb4a4942b563afcb6a5d5a1 Mon Sep 17 00:00:00 2001 From: erzhongxmu Date: Wed, 7 Oct 2020 05:59:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=86=E7=BB=84=E5=92=8C?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9F=A5=E6=89=BE=E5=82=A8=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zzjee/md/entity/MdBinEntity.java | 6 +- .../web/system/sms/util/task/SmsSendTask.java | 60 +++++++++++++++++-- .../webapp/webpage/com/zzjee/md/mdBin-add.jsp | 11 ++++ .../webpage/com/zzjee/md/mdBin-update.jsp | 10 ++++ .../webapp/webpage/com/zzjee/md/mdBinList.jsp | 5 +- 5 files changed, 83 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zzjee/md/entity/MdBinEntity.java b/src/main/java/com/zzjee/md/entity/MdBinEntity.java index 717ec2ff..deac564f 100644 --- a/src/main/java/com/zzjee/md/entity/MdBinEntity.java +++ b/src/main/java/com/zzjee/md/entity/MdBinEntity.java @@ -65,6 +65,9 @@ public class MdBinEntity implements java.io.Serializable { @Excel(name="所属客户") private java.lang.String suoShuKeHu; /**体积单位*/ + /**最大面积*/ + @Excel(name="储位组别") + private java.lang.String zuiDaMianJi; @Excel(name="最小批量") private java.lang.String tiJiDanWei; @@ -82,8 +85,7 @@ public class MdBinEntity implements java.io.Serializable { /**最大重量*/ @Excel(name="最大重量") private java.lang.String zuiDaZhongLiang; - /**最大面积*/ - private java.lang.String zuiDaMianJi; + /**最大托盘*/ @Excel(name="最大托盘") private java.lang.String zuiDaTuoPan; 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 fd3dbe7b..773e3b76 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 @@ -100,8 +100,29 @@ public class SmsSendTask { } catch (Exception e) { zuidatiji = "1"; } + String binplantuopan = "0"; + try{ + WmImNoticeIEntity wmImNoticeIEntity = systemService.get(WmImNoticeIEntity.class,wmInQmIEntity.getImNoticeItem()) ; + binplantuopan = wmImNoticeIEntity.getBinPlan() ; + }catch (Exception e){ - sql = "select binid from wv_avabin where ku_wei_lei_xing <> '不良品区' and zui_da_ti_ji >" + } + + String hqllastbin = "from WmInQmIEntity t where t.binSta=? and (t.binId is not null or t.binId <> '' ) and imNoticeItem = ? order by updateDate desc "; + + List WmInQmbinlist = systemService.findHql(hql, new Object[] { "Y" },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){ + lastbinfenzu = mdblist.get(0).getZuiDaMianJi(); + } + } + sql = "select binid from wv_avabin where ku_wei_lei_xing <> '不良品区' and zui_da_mian_ji = '" +lastbinfenzu+ + "' and zui_da_ti_ji >" + zuidatiji + " and ku_wei_shu_xing = (select cf_wen_ceng from mv_goods where goods_code = '" + wmInQmIEntity.getGoodsId() @@ -113,13 +134,42 @@ public class SmsSendTask { + wmInQmIEntity.getCusCode() + "') " + "order by suo_shu_ke_hu desc, shang_jia_ci_xu,binid limit 1"; + org.jeecgframework.core.util.LogUtil + .info("===================sql1==================="+sql); + binMap = systemService.findOneForJdbc(sql); + if (binMap != null) { + wmInQmIEntity.setBinId(binMap.get("binid").toString()); + systemService.updateEntitie(wmInQmIEntity); + }else{ + + sql = "select binid from wv_avabin where ku_wei_lei_xing <> '不良品区' and ti_ji_dan_wei <= " +binplantuopan+ + " and zhong_liang_dan_wei >= " +binplantuopan+ + " and zui_da_ti_ji >" + + zuidatiji + + " and ku_wei_shu_xing = (select cf_wen_ceng from mv_goods where goods_code = '" + + wmInQmIEntity.getGoodsId() + + "')" + + " and locate( (select chp_shu_xing from mv_goods where goods_code = '" + + wmInQmIEntity.getGoodsId() + + "') ,chp_shu_xing ) <> 0 " + + " and (suo_shu_ke_hu = '' or suo_shu_ke_hu = '" + + wmInQmIEntity.getCusCode() + + "') " + + "order by suo_shu_ke_hu desc, shang_jia_ci_xu,binid limit 1"; + org.jeecgframework.core.util.LogUtil + .info("===================sql2==================="+sql); + binMap = systemService.findOneForJdbc(sql); + + if (binMap != null) { + wmInQmIEntity.setBinId(binMap.get("binid").toString()); + systemService.updateEntitie(wmInQmIEntity); + } + + } } - if (binMap != null) { - wmInQmIEntity.setBinId(binMap.get("binid").toString()); - systemService.updateEntitie(wmInQmIEntity); - } + } } //更新基本数量和单位 diff --git a/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp b/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp index f48c7988..e9348dee 100644 --- a/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp +++ b/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp @@ -336,6 +336,17 @@ +
+ 储位组别 +
+ +
+ + + +
+ diff --git a/src/main/webapp/webpage/com/zzjee/md/mdBin-update.jsp b/src/main/webapp/webpage/com/zzjee/md/mdBin-update.jsp index e98d790e..39a935c5 100644 --- a/src/main/webapp/webpage/com/zzjee/md/mdBin-update.jsp +++ b/src/main/webapp/webpage/com/zzjee/md/mdBin-update.jsp @@ -343,7 +343,17 @@ +
+ 储位组别 +
+
+ + + +
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdBinList.jsp b/src/main/webapp/webpage/com/zzjee/md/mdBinList.jsp index 4442516b..6f3281d3 100644 --- a/src/main/webapp/webpage/com/zzjee/md/mdBinList.jsp +++ b/src/main/webapp/webpage/com/zzjee/md/mdBinList.jsp @@ -27,11 +27,12 @@ - + + + -