From 5aaf024c3e0f450b83d826c9f0d099c932f1c4a9 Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Fri, 10 Jan 2020 12:18:21 +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

---
 .../controller/TmsYwDingdanController.java    | 22 +++++++++----------
 .../wm/controller/WmOmNoticeHController.java  |  2 ++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
index 630fea3e..d2b92ac0 100644
--- a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
+++ b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
@@ -192,17 +192,17 @@ public class TmsYwDingdanController extends BaseController {
 			throw new BusinessException(e.getMessage());
 		}
 		cq.eq("zhuangtai","已下单");
-		TSUser user = ResourceUtil.getSessionUser();
-		if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){
-			cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%");
-
-		}
-		if(!StringUtil.isEmpty(user.getUserType())){
-			if(user.getUserType().equals("4")){
-				cq.eq("username",user.getUserName());
-			}
-
-		}
+//		TSUser user = ResourceUtil.getSessionUser();
+//		if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){
+//			cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%");
+//
+//		}
+//		if(!StringUtil.isEmpty(user.getUserType())){
+//			if(user.getUserType().equals("4")){
+//				cq.eq("username",user.getUserName());
+//			}
+//
+//		}
 		cq.add();
 		this.tmsYwDingdanService.getDataGridReturn(cq, true);
 		TagUtil.datagrid(response, dataGrid);
diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index 1da2d0b8..907aa33c 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -2474,6 +2474,8 @@ public class WmOmNoticeHController extends BaseController {
 		tms.setShrdh(wmOmNoticeH.getDelvAddr());//收货人地址
 		tms.setBy1(wmOmNoticeH.getReMember());//区域
 		tms.setFadh(noticeid);
+		tms.setZhuangtai("已下单");
+		tms.setFahuoren(wmOmNoticeH.getPiClass());//配送点
 		systemService.save(tms);
 		D0.setOK(true);
 		//按照Restful风格约定，创建指向新任务的url, 也可以直接返回id或对象.