From 171cede5884bc850d36d03344171e69fe5c764de Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Fri, 31 May 2019 22:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=9E=B6=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zzjee/wm/controller/WmOmNoticeHController.java   |  2 +-
 .../wm/service/impl/WmOmNoticeHServiceImpl.java      |  5 ++++-
 .../webapp/webpage/com/jeecg/demo/form_uitag.jsp     |  3 ++-
 .../webpage/com/zzjee/wm/wmOmNoticeH-update.jsp      | 12 ++++++------
 .../webapp/webpage/com/zzjee/wm/wmOmtmsIList.jsp     | 12 +++++++-----
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index 44fe4333..bb32dc4f 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -1859,7 +1859,7 @@ public class WmOmNoticeHController extends BaseController {
 	@ResponseBody
 	public AjaxJson doUpdate(WmOmNoticeHEntity wmOmNoticeH,WmOmNoticeHPage wmOmNoticeHPage, HttpServletRequest request) {
 		List<WmOmNoticeIEntity> wmOmNoticeIList =  wmOmNoticeHPage.getWmOmNoticeIList();
-		List<TmsYwDingdanEntity> wmOmtmsIList =  wmOmNoticeHPage.getWmOmtmsIList();
+		List<TmsYwDingdanEntity> wmOmtmsIList =   wmOmNoticeHPage.getWmOmtmsIList();
 		AjaxJson j = new AjaxJson();
 		String message = "更新成功";
 		try{
diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
index 2a113afe..48fc77cb 100644
--- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
+++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
@@ -187,8 +187,11 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot
 		}
 
 		//3.筛选更新明细数据-运输商品明细
+		String hql1 ="from TmsYwDingdanEntity where 1 = 1 AND ywkhdh = ? ";
+		List<TmsYwDingdanEntity> wmOmtmsIOldList = this.findHql(hql1,id0);
+
 		if(wmOmtmsIList!=null&&wmOmtmsIList.size()>0){
-			for(TmsYwDingdanEntity oldE:wmOmtmsIList){
+			for(TmsYwDingdanEntity oldE:wmOmtmsIOldList){
 				boolean isUpdate = false;
 				for(TmsYwDingdanEntity sendE:wmOmtmsIList){
 					//需要更新的明细数据-出货商品明细
diff --git a/src/main/webapp/webpage/com/jeecg/demo/form_uitag.jsp b/src/main/webapp/webpage/com/jeecg/demo/form_uitag.jsp
index 219d4c4d..691222c0 100644
--- a/src/main/webapp/webpage/com/jeecg/demo/form_uitag.jsp
+++ b/src/main/webapp/webpage/com/jeecg/demo/form_uitag.jsp
@@ -37,7 +37,8 @@
 		</tr>
 		<tr>
 			<td align="center" width="100px"><label class="Validform_label">checkbox:</label></td>
-			<td class="value"><t:dictSelect field="dbtype" type="checkbox" typeGroupCode="dbtype" hasLabel="false" title="数据库类型" defaultVal="oracle,mysql"></t:dictSelect> 
+			<td class="value">
+				<t:dictSelect field="dbtype" type="checkbox" typeGroupCode="dbtype" hasLabel="false" title="数据库类型" defaultVal="oracle,mysql"></t:dictSelect>
 			<span class="Validform_checktip"></span>
 			</td>
 		</tr>
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-update.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-update.jsp
index 62017be2..d634a258 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-update.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-update.jsp
@@ -513,18 +513,18 @@
 			  <%-- 											dictCondition="${wmOmNoticeHPage.wherecon}"				dictTable="mv_goods" dictField="goods_code" dictText="goods_name" defaultVal="" hasLabel="false"  title="商品编码"></t:dictSelect>      --%>
 
 
-			  <input id="wmOmtmsIList[#index#].fahuoren"    maxlength="32"
-					 ignore="ignore"
-					 type="text" class="form-control searchbox-inputtext"    style="width:420px;text-align: left" >
+			  <%--<input id="wmOmtmsIList[#index#].fahuoren"    maxlength="32"--%>
+					 <%--ignore="ignore"--%>
+					 <%--type="text" class="form-control searchbox-inputtext"    style="width:120px;text-align: left" >--%>
 
+                  <t:dictSelect field="wmOmtmsIList[#index#].fahuoren" type="select" typeGroupCode="tms_kd" hasLabel="false"  defaultVal=""></t:dictSelect>
 
-
-			  <label class="Validform_label" style="display: none;">快递公司</label>
+                  <label class="Validform_label" style="display: none;">快递公司</label>
 		  </td>
 		  <td align="left">
 			  <input name="wmOmtmsIList[#index#].fadh" maxlength="32"
 					 ignore="ignore"
-					 type="text" class="form-control"  style="width:120px;" >
+					 type="text" class="form-control"  style="width:220px;" >
 			  <label class="Validform_label" style="display: none;">运单号</label>
 		  </td>
 
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmtmsIList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmtmsIList.jsp
index a1415d08..f7228d62 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmOmtmsIList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmtmsIList.jsp
@@ -114,10 +114,10 @@
 				<th scope="row"><div name="xh"></div></th>
 				<td><input style="width:20px;" type="checkbox" name="ck"/></td>
 				  <td>
-							  			  	<input id="wmOmtmsIList[0].fahuoren"  name="wmOmtmsIList[0].fahuoren" maxlength="32"
- 							  		type="text"    style="width:420px;text-align: left" >
-
+							  			  	<%--<input id="wmOmtmsIList[0].fahuoren"  name="wmOmtmsIList[0].fahuoren" maxlength="32"--%>
+ 							  		<%--type="text"    style="width:420px;text-align: left" >--%>
 
+					  <t:dictSelect field="wmOmtmsIList[#index#].fahuoren" type="select" typeGroupCode="tms_kd" hasLabel="false"  defaultVal=""></t:dictSelect>
 
 					  <label class="Validform_label" style="display: none;">快递公司</label>
 					</td>
@@ -154,8 +154,10 @@
 
 				   <td align="left">
 
-					   <input id="wmOmtmsIList[${stuts.index }].fahuoren" value="${poVal.fahuoren }"   maxlength="32"
-							  type="text" class="form-control"  style="width:120px;" >
+					   <%--<input id="wmOmtmsIList[${stuts.index }].fahuoren" value="${poVal.fahuoren }"   maxlength="32"--%>
+							  <%--type="text" class="form-control"  style="width:120px;" >--%>
+					   <t:dictSelect field="wmOmtmsIList[${stuts.index }].fahuoren" type="select" typeGroupCode="tms_kd" hasLabel="false"  defaultVal="${poVal.fahuoren }"></t:dictSelect>
+
 
 					  <label class="Validform_label" style="display: none;">快递公司</label>
 				   </td>