root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-09-27 10:02:34 +08:00
parent ae82252af5
commit c60243e10c
6 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls
View File

Binary file not shown.

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
View File

@@ -48,6 +48,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String repair_type = MapUtil.getStr(whereJson, "repair_type");
String device_code = MapUtil.getStr(whereJson, "device_code");
String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
String repair_plan_code = MapUtil.getStr(whereJson, "repair_plan_code");
@@ -62,6 +63,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
map.put("is_active", is_active);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("repair_type", repair_type);
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%");
if (ObjectUtil.isNotEmpty(repair_plan_code)) map.put("repair_plan_code","%"+repair_plan_code+"%");
//处理物料当前节点的所有子节点
@@ -128,6 +130,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
jsonMst.put("repair_type",whereJson.getString("repair_type"));
jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
jsonMst.put("detail_count",tableData.size());
jsonMst.put("create_id",currentUserId);
@@ -169,6 +172,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
jsonMst.put("repair_type",whereJson.getString("repair_type"));
jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
jsonMst.put("detail_count",tableData.size());
jsonMst.put("update_optid",currentUserId);
@@ -268,6 +272,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
jsonMst.put("repair_type",whereJson.getString("repair_type"));
jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
jsonMst.put("detail_count",tableData.size());
jsonMst.put("create_id",currentUserId);

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
View File

@@ -22,6 +22,7 @@
输入.is_active TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.repair_type TYPEAS s_string
[临时表]
@@ -80,6 +81,10 @@
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.repair_type <> ""
mst.repair_type = 输入.repair_type
ENDOPTION
OPTION 输入.is_active <> ""
mst.is_active = 输入.is_active
ENDOPTION

25
mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue
View File

@@ -65,7 +65,25 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-col :span="6">
<el-form-item label="维修类型" prop="repair_type">
<el-select
v-model="form.repair_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 200px"
>
<el-option
v-for="item in dict.EM_DEVICE_WX_TYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</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="crud.status.view > 0" />
</el-form-item>
@@ -144,7 +162,7 @@ import CRUD, { form, crud } from '@crud/crud'
export default {
name: 'AddDialog',
dicts: ['EM_DEVICE_WX_CYCLE'],
dicts: ['EM_DEVICE_WX_CYCLE', 'EM_DEVICE_WX_TYPE'],
components: { ItemDialog, DeviceDialog },
mixins: [form(defaultForm), crud()],
props: {
@@ -180,6 +198,9 @@ export default {
],
devicerecord_id: [
{ required: true, message: '设备不能为空', trigger: 'blur' }
],
repair_type: [
{ required: true, message: '维修类型不能为空', trigger: 'blur' }
]
}
}

22
mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue
View File

@@ -68,7 +68,25 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-col :span="6">
<el-form-item label="维修类型" prop="repair_type">
<el-select
v-model="form1.repair_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 200px"
>
<el-option
v-for="item in dict.EM_DEVICE_WX_TYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form1.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
@@ -137,7 +155,7 @@ import CRUD, { crud } from '@crud/crud'
export default {
name: 'AddDialog',
dicts: ['EM_DEVICE_WX_CYCLE'],
dicts: ['EM_DEVICE_WX_CYCLE', 'EM_DEVICE_WX_TYPE'],
components: { ItemDialog, DeviceDialog },
mixins: [crud()],
props: {

23
mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
View File

@@ -73,6 +73,23 @@
/>
</el-select>
</el-form-item>
<el-form-item label="维修类型">
<el-select
v-model="query.repair_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 200px"
@change="hand"
>
<el-option
v-for="item in dict.EM_DEVICE_WX_TYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -111,6 +128,7 @@
<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="maintenancecycle" label="维修周期" :formatter="formatMainName" />
<el-table-column prop="repair_type" label="维修类型" :formatter="formatRepairpType" />
<el-table-column prop="plan_start_date" label="计划开始日期" width="120px" />
<el-table-column prop="real_start_date" label="实际开始日期" width="120px" />
<el-table-column prop="real_end_date" label="实际结束日期" width="120px" />
@@ -153,7 +171,7 @@ import CopyAddDialog from '@/views/wms/sb/repair/devicerepairplan/CopyAddDialog'
export default {
name: 'Devicerepairplanmst',
dicts: ['EM_DEVICE_WX_CYCLE', 'IS_OR_NOT'],
dicts: ['EM_DEVICE_WX_CYCLE', 'IS_OR_NOT', 'EM_DEVICE_WX_TYPE'],
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, CopyAddDialog },
mixins: [presenter(), header(), crud()],
cruds() {
@@ -228,6 +246,9 @@ export default {
formatMainName(row, cloum) {
return this.dict.label.EM_DEVICE_WX_CYCLE[row.maintenancecycle]
},
formatRepairpType(row, cloum) {
return this.dict.label.EM_DEVICE_WX_TYPE[row.repair_type]
},
loadClass({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {