diff --git a/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs b/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
index 3ec5f4f..3bf0f64 100644
--- a/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
+++ b/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
@@ -2132,15 +2132,15 @@ UPDATE dbo.ICSContainer set ContainerID='{0}',ContainerCODE='{1}',ContainerName=
                     string Qu = dr["区域"].ToString().Trim().ToUpper();
                     string Pai = dr["区"].ToString().Trim().ToUpper();
                     string Jia = dr["货架"].ToString().Trim().ToUpper();
-                    string Ceng = dr["列"].ToString().Trim().ToUpper();
-                    string Ge = dr["层"].ToString().Trim().ToUpper();
+                    string Ceng = dr["层"].ToString().Trim().ToUpper();
+                    string Ge = dr["列"].ToString().Trim().ToUpper();
                     if (KuFang == "" || KuFang == null)
                     {
                         throw new Exception("第 " + index + " 行库房编码不能为空！");
                     }
                     if (Qu == "" && Pai == "" && Jia == "" && Ceng == "" && Ge == "")
                     {
-                        throw new Exception("第 " + index + " 区、排、货架、层、格至少填写一项！");
+                        throw new Exception("第 " + index + " 区域、区、货架、层、列至少填写一项！");
                     }
                     string sqlWH = @"select ID from ICSWarehouse where WarehouseCode='{0}' and WorkPoint='{1}'";
                     sqlWH = string.Format(sqlWH, KuFang, WorkPoint);
@@ -2170,12 +2170,12 @@ UPDATE dbo.ICSContainer set ContainerID='{0}',ContainerCODE='{1}',ContainerName=
                     if (Ceng != "")
                     {
                         StackCode += "-" + Ceng;
-                        StackName += Ceng + "列";
+                        StackName += Ceng + "层";
                     }
                     if (Ge != "")
                     {
                         StackCode += "-" + Ge;
-                        StackName += Ge + "层";
+                        StackName += Ge + "列";
                     }
                     string sqls = @"select LocationCode from ICSLocation where LocationCode='{0}' and WorkPoint='{1}'";
                     sqls = string.Format(sqls, StackCode, WorkPoint);
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSStackWMSAdd.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSStackWMSAdd.cshtml
index bf11429..11744c2 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSStackWMSAdd.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSStackWMSAdd.cshtml
@@ -187,11 +187,11 @@
         }
         if (Ceng!="") {
             StackCode += "-" + Ceng;
-            StackName += Ceng + "列";
+            StackName += Ceng + "层";
         }
         if (Ge!="") {
             StackCode += "-" + Ge;
-            StackName += Ge + "层";
+            StackName += Ge + "列";
         }
         var objArr = {
             ID:ID,
@@ -257,11 +257,11 @@
                 </td>
                 @*<td style="width:30px">-</td>*@
                 <td class="formValue">
-                    <input id="Ceng" name="Ceng" type="text" class="form-control required" style="width: 80px;" maxlength="10" placeholder="列" />
+                    <input id="Ceng" name="Ceng" type="text" class="form-control required" style="width: 80px;" maxlength="10" placeholder="层" />
                 </td>
                 @*<td style="width:30px">-</td>*@
                 <td class="formValue">
-                    <input id="Ge" name="Ge" type="text" class="form-control required" style="width: 80px;" maxlength="10" placeholder="层" />
+                    <input id="Ge" name="Ge" type="text" class="form-control required" style="width: 80px;" maxlength="10" placeholder="列" />
                 </td>
             </tr>
             <tr>
@@ -276,10 +276,10 @@
                     <span>&nbsp;货架</span>
                 </td>
                 <td class="formValue">
-                    <span>&nbsp;列</span>
+                    <span>&nbsp;层</span>
                 </td>
                 <td class="formValue">
-                    <span>&nbsp;层</span>
+                    <span>&nbsp;列</span>
                 </td>
             </tr>
         </table>