2.1.8

DMS:故障报修上传图片增加判断为null的情况，各工单页面完善
QMS：修改PDA测试出的问题
WMS：仓库管理和库存页面完善

hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java

@@ -96,13 +96,16 @@ public class DmsMobileController extends BaseController {
     @Log(title = "故障报修工单", businessType = BusinessType.INSERT)
     @PostMapping("/insertFaultInstsanceActivity")
     public AjaxResult insertFaultInstsanceActivity(DmsBillsFaultInstance dmsBillsFaultInstance,
-                                                   @RequestParam(value = "files") List<MultipartFile> files) {
+                                                   List<MultipartFile> files) {
         List<String> fileUrls = new ArrayList<>();
-        for (MultipartFile file : files) {
-            R<SysFile> sysFileR = remoteFileService.upload(file);
-            SysFile sysFile = sysFileR.getData();
-            fileUrls.add(sysFile.getUrl());
+        if(files!=null){
+            for (MultipartFile file : files) {
+                R<SysFile> sysFileR = remoteFileService.upload(file);
+                SysFile sysFile = sysFileR.getData();
+                fileUrls.add(sysFile.getUrl());
+            }
         }
+
         dmsBillsFaultInstance.setFileUrls(fileUrls);
         return success(dmsBillsFaultInstanceService.insertDmsBillsFaultInstance(dmsBillsFaultInstance));
     }

hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfo1ServiceImpl.java

@@ -144,7 +144,7 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service {
         TdTableVo tableVo = new TdTableVo();
         tableVo.setDatabaseName("db_hwmes");
         tableVo.setSuperTableName("st_electricity");
-        tableVo.setTableName(TdEngineConstants.getEmsTableName(monitorId));
+        tableVo.setTableName(TdEngineConstants.getEmsTableName(monitorId));//monitorid为非主键，主键是objid
         List<TdField> fields = new ArrayList<TdField>();
         TdField field = new TdField();
         TdField field2 = new TdField();
@@ -331,6 +331,7 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service {
     @Override
     //@DS("#header.poolName")
     public int deleteBaseMonitorInfoByObjids(Long[] objids) {
+        //todo:删除时需要drop tdengine表
         return baseMonitorInfoMapper.deleteBaseMonitorInfoByObjids(objids);
     }
 

hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java

@@ -85,6 +85,8 @@ public class QmsMobileController extends BaseController {
             queryCheckRuleDetail.setTargetId(materialId);
             queryCheckRuleDetail.setTargetType(QmsConstants.QMS_CHECK_RULE_DETAIL_TARGET_TYPE_MATERIAL);
             QmsCheckRule qmsCheckRule = qmsCheckRuleService.selectQmsCheckRuleByTarget(queryCheckRuleDetail);
+            qmsCheckRule.setMaterialCode(baseBarcodeInfo.getMaterialCode());
+            qmsCheckRule.setMaterialName(baseBarcodeInfo.getMaterialName());
             Long checkResultId = qmsCheckResultService.insertCheckResult(baseBarcodeInfo, qmsCheckRule);
             qmsCheckRule.setCheckResultId(checkResultId);
             return success(qmsCheckRule);
@@ -99,7 +101,8 @@ public class QmsMobileController extends BaseController {
     @Log(title = "质检结果详情", businessType = BusinessType.INSERT)
     @PostMapping("/saveCheckResultDetail")
     public AjaxResult saveCheckResultDetail(@RequestBody QmsCheckResultDetail qmsCheckResultDetail) {
-        if (qmsCheckResultDetail.getCheckResultDetailId() == null) {
+        if (qmsCheckResultDetail.getCheckResultDetailId() == null || qmsCheckResultDetail.getCheckResultDetailId().equals(0L)) {
+            qmsCheckResultDetail.setCheckResultDetailId(null);
             return toAjax(qmsCheckResultDetailService.insertQmsCheckResultDetail(qmsCheckResultDetail));
         } else {
             return toAjax(qmsCheckResultDetailService.updateQmsCheckResultDetail(qmsCheckResultDetail));
@@ -224,12 +227,14 @@ public class QmsMobileController extends BaseController {
     @Log(title = "质检工单实例", businessType = BusinessType.INSERT)
     @PostMapping("/handleQualityInstance")
     public AjaxResult handleQualityInstance(QmsQualityInstanceActivityVo qmsQualityInstanceActivityVo,
-                                            @RequestParam(value = "files") List<MultipartFile> files) {
+                                            List<MultipartFile> files) {
         List<String> fileUrls = new ArrayList<>();
-        for (MultipartFile file : files) {
-            R<SysFile> sysFileR = remoteFileService.upload(file);
-            SysFile sysFile = sysFileR.getData();
-            fileUrls.add(sysFile.getUrl());
+        if(files!=null){
+            for (MultipartFile file : files) {
+                R<SysFile> sysFileR = remoteFileService.upload(file);
+                SysFile sysFile = sysFileR.getData();
+                fileUrls.add(sysFile.getUrl());
+            }
         }
         return success(qmsQualityInstanceService.handleQualityInstance(qmsQualityInstanceActivityVo,fileUrls));
     }

hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRule.java

@@ -51,6 +51,9 @@ public class QmsCheckRule extends BaseEntity
     /** 质检结果id */
     private Long checkResultId;
 
+    private String materialCode;
+
+    private String materialName;
 
     public void setCheckRuleId(Long checkRuleId)
     {
@@ -134,6 +137,23 @@ public class QmsCheckRule extends BaseEntity
         this.checkResultId = checkResultId;
     }
 
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultDetailServiceImpl.java

@@ -143,8 +143,11 @@ public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailSer
         return qmsCheckResultDetailMapper.deleteQmsCheckResultDetailByCheckResultDetailId(checkResultDetailId);
     }
 
+
+
+
     /**
-     * 新增质检结果详情项目信息信息
+     * 新增质检结果详情项目信息信息（前端已经根据标准值、上限值和下限值判断，>下限值，<上限值）
      *
      * @param qmsCheckResultDetail 质检结果详情对象
      */
@@ -215,6 +218,78 @@ public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailSer
     }
 
 
+    /**
+     * 新增质检结果详情项目信息信息（后端根据值判断是否合格）
+     *
+     * @param qmsCheckResultDetail 质检结果详情对象
+     */
+    /*public QmsCheckResultDetail handleQmsCheckResultDetailProject(QmsCheckResultDetail qmsCheckResultDetail) {
+        String checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_PASS;//质检结果检验状态
+        List<QmsCheckResultDetailProject> qmsCheckResultDetailProjectList = qmsCheckResultDetail.getQmsCheckResultDetailProjectList();
+        if (StringUtils.isNotNull(qmsCheckResultDetailProjectList)) {
+            QmsCheckResultDetail returnCheckResultDetail = new QmsCheckResultDetail();
+            List<QmsCheckResultDetailProject> list = new ArrayList<QmsCheckResultDetailProject>();
+            for (QmsCheckResultDetailProject qmsCheckResultDetailProject : qmsCheckResultDetailProjectList) {
+
+                String checkProjectProperty = qmsCheckResultDetailProject.getCheckProjectProperty();
+                if (checkProjectProperty.equals(QmsConstants.QMS_CHECK_PROJECT_PROPERTY_QUALITATIVE)) {//如果是定性
+                    String checkProjectStatus = qmsCheckResultDetailProject.getCheckProjectStatus();
+                    if (checkProjectStatus != null) {
+                        if (checkProjectStatus.equals(QmsConstants.QMS_CHECK_PROJECT_STATUS_FAIL)) {
+                            checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_FAIL;
+                        }
+                    } else {
+                        if (checkStatus.equals(QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_PASS)) {
+                            checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_CHECKED;
+                        }
+                    }
+                } else {//如果是定量
+                    BigDecimal checkProjectResult = qmsCheckResultDetailProject.getCheckProjectResult();
+                    if (checkProjectResult != null) {
+                        BigDecimal standardValue = qmsCheckResultDetailProject.getStandardValue();
+                        BigDecimal upperDiff = qmsCheckResultDetailProject.getUpperDiff();
+                        BigDecimal downDiff = qmsCheckResultDetailProject.getDownDiff();
+                        if (upperDiff == null && downDiff == null) {
+                            if (checkProjectResult.compareTo(standardValue) == 0) {
+                                qmsCheckResultDetailProject.setCheckProjectStatus(QmsConstants.QMS_CHECK_PROJECT_STATUS_PASS);
+                            } else {
+                                qmsCheckResultDetailProject.setCheckProjectStatus(QmsConstants.QMS_CHECK_PROJECT_STATUS_FAIL);
+                                checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_FAIL;
+                            }
+                        } else {
+                            if (upperDiff == null) {//如果没设置上差值，则标准值为上差值
+                                upperDiff = standardValue;
+                            } else if (downDiff == null) {//如果没设置下差值，则标准值为下差值
+                                downDiff = standardValue;
+                            }
+                            if (checkProjectResult.compareTo(downDiff) >= 0 && checkProjectResult.compareTo(upperDiff) <= 0) {
+                                qmsCheckResultDetailProject.setCheckProjectStatus(QmsConstants.QMS_CHECK_PROJECT_STATUS_PASS);
+                            } else {
+                                qmsCheckResultDetailProject.setCheckProjectStatus(QmsConstants.QMS_CHECK_PROJECT_STATUS_FAIL);
+                                checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_FAIL;
+                            }
+                        }
+                    } else {
+                        if (checkStatus.equals(QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_PASS)) {
+                            checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_CHECKED;
+                        }
+                    }
+                }
+
+                list.add(qmsCheckResultDetailProject);
+            }
+
+            returnCheckResultDetail.setCheckStatus(checkStatus);
+            returnCheckResultDetail.setQmsCheckResultDetailProjectList(list);
+
+            return returnCheckResultDetail;
+        }
+
+
+        return null;
+    }*/
+
+
     /**
      * 批量插入质检结果详情项目信息(事务，需要用public，不能用private)
      */

hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultServiceImpl.java

@@ -152,7 +152,7 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService {
             qmsCheckResult.setMaterialType(barcodeType);
             qmsCheckResult.setMaterialId(mesBaseBarcodeInfo.getMaterialId());
             qmsCheckResult.setMaterialBatch(mesBaseBarcodeInfo.getBatchCode());
-            qmsCheckResult.setCheckMode(qmsCheckResult.getCheckMode());
+            qmsCheckResult.setCheckMode(qmsCheckRule.getCheckMode());
             qmsCheckResult.setCheckSample(qmsCheckRule.getCheckSample());
             qmsCheckResult.setPlanCode(mesBaseBarcodeInfo.getPlanCode());
             qmsCheckResult.setPlanDetailCode(mesBaseBarcodeInfo.getPlanDetailCode());

hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseWarehouseController.java

@@ -111,6 +111,7 @@ public class WmsBaseWarehouseController extends BaseController
 	@DeleteMapping("/{warehouseIds}")
     public AjaxResult remove(@PathVariable Long[] warehouseIds)
     {
+        //todo:判断是否有引用，或者改为状态9
         return toAjax(wmsBaseWarehouseService.deleteWmsBaseWarehouseByWarehouseIds(warehouseIds));
     }
 

hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java

@@ -271,7 +271,7 @@ public class WmsMobileController extends BaseController {
 
 
     /**
-     * 人工申请半成品出半成品库入成品库
+     * 人工申请半成品出半成品库入成品库（弃用）
      */
     @Log(title = "转库", businessType = BusinessType.TRANSFER)
     @PostMapping(("/applyProductTransfer"))
@@ -281,7 +281,7 @@ public class WmsMobileController extends BaseController {
 
 
     /**
-     * 获取待转库列表
+     * 获取待转库列表（弃用）
      */
 //    @RequiresPermissions("wms:rawoutstock:query")
     @GetMapping(value = "/getTransfers")

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseWarehouse.java

@@ -180,6 +180,9 @@ public class WmsBaseWarehouse extends BaseEntity {
      */
     private List<WmsBaseLocation> wmsBaseLocationList;
 
+    private String materialBarcode;
+
+
     public void setWarehouseId(Long warehouseId) {
         this.warehouseId = warehouseId;
     }
@@ -404,6 +407,14 @@ public class WmsBaseWarehouse extends BaseEntity {
         this.wmsBaseLocationList = wmsBaseLocationList;
     }
 
+    public String getMaterialBarcode() {
+        return materialBarcode;
+    }
+
+    public void setMaterialBarcode(String materialBarcode) {
+        this.materialBarcode = materialBarcode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

hw-ui/src/router/index.js

@@ -323,7 +323,7 @@ export const dynamicRoutes = [
         path: "index/:inspectInstanceId(\\d+)",
         component: () => import("@/views/dms/dmsBillsInspectActivity/index"),
         name: "childDmsBillsInspectActivity",
-        meta: { title: "工单处理", activeMenu: "/dmsBillsInspectActivity" },
+        meta: { title: "工单详情", activeMenu: "/dmsBillsInspectActivity" },
       },
     ],
   },
@@ -354,7 +354,7 @@ export const dynamicRoutes = [
         path: "index/:lubeInstanceId(\\d+)",
         component: () => import("@/views/dms/dmsBillsLubeInstanceActivity/index"),
         name: "childDmsBillsLubeInstanceActivity",
-        meta: { title: "工单处理", activeMenu: "/dmsBillsLubeInstanceActivity" },
+        meta: { title: "工单详情", activeMenu: "/dmsBillsLubeInstanceActivity" },
       },
     ],
   },
@@ -384,7 +384,7 @@ export const dynamicRoutes = [
         path: "index/:repairInstanceId(\\d+)",
         component: () => import("@/views/dms/activity/index"),
         name: "childDmsFaultInstanceActivity",
-        meta: { title: "工单处理", activeMenu: "/activity" },
+        meta: { title: "工单详情", activeMenu: "/activity" },
       },
     ],
   },
@@ -400,7 +400,7 @@ export const dynamicRoutes = [
         path: "index/:maintInstanceId(\\d+)",
         component: () => import("@/views/dms/dmsMaintInstanceActivity/index"),
         name: "childDmsMaintInstanceActivity",
-        meta: { title: "工单处理", activeMenu: "/dmsMaintInstanceActivity" },
+        meta: { title: "工单详情", activeMenu: "/dmsMaintInstanceActivity" },
       },
     ],
   },

hw-ui/src/views/dms/activity/index.vue

@@ -417,7 +417,6 @@ export default {
         selectUserIdByInspectInstanceId(this.repairInstanceIdCheck,this.$store.state.user.id).then(response=>{
           console.log(response)
           if (response == false) {
-            alert("无权限")
             this.$store.dispatch("tagsView/delView",this.$route)
             this.$router.replace({path:"/dms/planRepair/dmsBillsFaultInstance"})
           }

hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue

@@ -19,7 +19,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!--el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -30,17 +30,16 @@
           v-hasPermi="['dms:dmsBillsFaultInstance:add']"
         >新增</el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['dms:dmsBillsFaultInstance:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
+     <el-col :span="1.5">
+       <el-button>
+          type="success"
+          icon="el-icon-edit"
+         size="mini"
+        :disabled="single"
+         @click="handleUpdate"
+          v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
+       >修改</el-button>
+     </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -63,7 +62,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row-->
 
     <el-table v-loading="loading" :data="dmsBillsFaultInstanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -120,8 +119,8 @@
             icon="el-icon-edit"
             @click="getJump(scope.row)"
             v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
-          >查看工单</el-button>
-          <el-button
+          >详情</el-button>
+          <!--el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -134,7 +133,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['dms:dmsBillsFaultInstance:remove']"
-          >删除</el-button>
+          >删除</el-button-->
         </template>
       </el-table-column>
     </el-table>

hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue

@@ -154,9 +154,9 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <div  >
+        <!--div>
           <el-button type="primary" @click="submitForm">提 交</el-button>
-        </div>
+        </div-->
       </el-form>
     </el-form>
     <!--润滑计划明细列表-->

hw-ui/src/views/dms/dmsBillsInstance/index.vue

@@ -56,7 +56,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!--el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -100,11 +100,11 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row-->
 
     <el-table v-loading="loading" :data="dmsBillsInstanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键标识" align="center" prop="inspectInstanceId" />
+      <!--el-table-column label="主键标识" align="center" prop="inspectInstanceId" /-->
 <!--      <el-table-column label="计划ID,关联dms_plan_inspect的plan_inspect_id" align="center" prop="planInspectId" />-->
       <el-table-column label="计划ID" align="center" prop="planInspectId" >
         <template slot-scope="scope">
@@ -162,8 +162,8 @@
             icon="el-icon-bell"
             @click="getJump(scope.row)"
             v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
-          >处理工单</el-button>
-          <el-button
+          >详情</el-button>
+          <!--el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -176,7 +176,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['dms:dmsBillsInstance:remove']"
-          >删除</el-button>
+          >删除</el-button-->
         </template>
       </el-table-column>
     </el-table>

hw-ui/src/views/dms/dmsBillsLubeInstance/index.vue

@@ -105,15 +105,14 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            style="float: right"
+        <el-button
             size="mini"
             type="text"
-            icon="el-icon-bell"
+            icon="el-icon-info"
             @click="getJump(scope.row)"
             v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
-          >处理工单</el-button>
-          <el-button
+          >详情</el-button>
+          <!--el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -126,7 +125,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['dms:dmsBillsLubeInstance:remove']"
-          >删除</el-button>
+          >删除</el-button-->
         </template>
       </el-table-column>
     </el-table>

hw-ui/src/views/dms/dmsBillsMaintInstance/index.vue

@@ -33,7 +33,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!--el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -77,7 +77,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row-->
 
     <el-table v-loading="loading" :data="dmsBillsMaintInstanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -116,7 +116,7 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <!--el-button
             style="float: right"
             size="mini"
             type="text"
@@ -137,7 +137,14 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['dms:dmsBillsMaintInstance:remove']"
-          >删除</el-button>
+          >删除</el-button-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-info"
+            @click="getJump(scope.row)"
+            v-hasPermi="['dms:dmsBillsMaintInstance:view']"
+          >详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -363,7 +370,14 @@ export default {
       this.download('dms/dmsBillsMaintInstance/export', {
         ...this.queryParams
       }, `dmsBillsMaintInstance_${new Date().getTime()}.xlsx`)
-    }
+    },
+
+
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      const maintInstanceIds = row.maintInstanceId || this.ids;
+
+    },
   }
 };
 </script>

hw-ui/src/views/dms/dmsRepairInstance/index.vue

@@ -105,7 +105,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!--el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -149,7 +149,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row-->
 
     <el-table v-loading="loading" :data="dmsRepairInstanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -227,7 +227,7 @@
             @click="getJumpSelect(scope.row)"
             v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
           >查看工单</el-button>
-          <el-button
+          <!--el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -240,7 +240,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['dms:dmsRepairInstance:remove']"
-          >删除</el-button>
+          >删除</el-button-->
         </template>
       </el-table-column>
     </el-table>

hw-ui/src/views/qms/base/checkresult/index.vue

@@ -85,14 +85,6 @@
         />
       </el-form-item>
 
-      <el-form-item label="项目编号" prop="projectNo">
-        <el-input
-          v-model="queryParams.projectNo"
-          placeholder="请输入项目编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

hw-ui/src/views/wms/base/wmswarehouse/index.vue

@@ -68,7 +68,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="入库要求" prop="inRequirement">
+      <!--el-form-item label="入库要求" prop="inRequirement">
         <el-select
           v-model="queryParams.inRequirement"
           placeholder="请选择入库要求"
@@ -83,20 +83,6 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="出库要求" prop="outRequirement">
-        <el-select
-            v-model="queryParams.outRequirement"
-            placeholder="请选择出库要求"
-            clearable
-        >
-          <el-option
-              v-for="dict in dict.type.wms_out_requirement"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
 
       <el-form-item label="出库要求" prop="outRequirement">
         <el-select
@@ -126,7 +112,7 @@
               :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item-->
 
       <el-form-item label="激活标识" prop="activeFlag">
         <el-select
@@ -212,11 +198,11 @@
         </template>
       </el-table-column>
       <el-table-column label="楼层" align="center" prop="warehouseFloor" />
-      <el-table-column label="入库要求 " align="center" prop="inRequirement" >
+      <!--el-table-column label="入库要求 " align="center" prop="inRequirement" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.wms_in_requirement" :value="scope.row.inRequirement"/>
         </template>
-      </el-table-column>
+      </el-table-column-->
       <el-table-column label="激活标识" align="center" prop="activeFlag" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.wms_warehouse_active_flag" :value="scope.row.activeFlag"/>
@@ -369,7 +355,7 @@
         </el-row>
 
 
-        <el-row>
+        <!--el-row>
           <el-col :span="12">
             <el-form-item label="混放批次" prop="batchMix">
               <el-radio-group v-model="form.batchMix" :disabled="disableFlag">
@@ -392,7 +378,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row-->
 
 
         <el-row>
@@ -422,7 +408,7 @@
 
 
 
-        <el-row>
+        <!--el-row>
             <el-form-item label="入库要求" prop="inRequirement">
               <el-radio-group v-model="form.inRequirement" :disabled="disableFlag">
                 <el-radio
@@ -456,7 +442,7 @@
               >{{dict.label}}</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-row>
+        </el-row-->
 
         <el-row>
           <el-form-item label="自动标识" prop="autoFlag">

hw-ui/src/views/wms/info/stocktotal/index.vue

@@ -119,7 +119,7 @@
           <el-table-column label="物料编号" align="center" prop="materialCode"/>
           <el-table-column label="物料名称" align="center" prop="materialName"/>
           <el-table-column label="总数量" align="center" prop="totalAmount"/>
-          <el-table-column label="冻结数量" align="center" prop="frozenAmount"/>
+          <!--el-table-column label="冻结数量" align="center" prop="frozenAmount"/-->
           <el-table-column label="占用数量" align="center" prop="occupyAmount"/>
 <!--          <el-table-column label="创建时间" align="center" prop="createDate" width="180">-->
 <!--            <template slot-scope="scope">-->