diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java
index fb4f3ccd..dc87715c 100644
--- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java
+++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java
@@ -77,9 +77,9 @@ public class MesOrderBind extends BaseEntity {
     private Long materialId;
 
     /**
-     * 物料编号
+     * 物料编码
      */
-    @Excel(name = "物料编号")
+    @Excel(name = "物料编码")
     private String materialCode;
 
     /**
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java
index c3dcc180..237a31b1 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java
@@ -27,8 +27,8 @@ public class MesBasePalletInfo extends BaseEntity
     @Excel(name = "物料ID，关联物料信息主键")
     private Long materialId;
 
-    /** 物料编号 */
-    @Excel(name = "物料编号")
+    /** 物料编码 */
+    @Excel(name = "物料编码")
     private String materialCode;
 
     /** 物料名称 */
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java
index ebd14763..acaa3349 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java
@@ -83,9 +83,9 @@ public class MesMaterialBom extends TreeEntity {
     private String activeFlag;
 
     /**
-     * 物料编号
+     * 物料编码
      */
-    @Excel(name = "物料编号")
+    @Excel(name = "物料编码")
     private String materialCode;
 
     /**
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java
index 7c0db55e..bf9326f0 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java
@@ -209,7 +209,7 @@ public class MesProductOrder extends BaseEntity {
     private String materialSpec;
 
     /**
-     * 生产物料编号
+     * 生产物料编码
      */
     private String produceMaterialCode;
 
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java
index 9620091d..68e4030e 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java
@@ -161,7 +161,7 @@ public class MesProductPlan extends BaseEntity
     private Date planDeliveryDate;
 
     /**
-     * 物料编号
+     * 物料编码
      */
     private String materialCode;
 
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java
index 21f93ceb..e42f3b1f 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java
@@ -112,9 +112,9 @@ public class MesRaiseCapitalBom extends BaseEntity {
     private Long erpMaterialId;
 
     /**
-     * 物料编号
+     * 物料编码
      */
-    @Excel(name = "物料编号")
+    @Excel(name = "物料编码")
     private String materialCode;
 
     private String materialSpec;
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java
index 34a49b47..8b082300 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java
@@ -188,7 +188,7 @@ public class MesImportImpl implements IMesImportService {
 //                productBom = productBom.replaceAll("（.*?）", "");
 //                MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom);
 //                if (productMaterial == null) {
-//                    throw new ServiceException("Excel格式错误:物料编号：" + productBom + "的信息不存在！");
+//                    throw new ServiceException("Excel格式错误:物料编码：" + productBom + "的信息不存在！");
 //                }
 //
 //                i = i + 3;//标题下一行
@@ -253,7 +253,7 @@ public class MesImportImpl implements IMesImportService {
 //                            materialBom.setCreateBy(operName);
 //                            bomList.add(materialBom);
 //                        } else {
-//                            failureMsg.append("物料编号：").append(materialCode).append("|");
+//                            failureMsg.append("物料编码：").append(materialCode).append("|");
 //                        }
 //                    }
 //                    i++;
@@ -324,7 +324,7 @@ public class MesImportImpl implements IMesImportService {
 //                productBom = productBom.replaceAll("(.*?)", "");
                 MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom);
                 if (productMaterial == null) {
-                    throw new ServiceException("Excel格式错误:物料编号：" + productBom + "的信息不存在！");
+                    throw new ServiceException("Excel格式错误:物料编码：" + productBom + "的信息不存在！");
                 }
 
                 i = i + 2;//标题下一行
@@ -419,7 +419,7 @@ public class MesImportImpl implements IMesImportService {
                             }
                             bomList.add(materialBom);
                         } else {
-                            failureMsg.append("物料编号：").append(materialCode).append("|");
+                            failureMsg.append("物料编码：").append(materialCode).append("|");
                         }
                     }
                     i++;
@@ -516,7 +516,7 @@ public class MesImportImpl implements IMesImportService {
 //                productBom = productBom.replaceAll("(.*?)", "");
                 MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom);
                 if (productMaterial != null) {
-                    throw new ServiceException("Excel格式错误:物料编号：" + productBom + "的信息已存在！");
+                    throw new ServiceException("Excel格式错误:物料编码：" + productBom + "的信息已存在！");
                 }
 
 
@@ -585,7 +585,7 @@ public class MesImportImpl implements IMesImportService {
                     if (StringUtils.isNotEmpty(materialCode) && !materialCode.equals("物料编码")) {
                         MesBaseMaterialInfo materialInfo = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(materialCode);
                         if(materialInfo!=null){
-                            throw new ServiceException("物料编号："+materialCode+"已经存在");
+                            throw new ServiceException("物料编码："+materialCode+"已经存在");
                         }
 
                         materialInfo = new MesBaseMaterialInfo();
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java
index 5b264d56..7d6309c7 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java
@@ -104,7 +104,7 @@ public class MesRaiseCapitalBomServiceImpl implements IMesRaiseCapitalBomService
          || !raiseCapitalBom.getStandardAmount().equals(mesRaiseCapitalBom.getStandardAmount())){
             raiseCapitalBom.setUpdateFlag(WfConstants.PA_UPDATE_FLAG_YES);
             mesRaiseCapitalBomMapper.insertMesRaiseCapitalBom(raiseCapitalBom);
-            mesRaiseCapitalBom.setRemark("已修改,原物料编号：" + raiseCapitalBom.getMaterialCode());
+            mesRaiseCapitalBom.setRemark("已修改,原物料编码：" + raiseCapitalBom.getMaterialCode());
         }
 
         return mesRaiseCapitalBomMapper.updateMesRaiseCapitalBom(mesRaiseCapitalBom);
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java
index 8b51101b..f81af828 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java
@@ -207,7 +207,7 @@ public class MesProductOrder extends BaseEntity {
     private String materialSpec;
 
     /**
-     * 生产物料编号
+     * 生产物料编码
      */
     private String produceMaterialCode;
 
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java
index c38924b0..b4505833 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java
@@ -61,9 +61,9 @@ public class WmsRawStock extends BaseEntity {
     private Long materialId;
 
     /**
-     * 物料编号
+     * 物料编码
      */
-    @Excel(name = "物料编号")
+    @Excel(name = "物料编码")
     private String materialCode;
 
     /**
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java
index c89de011..f0e5aadc 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java
@@ -59,9 +59,9 @@ public class WmsStockTotal extends BaseEntity {
 
 
     /**
-     * 物料编号
+     * 物料编码
      */
-    @Excel(name = "物料编号")
+    @Excel(name = "物料编码")
     private String materialCode;
 
     /**
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java
index d6dbe764..fbe92afb 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java
@@ -16,7 +16,7 @@ public class WmsStockTotalExportVo extends BaseEntity {
 
 
     /**
-     * 物料编号
+     * 物料编码
      */
     @Excel(name = "物料编码")
     private String materialCode;
diff --git a/hw-ui/src/views/board/common/applyRawOutstock.vue b/hw-ui/src/views/board/common/applyRawOutstock.vue
index afb0c664..00a4497b 100644
--- a/hw-ui/src/views/board/common/applyRawOutstock.vue
+++ b/hw-ui/src/views/board/common/applyRawOutstock.vue
@@ -56,7 +56,7 @@
       v-loading="loading"
     >
       <el-table-column
-        label="物料编号"
+        label="物料编码"
         prop="materialCode"
       >
       </el-table-column>
diff --git a/hw-ui/src/views/board/common/applyRawReturn.vue b/hw-ui/src/views/board/common/applyRawReturn.vue
index 519994ba..11e0c25a 100644
--- a/hw-ui/src/views/board/common/applyRawReturn.vue
+++ b/hw-ui/src/views/board/common/applyRawReturn.vue
@@ -44,7 +44,7 @@
       v-if="materialVisible"
     >
       <el-table-column
-        label="物料编号"
+        label="物料编码"
         prop="materialCode"
       >
       </el-table-column>
diff --git a/hw-ui/src/views/board/fifthFloor/index.vue b/hw-ui/src/views/board/fifthFloor/index.vue
index d853d4ff..aad9bb7d 100644
--- a/hw-ui/src/views/board/fifthFloor/index.vue
+++ b/hw-ui/src/views/board/fifthFloor/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">京源环保生产管理系统</div>
+    <div class="headTitle">京源环保MOM生产管理系统</div>
 
     <div class="chartBox chartBox1">
       <div class="title">生产明细</div>
@@ -872,14 +872,14 @@ export default {
     //   });
     // }, 60 * 1000)
     getLoginStationInfo().then(e => {
-      if(!e.data){
-        this.$modal.msgError("登录工位有误");
-        return;
-      }
-      this.loginStationInfo = e.data;
+      // if(!e.data){
+      //   this.$modal.msgError("登录工位有误");
+      //   return;
+      // }
+      // this.loginStationInfo = e.data;
 
       //TODO
-      // this.loginStationInfo = {stationId: "1", stationCode: "ZP_02"}
+      this.loginStationInfo = {stationId: "1", stationCode: "ZP_02"}
       this.getProductPlans();
       this.getChartData();
     });
@@ -1620,7 +1620,7 @@ export default {
           this.PrintData.barcodeType = this.BARCODE_TYPE.SPLIT_BARCODE;//拆分后配对码
           this.printModel = true
         });
-
+ge
       });
     },
 
diff --git a/hw-ui/src/views/board/firstFloor/index.vue b/hw-ui/src/views/board/firstFloor/index.vue
index 47c310cf..c380f4a5 100644
--- a/hw-ui/src/views/board/firstFloor/index.vue
+++ b/hw-ui/src/views/board/firstFloor/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">京源环保生产管理系统</div>
+    <div class="headTitle">京源环保MOM生产管理系统</div>
 
     <div class="chartBox chartBox1">
       <div class="title">生产派工</div>
diff --git a/hw-ui/src/views/board/fourthFloor/assemble.vue b/hw-ui/src/views/board/fourthFloor/assemble.vue
index ae5c5adb..03d6cdf2 100644
--- a/hw-ui/src/views/board/fourthFloor/assemble.vue
+++ b/hw-ui/src/views/board/fourthFloor/assemble.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">京源环保生产管理系统</div>
+    <div class="headTitle">京源环保MOM生产管理系统</div>
 
     <div class="chartBox chartBox1">
       <div class="title">生产派工</div>
diff --git a/hw-ui/src/views/board/fourthFloor/laserLight.vue b/hw-ui/src/views/board/fourthFloor/laserLight.vue
index cf7f3f7c..a8f4aa7c 100644
--- a/hw-ui/src/views/board/fourthFloor/laserLight.vue
+++ b/hw-ui/src/views/board/fourthFloor/laserLight.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">京源环保生产管理系统</div>
+    <div class="headTitle">京源环保MOM生产管理系统</div>
 
     <div class="chartBox chartBox1">
       <div class="title">生产明细</div>
diff --git a/hw-ui/src/views/board/fourthFloor/weld.vue b/hw-ui/src/views/board/fourthFloor/weld.vue
index 8a960ce4..b3d58071 100644
--- a/hw-ui/src/views/board/fourthFloor/weld.vue
+++ b/hw-ui/src/views/board/fourthFloor/weld.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">京源环保生产管理系统</div>
+    <div class="headTitle">京源环保MOM生产管理系统</div>
 
     <div class="chartBox chartBox1">
       <div class="title">生产明细</div>
diff --git a/hw-ui/src/views/login.vue b/hw-ui/src/views/login.vue
index fd2b9924..0172db3a 100644
--- a/hw-ui/src/views/login.vue
+++ b/hw-ui/src/views/login.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="login" :style="`background-image: url(${!isStationId?loginBg1:loginBg2});`">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title" v-if="!isStationId">京源环保MES系统</h3>
-      <h3 class="title" v-else>京源环保车间MES系统</h3>
+      <h3 class="title" v-if="!isStationId">京源环保MOM管理系统</h3>
+      <h3 class="title" v-else>京源环保MOM车间系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -87,8 +87,8 @@ export default {
       loginBg2,
       codeUrl: '',
       loginForm: {
-        username: 'xin',
-        password: '123456',
+        username: '',
+        password: '',
         rememberMe: false,
         processId: '',
         processFloor: '',
diff --git a/hw-ui/src/views/login2.vue b/hw-ui/src/views/login2.vue
index ad1db4ad..97fab1bc 100644
--- a/hw-ui/src/views/login2.vue
+++ b/hw-ui/src/views/login2.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">京源环保管理系统</h3>
+      <h3 class="title">京源环保MOM管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -72,8 +72,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
diff --git a/hw-ui/src/views/mes/barcode/index.vue b/hw-ui/src/views/mes/barcode/index.vue
index 9688eced..843ca136 100644
--- a/hw-ui/src/views/mes/barcode/index.vue
+++ b/hw-ui/src/views/mes/barcode/index.vue
@@ -27,7 +27,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="物料编号" prop="materialCode">
+      <el-form-item label="物料编码" prop="materialCode">
         <el-input
           v-model="queryParams.materialCode"
           placeholder="请输入物料编码"
diff --git a/hw-ui/src/views/mes/saleOrder/bindingPurchase.vue b/hw-ui/src/views/mes/saleOrder/bindingPurchase.vue
index 8815781c..592f0d39 100644
--- a/hw-ui/src/views/mes/saleOrder/bindingPurchase.vue
+++ b/hw-ui/src/views/mes/saleOrder/bindingPurchase.vue
@@ -17,7 +17,7 @@
       </el-row>
       <el-row>
         <el-col :span="8" :offset="2">
-          <el-form-item label="销售物料编号" prop="materialCode">
+          <el-form-item label="销售物料编码" prop="materialCode">
             <el-input v-model="saleOrderForm.materialCode" disabled/>
           </el-form-item>
         </el-col>
diff --git a/hw-ui/src/views/wms/common/applyRawOutstock.vue b/hw-ui/src/views/wms/common/applyRawOutstock.vue
index b4dd02aa..26ce7d1b 100644
--- a/hw-ui/src/views/wms/common/applyRawOutstock.vue
+++ b/hw-ui/src/views/wms/common/applyRawOutstock.vue
@@ -22,7 +22,7 @@
       style="width: 100%;overflow-x: auto"
     >
       <el-table-column
-        label="物料编号"
+        label="物料编码"
         prop="materialCode"
       >
       </el-table-column>
diff --git a/hw-ui/src/views/wms/info/move/detail.vue b/hw-ui/src/views/wms/info/move/detail.vue
index 72891cdc..f66ef3c3 100644
--- a/hw-ui/src/views/wms/info/move/detail.vue
+++ b/hw-ui/src/views/wms/info/move/detail.vue
@@ -62,7 +62,7 @@
                 @selection-change="handleWmsMoveDetailSelectionChange" ref="wmsMoveDetail">
         <el-table-column label="序号" align="center" prop="index" width="50"/>
         <el-table-column label="物料条码" align="center" prop="materialBarcode" />
-        <el-table-column label="物料编号" align="center" prop="materialCode" />
+        <el-table-column label="物料编码" align="center" prop="materialCode" />
         <el-table-column label="物料名称" align="center" prop="materialName" />
         <el-table-column label="单位" align="center" prop="unitName" />
         <el-table-column label="计划数量" align="center" prop="planAmount" />
diff --git a/hw-ui/src/views/wms/info/rawOutstockDetail/index.vue b/hw-ui/src/views/wms/info/rawOutstockDetail/index.vue
index e4199cd2..49042cb9 100644
--- a/hw-ui/src/views/wms/info/rawOutstockDetail/index.vue
+++ b/hw-ui/src/views/wms/info/rawOutstockDetail/index.vue
@@ -141,7 +141,7 @@
       <el-table-column label="库位编码" align="center" prop="locationCode" width="120" v-if="columns[4].visible"/>
       <el-table-column label="物料条码" align="center" prop="materialBarcode" width="160" v-if="columns[5].visible"/>
       <el-table-column label="物料ID" align="center" prop="materialId" width="80" v-if="columns[6].visible"/>
-      <el-table-column label="物料编号" align="center" prop="materialCode" width="120" v-if="columns[29].visible"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" width="120" v-if="columns[29].visible"/>
       <el-table-column label="物料名称" align="center" prop="materialName" width="120" v-if="columns[30].visible"/>
       <el-table-column label="批次" align="center" prop="instockBatch" width="120" v-if="columns[7].visible"/>
       <el-table-column label="生产日期" align="center" prop="materialProductionDate"
@@ -372,7 +372,7 @@
         <el-row :gutter="16">
           <el-col :span="8"><b>任务编号：</b><span style="color:#333">{{ relateSaleOrderForm.taskCode || getCurrentDetail('taskCode') }}</span></el-col>
           <el-col :span="8"><b>计划编号：</b><span style="color:#333">{{ relateSaleOrderForm.planCode || getCurrentDetail('planCode') }}</span></el-col>
-          <el-col :span="8"><b>物料编号：</b><span style="color:#333">{{ relateSaleOrderForm.materialCode || getCurrentDetail('materialCode') }}</span></el-col>
+          <el-col :span="8"><b>物料编码：</b><span style="color:#333">{{ relateSaleOrderForm.materialCode || getCurrentDetail('materialCode') }}</span></el-col>
         </el-row>
         <el-row :gutter="16" style="margin-top: 8px;">
           <el-col :span="8"><b>物料名称：</b><span style="color:#333">{{ relateSaleOrderForm.materialName || getCurrentDetail('materialName') }}</span></el-col>
@@ -565,7 +565,7 @@ export default {
         {key: 26, label: `计划编号`, visible: true},
         {key: 27, label: `计划明细编号`, visible: true},
         {key: 28, label: `销售订单编号`, visible: true},
-        {key: 29, label: `物料编号`, visible: true},
+        {key: 29, label: `物料编码`, visible: true},
         {key: 30, label: `物料名称`, visible: true},
       ],
       relateSaleOrderDialogVisible: false,