diff --git a/src/main/java/com/zzjee/mvyj/entity/MvStockYjEntity.java b/src/main/java/com/zzjee/mvyj/entity/MvStockYjEntity.java index 3380daeb..5423b068 100644 --- a/src/main/java/com/zzjee/mvyj/entity/MvStockYjEntity.java +++ b/src/main/java/com/zzjee/mvyj/entity/MvStockYjEntity.java @@ -42,10 +42,10 @@ public class MvStockYjEntity implements java.io.Serializable { @Excel(name="基本单位") private java.lang.String baseUnit; /**储位*/ - + @Excel(name="储位") private java.lang.String kuWeiBianMa; /**托盘*/ - + @Excel(name="托盘") private java.lang.String binId; /**客户编码*/ @Excel(name="客户编码") @@ -73,7 +73,7 @@ public class MvStockYjEntity implements java.io.Serializable { /**剩余天数*/ @Excel(name="剩余天数") private java.lang.String resDate; - + @Excel(name="剩余比例") private java.lang.String guoqiBili; /**取货次序*/ 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 79b86cae..d0f21bd3 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 @@ -452,7 +452,8 @@ public class SmsSendTask { + " 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 "; List> resultt = new ArrayList>(); System.out.print(tsql); - if(!"off".equals(ResourceUtil.getConfigByName("hiti"))) {//不启用HITI 此处不操作 + if(!"off".equals(ResourceUtil.getConfigByName("hiti"))) { + //不启用HITI 此处不操作 try { resultt = systemService .findForJdbc(tsql, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode()); diff --git a/src/main/webapp/webpage/com/zzjee/mvyj/mvStockYjList.jsp b/src/main/webapp/webpage/com/zzjee/mvyj/mvStockYjList.jsp index 1b275626..e959219b 100644 --- a/src/main/webapp/webpage/com/zzjee/mvyj/mvStockYjList.jsp +++ b/src/main/webapp/webpage/com/zzjee/mvyj/mvStockYjList.jsp @@ -20,7 +20,7 @@ - + <%-- --%> <%-- --%> @@ -30,7 +30,7 @@ <%-- --%> <%-- --%> <%-- --%> - <%----%> + <%-- --%>