From 0052ead51742c397d38cbc52b72549f2f456dc5b Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Sun, 23 Feb 2020 22:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=A8=E4=BD=8D=E5=A2=9E=E5=8A=A0=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=9C=B0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zzjee/md/entity/MdBinEntity.java |  2 +-
 .../webapp/webpage/com/zzjee/md/mdBin-add.jsp | 19 ++++++++++++++++++-
 .../webpage/com/zzjee/md/mdBin-update.jsp     | 17 ++++++++++++++++-
 .../webapp/webpage/com/zzjee/md/mdBinList.jsp |  2 +-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zzjee/md/entity/MdBinEntity.java b/src/main/java/com/zzjee/md/entity/MdBinEntity.java
index 63b44e24..4133d1b3 100644
--- a/src/main/java/com/zzjee/md/entity/MdBinEntity.java
+++ b/src/main/java/com/zzjee/md/entity/MdBinEntity.java
@@ -39,7 +39,7 @@ public class MdBinEntity implements java.io.Serializable {
 	private java.lang.String sysOrgCode;
 	/**所属公司*/
 	private java.lang.String sysCompanyCode;
-	/**库位名称*/
+	@Excel(name="库存地点")
 	private java.lang.String kuWeiMingCheng;
 	/**库位编码*/
 	@Excel(name="库位编码")
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp b/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp
index 5029f5c2..d495c4ba 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp
@@ -50,7 +50,24 @@
 			    <!-- tab内容 -->
 			    <div class="con-wrapper" id="con-wrapper1" style="display: block;">
 			      <div class="row form-wrapper">
-			      
+
+
+
+
+
+
+					  <div class="row show-grid">
+						  <div class="col-xs-3 text-center">
+							  <b style="color:red">库存地点</b>
+						  </div>
+						  <div class="col-xs-3">
+							  <t:dictSelect field="kuWeiMingCheng" type="list" extendJson="{class:'form-control',datatype:'*'}"
+											dictTable="t_wz_location" dictField="MAT_LOCATION" dictText="MAT_LOCATION" hasLabel="false"  title="库存地点"></t:dictSelect>
+							  <span class="Validform_checktip" style="float:left;height:0px;"></span>
+							  <label class="Validform_label" style="display: none">库存地点</label>
+						  </div>
+
+					  </div>
 			      					<div class="row show-grid">
 							          <div class="col-xs-3 text-center">
 			          	<b style="color:red">仓&emsp;&emsp;库</b>
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdBin-update.jsp b/src/main/webapp/webpage/com/zzjee/md/mdBin-update.jsp
index 4667260c..d39c30b4 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdBin-update.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdBin-update.jsp
@@ -48,7 +48,22 @@
 			    <!-- tab内容 -->
 			    <div class="con-wrapper" id="con-wrapper1" style="display: block;">
 			      <div class="row form-wrapper">
-			      
+
+
+					  <div class="row show-grid">
+						  <div class="col-xs-3 text-center">
+							  <b style="color:red">库存地点</b>
+						  </div>
+						  <div class="col-xs-3">
+							  <t:dictSelect field="kuWeiMingCheng" type="list" extendJson="{class:'form-control',datatype:'*'}"
+											dictTable="t_wz_location" dictField="MAT_LOCATION" dictText="MAT_LOCATION" hasLabel="false" defaultVal="${mdBinPage.kuWeiMingCheng}" title="库存地点"></t:dictSelect>
+							  <span class="Validform_checktip" style="float:left;height:0px;"></span>
+							  <label class="Validform_label" style="display: none">库存地点</label>
+						  </div>
+
+					  </div>
+
+
 			      		<div class="row show-grid">
 			      		          <div class="col-xs-3 text-center">
 			          	<b  style="color:red">仓&emsp;&emsp;库</b>
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdBinList.jsp b/src/main/webapp/webpage/com/zzjee/md/mdBinList.jsp
index 84fcecea..757617ef 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdBinList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdBinList.jsp
@@ -13,7 +13,7 @@
     <t:dgCol title="更新日期"  field="updateDate" formatter="yyyy-MM-dd" hidden="true"  queryMode="group"  width="120"></t:dgCol>
     <t:dgCol title="所属部门"  field="sysOrgCode"  hidden="true"  queryMode="group"  width="120"></t:dgCol>
     <t:dgCol title="所属公司"  field="sysCompanyCode"  hidden="true"  queryMode="group"  width="120"></t:dgCol>
-    <t:dgCol title="库位名称"  field="kuWeiMingCheng"  hidden="true"  queryMode="group"  width="120"></t:dgCol>
+    <t:dgCol title="库存地点"  field="kuWeiMingCheng"    queryMode="group"  width="120"></t:dgCol>
     <t:dgCol title="仓库"  field="binStore" query="true"   queryMode="single" dictionary="ba_store,store_code,store_name"  width="90"></t:dgCol>
     <t:dgCol title="库位编码"  field="kuWeiBianMa"   query="true" queryMode="single"  width="120"></t:dgCol>
     <t:dgCol title="库位条码"  field="kuWeiTiaoMa"   query="true" queryMode="single"  width="120"></t:dgCol>