From ab31816085addbd25cb2c566cf2e2d560a5b6111 Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Sun, 20 Jan 2019 21:23:20 +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/WmToDownGoodsController.java   | 25 ++++++++++++++++---
 .../wm/controller/WmToUpGoodsController.java  | 20 +++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
index e055e789..a664223c 100644
--- a/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
@@ -3,10 +3,7 @@ package com.zzjee.wm.controller;
 import com.zzjee.api.ResultDO;
 import com.zzjee.md.entity.MvCusEntity;
 import com.zzjee.md.entity.MvGoodsEntity;
-import com.zzjee.wm.entity.WmOmNoticeHEntity;
-import com.zzjee.wm.entity.WmOmNoticeIEntity;
-import com.zzjee.wm.entity.WmOmQmIEntity;
-import com.zzjee.wm.entity.WmToDownGoodsEntity;
+import com.zzjee.wm.entity.*;
 import com.zzjee.wm.page.Delrowpage;
 import com.zzjee.wm.service.WmToDownGoodsServiceI;
 
@@ -126,6 +123,26 @@ public class WmToDownGoodsController extends BaseController {
 		cq.setOrder(map1); 
 		cq.add();
 		this.wmToDownGoodsService.getDataGridReturn(cq, true);
+		List<WmToDownGoodsEntity> resultold = dataGrid.getResults();
+		List<WmToDownGoodsEntity> resultnew = new ArrayList<>();
+		for(WmToDownGoodsEntity t:resultold){
+			if (StringUtil.isEmpty(t.getGoodsName())){
+				try{
+					MvGoodsEntity goods = systemService.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", t.getGoodsId());
+					if(goods!=null){
+						t.setGoodsName(goods.getGoodsName());
+					}
+				}catch (Exception e){
+
+				}
+
+			}
+
+			resultnew.add(t);
+		}
+		dataGrid.setResults(resultnew);
+
+
 		TagUtil.datagrid(response, dataGrid);
 	}
 	
diff --git a/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java
index b69778e6..8b0e1e08 100644
--- a/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java
@@ -134,6 +134,26 @@ public class WmToUpGoodsController extends BaseController {
 		cq.setOrder(map1); 
 		cq.add();
 		this.wmToUpGoodsService.getDataGridReturn(cq, true);
+
+		List<WmToUpGoodsEntity> resultold = dataGrid.getResults();
+		List<WmToUpGoodsEntity> resultnew = new ArrayList<>();
+		for(WmToUpGoodsEntity t:resultold){
+			if (StringUtil.isEmpty(t.getGoodsName())){
+				try{
+					MvGoodsEntity goods = systemService.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", t.getGoodsId());
+					if(goods!=null){
+						t.setGoodsName(goods.getGoodsName());
+					}
+				}catch (Exception e){
+
+				}
+
+			}
+
+			resultnew.add(t);
+		}
+		dataGrid.setResults(resultnew);
+
 		TagUtil.datagrid(response, dataGrid);
 	}