diff --git a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
index edeb11c5..1a23183c 100644
--- a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
+++ b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
@@ -1,6 +1,7 @@
 package com.zzjee.tms.controller;
 
 import com.alibaba.fastjson.JSONArray;
+import com.zzjee.api.ResultDO;
 import com.zzjee.md.entity.MdGoodsEntity;
 import com.zzjee.tms.entity.DdPage;
 import com.zzjee.tms.entity.TmsMdDzEntity;
@@ -9,6 +10,7 @@ import com.zzjee.tms.service.TmsYwDingdanServiceI;
 import com.zzjee.wm.entity.WmOmNoticeHEntity;
 import com.zzjee.wm.entity.WmOmNoticeIEntity;
 import com.zzjee.wm.entity.WmTmsNoticeHEntity;
+import com.zzjee.wm.entity.WmTmsNoticeIEntity;
 import com.zzjee.wm.service.WmOmNoticeHServiceI;
 import com.zzjee.wmutil.wmUtil;
 import io.swagger.annotations.Api;
@@ -39,6 +41,7 @@ import org.jeecgframework.web.system.service.SystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
@@ -483,6 +486,78 @@ public class TmsYwDingdanController extends BaseController {
 		j.setMsg(message);
 		return j;
 	}
+
+
+
+	@RequestMapping(value = "/list/songhuo",  method = RequestMethod.GET)   //总订单
+	@ResponseBody
+	public ResponseEntity<?> list(@RequestParam(value="username", required=false) String username,
+								  @RequestParam(value="searchstr", required=false)String searchstr,
+								  @RequestParam(value="searchstr2", required=false)String searchstr2) {
+		ResultDO D0 = new  ResultDO();
+		D0.setOK(true);
+		String hql="from WmTmsNoticeHEntity   omSta = ";
+		List<WmTmsNoticeHEntity> listWaveToDowns =new ArrayList<>();
+//		if(StringUtil.isNotEmpty(searchstr)){
+//			hql="from WmOmNoticeHEntity where  omSta = ? and  reMember = ? and  omNoticeId = ?";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,searchstr2,username,searchstr);
+//		}else{
+//			hql="from WmOmNoticeHEntity where omSta = ? and   reMember = ? ";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,searchstr2,username);
+//
+//		}
+		listWaveToDowns = wmOmNoticeHService.findHql(hql,"已装车");
+		D0.setObj(listWaveToDowns);
+		return new ResponseEntity(D0, HttpStatus.OK);
+	}
+
+    @RequestMapping(value = "/listdetail/songhuo",  method = RequestMethod.GET)   //总订单
+    @ResponseBody
+    public ResponseEntity<?> listdetail(
+                                  @RequestParam(value="omnoticeid", required=false)String omnoticeid) {
+        ResultDO D0 = new  ResultDO();
+        D0.setOK(true);
+        String hql="from WmTmsNoticeIEntity  where omNoticeId = ?";
+        List<WmTmsNoticeIEntity> listWaveToDowns =new ArrayList<>();
+//		if(StringUtil.isNotEmpty(searchstr)){
+//			hql="from WmOmNoticeHEntity where  omSta = ? and  reMember = ? and  omNoticeId = ?";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,searchstr2,username,searchstr);
+//		}else{
+//			hql="from WmOmNoticeHEntity where omSta = ? and   reMember = ? ";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,searchstr2,username);
+//
+//		}
+        listWaveToDowns = wmOmNoticeHService.findHql(hql,omnoticeid);
+        D0.setObj(listWaveToDowns);
+        return new ResponseEntity(D0, HttpStatus.OK);
+    }
+
+
+    @RequestMapping(value = "/update/songhuo",  method = RequestMethod.GET)   //总订单
+    @ResponseBody
+    public ResponseEntity<?> updatesonghuo(
+            @RequestParam(value="omnoticeid", required=false)String omnoticeid) {
+        ResultDO D0 = new  ResultDO();
+        D0.setOK(true);
+        String hql="from WmTmsNoticeHEntity  where  omNoticeId = ?";
+        List<WmTmsNoticeHEntity> listWaveToDowns =new ArrayList<>();
+        listWaveToDowns = wmOmNoticeHService.findHql(hql,omnoticeid);
+
+        for(WmTmsNoticeHEntity t: listWaveToDowns){
+            t.setOmSta("已送货");
+            wmOmNoticeHService.updateEntitie(t);
+        }
+//		if(StringUtil.isNotEmpty(searchstr)){
+//			hql="from WmOmNoticeHEntity where  omSta = ? and  reMember = ? and  omNoticeId = ?";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,searchstr2,username,searchstr);
+//		}else{
+//			hql="from WmOmNoticeHEntity where omSta = ? and   reMember = ? ";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,searchstr2,username);
+//
+//		}
+        D0.setObj(listWaveToDowns);
+        return new ResponseEntity(D0, HttpStatus.OK);
+    }
 	/**
 	 *  取消派车
 	 *
@@ -643,7 +718,6 @@ public class TmsYwDingdanController extends BaseController {
 	/**
 	 * 添加运输订单
 	 * 
-	 * @param ids
 	 * @return
 	 */
 	@RequestMapping(params = "doAdd")
@@ -754,7 +828,6 @@ public class TmsYwDingdanController extends BaseController {
 	/**
 	 * 更新运输订单
 	 * 
-	 * @param ids
 	 * @return
 	 */
 	@RequestMapping(params = "doUpdate")
diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index 8834b2ef..e39b2d2e 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -20,6 +20,7 @@ import javax.validation.Validator;
 
 import com.zzjee.md.entity.MdGoodsEntity;
 import com.zzjee.tms.entity.TmsYwDingdanEntity;
+import com.zzjee.wave.entity.WaveToDownEntity;
 import com.zzjee.wm.entity.*;
 import com.zzjee.wm.page.*;
 import com.zzjee.wmutil.dsc.dscUtil;
@@ -68,12 +69,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -2514,4 +2510,62 @@ public class WmOmNoticeHController extends BaseController {
 		WmOmNoticeHEntity wmOmNoticeH = wmOmNoticeHService.get(WmOmNoticeHEntity.class, id);
 		wmOmNoticeHService.delMain(wmOmNoticeH);
 	}
+
+
+
+	@RequestMapping(value = "/list/hehuo",  method = RequestMethod.GET)   //总订单
+	@ResponseBody
+	public ResponseEntity<?> list(@RequestParam(value="username", required=false) String username,
+								  @RequestParam(value="searchstr", required=false)String searchstr,
+								  @RequestParam(value="searchstr2", required=false)String searchstr2) {
+		ResultDO D0 = new  ResultDO();
+		D0.setOK(true);
+
+		String hql="from WmOmNoticeHEntity  ";
+
+		List<WmOmNoticeHEntity> listWaveToDowns =new ArrayList<>();
+//		if(StringUtil.isNotEmpty(searchstr)){
+//			hql="from WmOmNoticeHEntity where  omSta = ? and  reMember = ? and  omNoticeId = ?";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,searchstr2,username,searchstr);
+//		}else{
+//			hql="from WmOmNoticeHEntity where omSta = ? and   reMember = ? ";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,searchstr2,username);
+//
+//		}
+		listWaveToDowns = wmOmNoticeHService.findHql(hql);
+		D0.setObj(listWaveToDowns);
+		return new ResponseEntity(D0, HttpStatus.OK);
+	}
+	@RequestMapping(value = "/listdetail/hehuo",  method = RequestMethod.GET)//
+	@ResponseBody
+	public ResponseEntity<?> listdetail(
+								  @RequestParam(value="omNoticeId", required=false)String omnoticeid) {
+		ResultDO D0 = new  ResultDO();
+		D0.setOK(true);
+		String hql="from WmImNoticeIEntity where omNoticeId = ? ";
+		List<WmOmNoticeIEntity> listWaveToDowns =new ArrayList<>();
+//			hql="from WmImNoticeIEntity where  noticeiSta <> ? and  omNoticeId = ?";
+//			listWaveToDowns = wmOmNoticeHService.findHql(hql,"已核货",searchstr);
+			hql="from WmOmNoticeIEntity where omSta = ? and  omNoticeId = ?";
+			listWaveToDowns = wmOmNoticeHService.findHql(hql,"Y", omnoticeid);
+		D0.setObj(listWaveToDowns);
+		return new ResponseEntity(D0, HttpStatus.OK);
+	}
+	@RequestMapping(value = "/update/hehuo",  method = RequestMethod.GET)
+	@ResponseBody
+	public ResponseEntity<?> doupdate(
+			@RequestParam(value="id", required=false)String id) {
+		ResultDO D0 = new  ResultDO();
+		D0.setOK(true);
+		String hql="from WmImNoticeIEntity where id = ? ";
+		List<WmOmNoticeIEntity> listWaveToDowns =new ArrayList<>();
+		hql="from WmOmNoticeIEntity where   id = ?";
+		listWaveToDowns = wmOmNoticeHService.findHql(hql,id);
+		for(WmOmNoticeIEntity t: listWaveToDowns){
+			t.setOmSta("YH");
+			wmOmNoticeHService.updateEntitie(t);
+		}
+		D0.setObj(listWaveToDowns);
+		return new ResponseEntity(D0, HttpStatus.OK);
+	}
 }