From 88d1fb28fb564812fda8271f721f28e7056c3503 Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Mon, 24 Sep 2018 13:01:46 +0800
Subject: [PATCH] =?UTF-8?q?1,=E5=87=BA=E8=B4=A7=E9=80=89=E6=8B=A9=E6=89=98?=
 =?UTF-8?q?=E5=82=A8=E4=BD=8D=EF=BC=8C=E6=89=98=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/controller/WmOmNoticeHController.java  |   2 +
 .../com/zzjee/wm/page/WmNoticeImpPage.java    |  11 +
 .../web/system/sms/util/task/SmsSendTask.java |  11 +-
 .../webpage/com/zzjee/wm/wmImNoticeIList.jsp  |   1 +
 .../webpage/com/zzjee/wm/wmOmNoticeIList.jsp  | 261 ++++++++++++++++++
 5 files changed, 285 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index ddf58619..ac9fa4f4 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -1748,6 +1748,7 @@ public class WmOmNoticeHController extends BaseController {
 //                               wmi.setGoodsPrdData(billResult.getData().get(s).getDetail().get(k).getPdProdmadedate2User());
 							wmi.setOtherId(page.getOtherId());
 							wmi.setBinId(page.getBinId());
+							wmi.setBinOm(page.getBinOm());
 							if(StringUtil.isNotEmpty(page.getGoodsProData())){
 								wmi.setGoodsProData(DateUtils.str2Date(page.getGoodsProData(),DateUtils.date_sdf));
 							}
@@ -1890,6 +1891,7 @@ public class WmOmNoticeHController extends BaseController {
 
 //                               wmi.setGoodsPrdData(billResult.getData().get(s).getDetail().get(k).getPdProdmadedate2User());
 							wmi.setOtherId(page.getOtherId());
+							wmi.setBinOm(page.getBinOm());
 							wmi.setBinId(page.getBinId());
 							if(StringUtil.isNotEmpty(page.getGoodsProData())){
 								wmi.setGoodsProData(DateUtils.str2Date(page.getGoodsProData(),DateUtils.date_sdf));
diff --git a/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java b/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java
index 99b51c10..f686d411 100644
--- a/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java
+++ b/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java
@@ -88,6 +88,10 @@ public class WmNoticeImpPage implements java.io.Serializable {
 	@Excel(name="单位")
 	private java.lang.String goodsUnit;
 
+
+	@Excel(name="储位")
+	private java.lang.String binOm;
+
 	@Excel(name="托盘")
 	private java.lang.String binId;
 
@@ -415,6 +419,13 @@ public class WmNoticeImpPage implements java.io.Serializable {
 		this.delvAddr = delvAddr;
 	}
 
+	public String getBinOm() {
+		return binOm;
+	}
+
+	public void setBinOm(String binOm) {
+		this.binOm = binOm;
+	}
 
 	public String getBinId() {
 		return binId;
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 8f366fe9..653a855b 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
@@ -394,10 +394,13 @@ public class SmsSendTask {
 			String  usetuopan  = ResourceUtil.getConfigByName("usetuopan");
 			String  prodate = null;
 			String  tuopanma ="";
+			String binom = "";
 			if("no".equals(usetuopan)){
 				tuopanma = ResourceUtil.getConfigByName("tuopanma");
 			}
 			for (WmOmNoticeIEntity wmOmNoticeIEntity : WmOmNoticeIlist) {
+				binom ="";
+				binom = wmOmNoticeIEntity.getBinOm();
 				prodate = null;
 				if(StringUtil.isNotEmpty(wmOmNoticeIEntity.getGoodsProData())){
 					prodate= DateUtils.date2Str(wmOmNoticeIEntity.getGoodsProData(),DateUtils.date_sdf);
@@ -486,6 +489,10 @@ public class SmsSendTask {
 							tsql = tsql + " and ws.goods_pro_data = '"+prodate + "' ";
 						}
 
+						if(StringUtil.isNotEmpty(binom)) {
+							tsql = tsql + " and ws.ku_wei_bian_ma = '"+binom + "' ";
+						}
+
 						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 ";
@@ -531,7 +538,9 @@ public class SmsSendTask {
 										tsqlz = tsqlz
 												+ "   and ws.goods_pro_data = '" + goodprodata + "'";
 									}
-
+									if(StringUtil.isNotEmpty(binom)) {
+										tsqlz = tsqlz + " and ws.ku_wei_bian_ma = '"+binom + "' ";
+									}
 									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";
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmImNoticeIList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmImNoticeIList.jsp
index b5d9fbea..d51c2a47 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmImNoticeIList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmImNoticeIList.jsp
@@ -1521,3 +1521,4 @@
 	</c:if>	
 	</tbody>
 </table>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp
index ba7c57d3..55f2c132 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp
@@ -96,6 +96,9 @@
 					  <th>
 							下架任务是否已生成
 					  </th>
+			  <th>
+				  出货储位
+			  </th>
 					  <th>
 						  出货托盘
 					  </th>
@@ -128,6 +131,13 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+
+				<td>
+					<input name="wmOmNoticeIList[0].binOm" maxlength="32"
+						   type="text" class="form-control"  style="width:120px;" >
+					<label class="Validform_label" style="display: none;">出货储位</label>
+				</td>
+
 				<td>
 					<input name="wmOmNoticeIList[0].binId" maxlength="32"
 						   type="text" class="form-control"  style="width:120px;" >
@@ -161,6 +171,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[1].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[1].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -194,6 +209,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[2].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[2].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -227,6 +247,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[3].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[3].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -260,6 +285,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[4].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[4].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -293,6 +323,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[5].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[5].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -326,6 +361,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[6].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[6].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -359,6 +399,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[7].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[7].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -392,6 +437,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[8].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[8].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -425,6 +475,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[9].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[9].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -458,6 +513,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[10].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[10].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -491,6 +551,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[11].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[11].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -524,6 +589,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[12].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[12].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -557,6 +627,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[13].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[13].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -590,6 +665,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[14].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[14].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -623,6 +703,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[15].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[15].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -656,6 +741,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[16].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[16].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -689,6 +779,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[17].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[17].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -722,6 +817,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[18].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[18].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -755,6 +855,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[19].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[19].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -788,6 +893,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[20].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[20].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -821,6 +931,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+							<td>
+								<input name="wmOmNoticeIList[21].binOm" maxlength="32"
+									   type="text" class="form-control"  style="width:120px;" >
+								<label class="Validform_label" style="display: none;">出货储位</label>
+							</td>
 							<td>
 								<input name="wmOmNoticeIList[21].binId" maxlength="32"
 									   type="text" class="form-control"  style="width:120px;" >
@@ -853,6 +968,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+				<td>
+					<input name="wmOmNoticeIList[22].binOm" maxlength="32"
+						   type="text" class="form-control"  style="width:120px;" >
+					<label class="Validform_label" style="display: none;">出货储位</label>
+				</td>
 				<td>
 					<input name="wmOmNoticeIList[22].binId" maxlength="32"
 						   type="text" class="form-control"  style="width:120px;" >
@@ -874,6 +994,11 @@
 					<t:choose  hiddenName="wmOmNoticeIList[23].goodsId" hiddenid="goodsName" url="mvGoodsController.do?list" name="mvGoodsList" width="600"  height="410" icon="icon-search" title="选择" textname="goodsName"  isInit="true"></t:choose>	  
 					  <label class="Validform_label" style="display: none;">出货商品</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[23].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 				        <td>
 					  	<input name="wmOmNoticeIList[23].goodsQua" maxlength="32" 
 					  		type="text" class="form-control"  style="width:120px;" >
@@ -915,6 +1040,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+			<td>
+				<input name="wmOmNoticeIList[24].binOm" maxlength="32"
+					   type="text" class="form-control"  style="width:120px;" >
+				<label class="Validform_label" style="display: none;">出货储位</label>
+			</td>
 			<td>
 				<input name="wmOmNoticeIList[24].binId" maxlength="32"
 					   type="text" class="form-control"  style="width:120px;" >
@@ -946,6 +1076,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[25].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[25].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -977,6 +1112,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[26].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[26].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1008,6 +1148,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[27].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[27].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1039,6 +1184,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[28].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[28].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1070,6 +1220,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[29].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[29].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1101,6 +1256,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[30].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[30].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1132,6 +1292,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[31].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[31].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1163,6 +1328,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[32].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[32].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1194,6 +1364,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[33].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[33].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1225,6 +1400,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[34].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[34].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1256,6 +1436,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[35].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[35].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1287,6 +1472,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[36].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[36].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1318,6 +1508,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[37].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[37].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1349,6 +1544,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[38].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[38].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1380,6 +1580,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[39].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[39].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1411,6 +1616,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[40].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[40].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1442,6 +1652,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[41].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[41].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1473,6 +1688,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[42].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[42].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1504,6 +1724,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[43].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[43].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1535,6 +1760,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[44].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[44].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1566,6 +1796,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[45].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[45].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1597,6 +1832,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[46].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[46].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1628,6 +1868,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[47].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[47].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1659,6 +1904,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[48].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[48].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1690,6 +1940,11 @@
 										typeGroupCode="sf_yn" defaultVal="${wmOmNoticeHPage.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+	<td>
+		<input name="wmOmNoticeIList[49].binOm" maxlength="32"
+			   type="text" class="form-control"  style="width:120px;" >
+		<label class="Validform_label" style="display: none;">出货储位</label>
+	</td>
 	<td>
 		<input name="wmOmNoticeIList[49].binId" maxlength="32"
 			   type="text" class="form-control"  style="width:120px;" >
@@ -1758,6 +2013,11 @@ wmOmNoticeIList[${stuts.index }].goodsId<input name="wmOmNoticeIList[${stuts.ind
 										typeGroupCode="sf_yn" defaultVal="${poVal.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>     
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
+				<td align="left">
+					<input name="wmOmNoticeIList[${stuts.index }].binOm" maxlength="32"
+						   type="text" class="form-control"  style="width:120px;"  value="${poVal.binOm }">
+					<label class="Validform_label" style="display: none;">出货储位</label>
+				</td>
 				<td align="left">
 					<input name="wmOmNoticeIList[${stuts.index }].binId" maxlength="32"
 						   type="text" class="form-control"  style="width:120px;"  value="${poVal.binId }">
@@ -1783,3 +2043,4 @@ wmOmNoticeIList[${stuts.index }].goodsId<input name="wmOmNoticeIList[${stuts.ind
 	</c:if>	
 	</tbody>
 </table>
+</div>
\ No newline at end of file