代码更新

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairmstController.java

@@ -66,6 +66,14 @@ public class DevicerepairmstController {
         return new ResponseEntity<>(devicerepairmstService.query4(whereJson, page), HttpStatus.OK);
     }
 
+    @GetMapping("/query5")
+    @Log("查询维修单维护5")
+    @ApiOperation("查询维修单维护5")
+    //@PreAuthorize("@el.check('devicerepairmst:list')")
+    public ResponseEntity<Object> query5(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicerepairmstService.query5(whereJson, page), HttpStatus.OK);
+    }
+
     @GetMapping("/queryBom")
     @Log("查询备件bom")
     @ApiOperation("查询备件bom")

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairmstService.java

@@ -202,4 +202,13 @@ public interface DevicerepairmstService {
      */
     Map<String, Object> query4(Map whereJson, Pageable page);
 
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> query5(Map whereJson, Pageable page);
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java

@@ -994,4 +994,36 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
         return json;
     }
 
+    @Override
+    public Map<String, Object> query5(Map whereJson, Pageable page) {
+        String device_code = MapUtil.getStr(whereJson, "device_code");
+        String repair_code = MapUtil.getStr(whereJson, "repair_code");
+        String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
+        String invstatus = MapUtil.getStr(whereJson, "invstatus");
+        String begin_time = MapUtil.getStr(whereJson, "begin_time");
+        String end_time = MapUtil.getStr(whereJson, "end_time");
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = (String) whereJson.get("class_idStr");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "9");
+        map.put("maintenancecycle",maintenancecycle);
+        map.put("invstatus",invstatus);
+        map.put("begin_time",begin_time);
+        map.put("end_time",end_time);
+        if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%");
+        if (ObjectUtil.isNotEmpty(repair_code)) map.put("repair_code","%"+repair_code+"%");
+        //处理物料当前节点的所有子节点
+        if (!StrUtil.isEmpty(material_type_id)) {
+            map.put("material_type_id", material_type_id);
+            String classIds = classstandardService.getChildIdStr(material_type_id);
+            map.put("classIds", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds", classIds);
+        }
+        JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC");
+        return json;
+    }
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql

@@ -372,6 +372,61 @@
 		ENDPAGEQUERY
 	ENDIF
 
+	IF 输入.flag = "9"
+		PAGEQUERY
+			SELECT
+            	mst.*,
+            	class.class_name,
+            	file.device_code,
+            	file.device_name,
+            	file.extend_code,
+                d1.name AS dept_name,
+                d2.name AS use_name
+            FROM
+            	EM_BI_DeviceRepairMst mst
+            	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+            WHERE
+                mst.is_delete = '0'
+                AND file.is_delete = '0'
+                AND mst.invstatus = '06'
+
+                OPTION 输入.device_code <> ""
+                    (file.device_code like 输入.device_code or
+                    file.device_name like 输入.device_code)
+                ENDOPTION
+
+                OPTION 输入.repair_code <> ""
+                    (mst.repair_code like 输入.repair_code or
+                    mst.repair_code like 输入.repair_code)
+                ENDOPTION
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.invstatus <> ""
+                    mst.invstatus = 输入.invstatus
+                ENDOPTION
+
+                OPTION 输入.maintenancecycle <> ""
+                    mst.maintenancecycle = 输入.maintenancecycle
+                ENDOPTION
+
+                OPTION 输入.begin_time <> ""
+                    mst.plan_start_date >= 输入.begin_time
+                ENDOPTION
+
+                OPTION 输入.end_time <> ""
+                    mst.plan_start_date <= 输入.end_time
+                ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
 
 
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql

@@ -340,6 +340,7 @@
                                     WHEN '99' THEN '审核完毕'
                                 END
 			                )
+                        ELSE '报修'
 			        END
 			    ) AS invstatus,
 			    mst.real_start_date,
@@ -367,8 +368,6 @@
             WHERE
                 st.is_delete = '0'
                 AND (st.status <> '99')
-                AND mst.source_bill_type = 'BXD'
-                AND st.is_passed = '1'
 
         UNION
 

mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue

@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="110px"
+          label-suffix=":"
+        >
+          <el-form-item label="设备类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
+          <el-form-item label="设备">
+            <el-input
+              v-model="query.device_code"
+              clearable
+              size="mini"
+              placeholder="请输入设备编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="单据号">
+            <el-input
+              v-model="query.repair_code"
+              clearable
+              size="mini"
+              placeholder="请输入编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="维修类型">
+            <el-select
+              v-model="query.maintenancecycle"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_WX_INVTYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="计划维修日期">
+            <date-range-picker v-model="query.createTime" class="date-item" />
+          </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.invstatus"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_WX_INVSTATUS"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="confirmRepair"
+        >
+          班组验收
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="repair_id" label="设备维修单标识" />
+        <el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.repair_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip />
+        <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
+        <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
+        <el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip />
+        <el-table-column prop="use_name" label="使用班组" show-overflow-tooltip />
+        <el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/>
+        <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/>
+        <el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/>
+        <el-table-column prop="plan_start_date" label="计划维修日期" width="120px" show-overflow-tooltip />
+        <el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip />
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip />
+        <el-table-column prop="input_optname" label="制单人" />
+        <el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip />
+        <el-table-column prop="update_optname" label="维修人" />
+        <el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip />
+        <el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip />
+        <el-table-column prop="confirm_optname" label="确认人" />
+        <el-table-column prop="confirm_time" label="确认时间" width="150px" show-overflow-tooltip />
+        <el-table-column prop="audit_optname" label="审核人" />
+        <el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip />
+        <el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip />
+        <el-table-column prop="source_bill_type" label="源单业务类型" width="120px" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog/>
+  </div>
+</template>
+
+<script>
+import crudDevicerepairmst from '@/api/wms/sb/devicerepairmst'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
+import AddDialog from '@/views/wms/sb/repair/devicerepair/AddDialog'
+
+export default {
+  name: 'Devicegridcheck',
+  dicts: ['EM_DEVICE_WX_INVTYPE', 'EM_DEVICE_WX_INVSTATUS', 'EM_FAULT_LEVEL'],
+  components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect },
+  mixins: [presenter(), header(), crud()],
+  cruds() {
+    return CRUD({
+      title: '维修单维护班组验收',
+      url: 'api/devicerepairmst/query5',
+      idField: 'repair_id',
+      sort: 'repair_id,desc',
+      crudMethod: { ...crudDevicerepairmst },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
+      permission: {
+      }
+    }
+  },
+  created() {
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      this.crud.toQuery()
+      this.queryClassId()
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    hand(value) {
+      this.crud.toQuery()
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    formatStatusName(row, cloum) {
+      return this.dict.label.EM_DEVICE_WX_INVSTATUS[row.invstatus]
+    },
+    formatTypeName(row, cloum) {
+      return this.dict.label.EM_DEVICE_WX_INVTYPE[row.maintenancecycle]
+    },
+    formatLevelName(row, cloum) {
+      return this.dict.label.EM_FAULT_LEVEL[row.fault_level]
+    },
+    confirmRepair() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      if (data.invstatus !== '06') {
+        return this.crud.notify('只能对结束状态的单据确认', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicerepairmst.confirmRepair(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue

@@ -14,8 +14,8 @@
       </el-col>
       <el-col :span="6">
         <span>
+          <el-button icon="el-icon-check" size="mini" type="primary" @click="submitMain">预保存</el-button>
           <el-button icon="el-icon-check" size="mini" type="primary" @click="endRepair">保存并结束</el-button>
-          <el-button icon="el-icon-check" size="mini" type="primary" @click="submitMain">保存</el-button>
           <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
         </span>
       </el-col>
@@ -73,7 +73,12 @@
       </el-row>
 
       <el-row>
-        <el-col :span="16">
+        <el-col :span="12">
+          <el-form-item label="故障描述" prop="fault_desc">
+            <el-input v-model="form.fault_desc" style="width: 580px;" rows="2" type="textarea" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" disabled />
           </el-form-item>

mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue

@@ -133,7 +133,7 @@
         >
           结束维修
         </el-button>
-        <el-button
+<!--        <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -143,7 +143,7 @@
           @click="confirmRepair"
         >
           班组验收
-        </el-button>
+        </el-button>-->
 <!--        <el-button
           slot="right"
           class="filter-item"

mes/qd/src/views/wms/sb/stat/task/bigScreen.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="login" :style="'background-image:url('+ Background +');'">
-    <div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px;background-color: transparent">当日任务列表</div>
+    <div style="font-size: 22px; color: #f4f4f5; text-align: center; background-color: transparent">武汉新锐设备管理任务看板</div>
     <div class="t_btn2">
-      <el-table border style="width: 100%;" :data="tableData" max-height="800" :cell-style="cellStyle" :row-style="setRowStyle" :highlight-current-row="true" >
+      <el-table border style="width: 100%;" :data="tableData" max-height="700" :cell-style="cellStyle" :row-style="setRowStyle" :highlight-current-row="true" >
         <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column prop="input_time" label="生成时间" show-overflow-tooltip />
         <el-table-column prop="repair_code" label="任务号" show-overflow-tooltip />