change - mes修改

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -78,6 +80,7 @@ public class MesBaseAttachInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseAttachInfo mesBaseAttachInfo)
     {
+        mesBaseAttachInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseAttachInfoService.insertMesBaseAttachInfo(mesBaseAttachInfo));
     }
 
@@ -89,6 +92,7 @@ public class MesBaseAttachInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseAttachInfo mesBaseAttachInfo)
     {
+        mesBaseAttachInfo.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseAttachInfoService.updateMesBaseAttachInfo(mesBaseAttachInfo));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseBarcodeInfoController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.hw.common.security.annotation.InnerAuth;
+import com.hw.common.security.utils.SecurityUtils;
 import com.hw.mes.api.domain.MesBaseBarcodeInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -79,6 +80,7 @@ public class MesBaseBarcodeInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseBarcodeInfo mesBaseBarcodeInfo)
     {
+        mesBaseBarcodeInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseBarcodeInfoService.insertMesBaseBarcodeInfo(mesBaseBarcodeInfo));
     }
 
@@ -90,6 +92,7 @@ public class MesBaseBarcodeInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseBarcodeInfo mesBaseBarcodeInfo)
     {
+        mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseBarcodeInfoService.updateMesBaseBarcodeInfo(mesBaseBarcodeInfo));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialTypeController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -76,6 +78,7 @@ public class MesBaseMaterialTypeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseMaterialType mesBaseMaterialType)
     {
+        mesBaseMaterialType.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseMaterialTypeService.insertMesBaseMaterialType(mesBaseMaterialType));
     }
 
@@ -87,6 +90,7 @@ public class MesBaseMaterialTypeController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseMaterialType mesBaseMaterialType)
     {
+        mesBaseMaterialType.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseMaterialTypeService.updateMesBaseMaterialType(mesBaseMaterialType));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBasePalletInfoController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -78,6 +80,7 @@ public class MesBasePalletInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBasePalletInfo mesBasePalletInfo)
     {
+        mesBasePalletInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBasePalletInfoService.insertMesBasePalletInfo(mesBasePalletInfo));
     }
 
@@ -89,6 +92,7 @@ public class MesBasePalletInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBasePalletInfo mesBasePalletInfo)
     {
+        mesBasePalletInfo.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBasePalletInfoService.updateMesBasePalletInfo(mesBasePalletInfo));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProcessInfoController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -98,6 +100,7 @@ public class MesBaseProcessInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseProcessInfo mesBaseProcessInfo)
     {
+        mesBaseProcessInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseProcessInfoService.insertMesBaseProcessInfo(mesBaseProcessInfo));
     }
 
@@ -109,6 +112,7 @@ public class MesBaseProcessInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseProcessInfo mesBaseProcessInfo)
     {
+        mesBaseProcessInfo.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseProcessInfoService.updateMesBaseProcessInfo(mesBaseProcessInfo));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProdlineInfoController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -88,6 +90,7 @@ public class MesBaseProdlineInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseProdlineInfo mesBaseProdlineInfo)
     {
+        mesBaseProdlineInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseProdlineInfoService.insertMesBaseProdlineInfo(mesBaseProdlineInfo));
     }
 
@@ -99,6 +102,7 @@ public class MesBaseProdlineInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseProdlineInfo mesBaseProdlineInfo)
     {
+        mesBaseProdlineInfo.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseProdlineInfoService.updateMesBaseProdlineInfo(mesBaseProdlineInfo));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseRouteController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -88,6 +90,7 @@ public class MesBaseRouteController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseRoute mesBaseRoute)
     {
+        mesBaseRoute.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseRouteService.insertMesBaseRoute(mesBaseRoute));
     }
 
@@ -99,6 +102,7 @@ public class MesBaseRouteController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseRoute mesBaseRoute)
     {
+        mesBaseRoute.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseRouteService.updateMesBaseRoute(mesBaseRoute));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseRouteProcessController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -78,6 +80,7 @@ public class MesBaseRouteProcessController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseRouteProcess mesBaseRouteProcess)
     {
+        mesBaseRouteProcess.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseRouteProcessService.insertMesBaseRouteProcess(mesBaseRouteProcess));
     }
 
@@ -89,6 +92,7 @@ public class MesBaseRouteProcessController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseRouteProcess mesBaseRouteProcess)
     {
+        mesBaseRouteProcess.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseRouteProcessService.updateMesBaseRouteProcess(mesBaseRouteProcess));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java

@@ -2,6 +2,8 @@ package com.hw.mes.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -77,6 +79,7 @@ public class MesBaseStationInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseStationInfo mesBaseStationInfo)
     {
+        mesBaseStationInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseStationInfoService.insertMesBaseStationInfo(mesBaseStationInfo));
     }
 
@@ -88,6 +91,7 @@ public class MesBaseStationInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseStationInfo mesBaseStationInfo)
     {
+        mesBaseStationInfo.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseStationInfoService.updateMesBaseStationInfo(mesBaseStationInfo));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseSupplierInfoController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -78,6 +80,7 @@ public class MesBaseSupplierInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBaseSupplierInfo mesBaseSupplierInfo)
     {
+        mesBaseSupplierInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseSupplierInfoService.insertMesBaseSupplierInfo(mesBaseSupplierInfo));
     }
 
@@ -89,6 +92,7 @@ public class MesBaseSupplierInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBaseSupplierInfo mesBaseSupplierInfo)
     {
+        mesBaseSupplierInfo.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBaseSupplierInfoService.updateMesBaseSupplierInfo(mesBaseSupplierInfo));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBindBarcodeController.java

@@ -3,6 +3,8 @@ package com.hw.mes.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -78,6 +80,7 @@ public class MesBindBarcodeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesBindBarcode mesBindBarcode)
     {
+        mesBindBarcode.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBindBarcodeService.insertMesBindBarcode(mesBindBarcode));
     }
 
@@ -89,6 +92,7 @@ public class MesBindBarcodeController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesBindBarcode mesBindBarcode)
     {
+        mesBindBarcode.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesBindBarcodeService.updateMesBindBarcode(mesBindBarcode));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMaterialBomController.java

@@ -2,6 +2,8 @@ package com.hw.mes.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -75,6 +77,7 @@ public class MesMaterialBomController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MesMaterialBom mesMaterialBom)
     {
+        mesMaterialBom.setCreateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesMaterialBomService.insertMesMaterialBom(mesMaterialBom));
     }
 
@@ -86,6 +89,7 @@ public class MesMaterialBomController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MesMaterialBom mesMaterialBom)
     {
+        mesMaterialBom.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
         return toAjax(mesMaterialBomService.updateMesMaterialBom(mesMaterialBom));
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessInfo.java

@@ -40,9 +40,9 @@ public class MesBaseProcessInfo extends BaseEntity {
     private String processType;
 
     /**
-     * 单位生产时间
+     * 标准工时(分钟)
      */
-    @Excel(name = "单位生产时间")
+    @Excel(name = "标准工时(分钟)")
     private Long productionTime;
 
     /**

hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialTypeServiceImpl.java

@@ -2,12 +2,15 @@ package com.hw.mes.service.impl;
 
 import java.util.List;
 import com.hw.common.core.utils.DateUtils;
+import com.hw.common.core.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hw.mes.mapper.MesBaseMaterialTypeMapper;
 import com.hw.mes.domain.MesBaseMaterialType;
 import com.hw.mes.service.IMesBaseMaterialTypeService;
 
+import static java.awt.SystemColor.info;
+
 /**
  * 物料类型信息Service业务层处理
  * 
@@ -54,6 +57,12 @@ public class MesBaseMaterialTypeServiceImpl implements IMesBaseMaterialTypeServi
     public int insertMesBaseMaterialType(MesBaseMaterialType mesBaseMaterialType)
     {
         mesBaseMaterialType.setCreateTime(DateUtils.getNowDate());
+        MesBaseMaterialType info = mesBaseMaterialTypeMapper.selectMesBaseMaterialTypeByMatrialTypeId(mesBaseMaterialType.getParentId());
+        if (StringUtils.isNull(info)){
+            mesBaseMaterialType.setAncestors(mesBaseMaterialType.getParentId().toString());
+        }else {
+            mesBaseMaterialType.setAncestors(info.getAncestors() + "," + mesBaseMaterialType.getParentId());
+        }
         return mesBaseMaterialTypeMapper.insertMesBaseMaterialType(mesBaseMaterialType);
     }
 
@@ -67,6 +76,12 @@ public class MesBaseMaterialTypeServiceImpl implements IMesBaseMaterialTypeServi
     public int updateMesBaseMaterialType(MesBaseMaterialType mesBaseMaterialType)
     {
         mesBaseMaterialType.setUpdateTime(DateUtils.getNowDate());
+        MesBaseMaterialType info = mesBaseMaterialTypeMapper.selectMesBaseMaterialTypeByMatrialTypeId(mesBaseMaterialType.getParentId());
+        if (StringUtils.isNull(info)){
+            mesBaseMaterialType.setAncestors(mesBaseMaterialType.getParentId().toString());
+        }else {
+            mesBaseMaterialType.setAncestors(info.getAncestors() + "," + mesBaseMaterialType.getParentId());
+        }
         return mesBaseMaterialTypeMapper.updateMesBaseMaterialType(mesBaseMaterialType);
     }
 

hw-ui/src/views/mes/baseFactoryInfo/index.vue

@@ -95,6 +95,18 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible"/>
+      <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[6].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[8].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -177,6 +189,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 选中数组
+      idNames: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -218,10 +232,10 @@ export default {
         {key: 3, label: `工厂名称`, visible: true},
         {key: 4, label: `工厂状态`, visible: true},
         {key: 5, label: `备注`, visible: true},
-        {key: 6, label: `创建人`, visible: true},
+        {key: 6, label: `创建人`, visible: false},
         {key: 7, label: `创建时间`, visible: true},
-        {key: 8, label: `更新人`, visible: true},
+        {key: 8, label: `更新人`, visible: false},
-        {key: 9, label: `更新时间`, visible: true},
+        {key: 9, label: `更新时间`, visible: false},
       ],
     };
   },
@@ -273,6 +287,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.factoryId)
+      this.idNames = selection.map(item => item.factoryName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -315,7 +330,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const factoryIds = row.factoryId || this.ids;
-      this.$modal.confirm('是否确认删除工厂信息编号为"' + factoryIds + '"的数据项？').then(function () {
+      const factoryNames = row.factoryName || this.idNames;
+      this.$modal.confirm('是否确认删除工厂名称为"' + factoryNames + '"的数据项？').then(function () {
         return delBaseFactoryInfo(factoryIds);
       }).then(() => {
         this.getList();

hw-ui/src/views/mes/baseMaterialType/index.vue

@@ -92,6 +92,18 @@
       </el-table-column>
       <el-table-column label="祖级列表" align="center" prop="ancestors" v-if="columns[5].visible"/>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[6].visible"/>
+      <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -220,7 +232,7 @@ export default {
         {key: 5, label: `祖级列表`, visible: false},
         {key: 6, label: `备注`, visible: true},
         {key: 7, label: `创建人`, visible: false},
-        {key: 8, label: `创建时间`, visible: false},
+        {key: 8, label: `创建时间`, visible: true},
         {key: 9, label: `更新人`, visible: false},
         {key: 10, label: `更新时间`, visible: false},
       ],
@@ -344,7 +356,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除物料类型信息编号为"' + row.matrialTypeId + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除物料类型编号为"' + row.typeCode + '"的数据项？').then(function () {
         return delBaseMaterialType(row.matrialTypeId);
       }).then(() => {
         this.getList();

hw-ui/src/views/mes/basePalletInfo/index.vue

@@ -147,6 +147,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 选中数组
+      idNames: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -233,6 +235,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.palletInfoId)
+      this.idNames = selection.map(item => item.palletInfoCode)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -275,7 +278,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const palletInfoIds = row.palletInfoId || this.ids;
-      this.$modal.confirm('是否确认删除托盘信息编号为"' + palletInfoIds + '"的数据项？').then(function () {
+      const palletInfoCodes = row.palletInfoCode || this.idNames;
+      this.$modal.confirm('是否确认删除RFID编码为"' + palletInfoCodes + '"的数据项？').then(function () {
         return delBasePalletInfo(palletInfoIds);
       }).then(() => {
         this.getList();

hw-ui/src/views/mes/baseProdlineInfo/index.vue

@@ -110,6 +110,18 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[6].visible"/>
+      <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -210,6 +222,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 选中数组
+      idNames: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -316,6 +330,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.prodlineId)
+      this.idNames = selection.map(item => item.prodlineName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -358,7 +373,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const prodlineIds = row.prodlineId || this.ids;
-      this.$modal.confirm('是否确认删除产线信息编号为"' + prodlineIds + '"的数据项？').then(function () {
+      const prodlineNames = row.prodlineName || this.idNames;
+      this.$modal.confirm('是否确认删除产线名称为"' + prodlineNames + '"的数据项？').then(function () {
         return delBaseProdlineInfo(prodlineIds);
       }).then(() => {
         this.getList();

hw-ui/src/views/mes/baseRoute/index.vue

@@ -160,7 +160,7 @@
           <el-table-column label="序号" align="center" prop="index" v-if="false"/>
           <el-table-column label="工艺路线顺序" prop="processOrder" width="100">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.processOrder" :disabled="true"/>
+              <el-input v-model="scope.row.processOrder" />
             </template>
           </el-table-column>
           <el-table-column label="工序" prop="processId">
@@ -205,6 +205,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 选中数组
+      idNames: [],
       // 子表选中数据
       checkedMesBaseRouteProcess: [],
       // 非单个禁用
@@ -314,6 +316,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.routeId)
+      this.idNames = selection.map(item => item.routeName)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -374,7 +377,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const routeIds = row.routeId || this.ids;
-      this.$modal.confirm('是否确认删除工艺路线编号为"' + routeIds + '"的数据项？').then(function() {
+      const routeNames = row.routeName || this.idNames;
+      this.$modal.confirm('是否确认删除工艺路线名称为"' + routeNames + '"的数据项？').then(function() {
         return delBaseRoute(routeIds);
       }).then(() => {
         this.getList();

hw-ui/src/views/mes/processInfo/index.vue

@@ -81,7 +81,7 @@
           <dict-tag :options="dict.type.process_type" :value="scope.row.processType"/>
         </template>
       </el-table-column>
-      <el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[4].visible"/>
+      <el-table-column label="标准工时(分钟)" align="center" prop="productionTime" v-if="columns[4].visible"/>
       <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[5].visible" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.active_flag" :value="scope.row.activeFlag"/>
@@ -136,7 +136,7 @@
 
     <!-- 添加或修改工序信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="工序编号" prop="processCode">
           <el-input v-model="form.processCode" placeholder="请输入工序编号" />
         </el-form-item>
@@ -153,8 +153,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="单位生产时间" prop="productionTime">
+        <el-form-item label="标准工时(分钟)" prop="productionTime">
-          <el-input v-model="form.productionTime" placeholder="请输入单位生产时间" />
+          <el-input-number v-model="form.productionTime" placeholder="请输入标准工时(分钟)" />
         </el-form-item>
         <el-form-item label="激活标识" prop="activeFlag">
           <el-radio-group v-model="form.activeFlag">
@@ -305,6 +305,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 选中数组
+      idNames: [],
       // 子表选中数据
       checkedMesBaseProcessProdline: [],
       // 子表选中数据
@@ -359,7 +361,7 @@ export default {
                 { key: 1, label: `工序编号`, visible: true },
                 { key: 2, label: `工序名称`, visible: true },
                 { key: 3, label: `工序类别`, visible: true },
-                { key: 4, label: `单位生产时间`, visible: true },
+                { key: 4, label: `标准工时(分钟)`, visible: true },
                 { key: 5, label: `激活标识`, visible: false },
                 { key: 6, label: `备注`, visible: true },
                 { key: 7, label: `创建人`, visible: false },
@@ -438,6 +440,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.processId)
+      this.idNames = selection.map(item => item.processCode)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -518,7 +521,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const processIds = row.processId || this.ids;
-      this.$modal.confirm('是否确认删除工序信息编号为"' + processIds + '"的数据项？').then(function() {
+      const processCodes = row.processCode || this.idNames;
+      this.$modal.confirm('是否确认删除工序编号为"' + processCodes + '"的数据项？').then(function() {
         return delProcessInfo(processIds);
       }).then(() => {
         this.getList();
@@ -537,7 +541,6 @@ export default {
     handleAddMesBaseProcessProdline() {
       let obj = {};
       this.mesBaseProcessProdlineList.push(obj);
-      console.log(this.mesBaseProcessProdlineList)
     },
     /** 工序关联产线删除按钮操作 */
     handleDeleteMesBaseProcessProdline() {

hw-ui/src/views/mes/supplierInfo/index.vue

@@ -208,6 +208,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 选中数组
+      idNames: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -314,6 +316,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.supplierId)
+      this.idNames = selection.map(item => item.supplierCode)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -356,7 +359,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const supplierIds = row.supplierId || this.ids;
-      this.$modal.confirm('是否确认删除物料供应商信息编号为"' + supplierIds + '"的数据项？').then(function() {
+      const supplierCodes = row.supplierCode || this.idNames;
+      this.$modal.confirm('是否确认删除物料供应商编号为"' + supplierCodes + '"的数据项？').then(function() {
         return delSupplierInfo(supplierIds);
       }).then(() => {
         this.getList();