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 wmOmNoticeIList = wmOmNoticeHPage.getWmOmNoticeIList(); - List wmOmtmsIList = wmOmNoticeHPage.getWmOmtmsIList(); + List 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 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 @@ - + + 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="商品编码"> --%> - + <%-- + <%--ignore="ignore"--%> + <%--type="text" class="form-control searchbox-inputtext" style="width:120px;text-align: left" >--%> + - - + + type="text" class="form-control" style="width:220px;" > 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 @@
- - + <%-- + <%--type="text" style="width:420px;text-align: left" >--%> + @@ -154,8 +154,10 @@ - + <%-- + <%--type="text" class="form-control" style="width:120px;" >--%> + +