From 4008d83696a6998ce987133ae2d2b0ec912cf178 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期日, 07 四月 2024 09:40:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java | 67 ++
north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java | 31 +
north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml | 72 +++
north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue | 4
north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 4
north-glass-erp/target/classes/mapper/pp/FolwCard.xml | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue | 1
north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue | 271 +++++-----
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 3
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue | 2
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 5
north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java | 80 +++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 2
north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java | 26
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue | 23
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 67 +-
north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue | 241 +++++----
north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue | 371 ++++++++------
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 4
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue | 23
north-glass-erp/target/classes/mapper/pp/DeviceMaintenance.xml | 72 +++
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue | 22
north-glass-erp/target/classes/mapper/pp/Report.xml | 10
24 files changed, 942 insertions(+), 463 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
index a1aa829..eb54c7a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
@@ -1,50 +1,55 @@
<script setup>
-import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
- break
- }
- }
-}
+import {computed, nextTick, onMounted, reactive, ref, toRefs} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import request from "@/utils/request";
+import {ElMessage} from "element-plus";
+import {changeFilterEvent, filterChanged} from "@/hook"
+import userInfo from "@/stores/userInfo"
+import {useI18n} from 'vue-i18n'
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
+//璇█鑾峰彇
+const {t} = useI18n()
+const route = useRoute()
+const user = userInfo()
+let router = useRouter()
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
- })
- return count.toFixed(2)
-}
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+
+})
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/basicDataProduce/selectProcess`).then((res) => {
+ if (res.code == 200) {
+
+ titleSelectJson.value.processType = res.data.process;
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+})
+
//瀛愮粍浠舵帴鏀跺弬鏁�
-
+const xGrid = ref()
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
@@ -60,78 +65,41 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ columns: [
+ {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {
+ field: 'basicName',
+ title: '璁惧鍚嶇О',
+ width: 500,
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ },
- {field: 'standardName', title: '鏍囧噯鍚嶇О',editRender: { name: 'input', attrs: { placeholder: '' } } },
- {field: 'deviceName', title: '璁惧鍚嶇О',editRender: { name: 'input', attrs: { placeholder: '' } } },
- {field: 'buyingTime', title: '璐拱鏃堕棿',editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'installationTime',title: '瀹夎鏃堕棿',editRender: { name: 'input', attrs: { placeholder: '' } } },
- {field: 'serviceInterval', title: '淇濆吇鍛ㄦ湡',editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'process', title: '鎵�鍦ㄥ伐鑹�', editRender: { name: 'input', attrs: { placeholder: '' } }},
+ {
+ field: 'basicCategory',
+ title: '鎵�鍦ㄥ伐搴�',
+ width: 500,
+ editRender: {},
+ slots: {default: 'basicCategory_default', edit: 'basicCategory'}
+ },
],
//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'print_lck', name: '淇濆瓨',status:'primary' ,icon:'vxe-icon-save'},
+ {code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
+ {code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
+ {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
],
- import: false,
- export: true,
- print: true,
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
- data: [
- {
- standardName: '',
- deviceName: '',
- buyingTime: '',
- installationTime: '',
- serviceInterval:'',
- process:'',
-
- },
- {
- standardName: '',
- deviceName: '',
- buyingTime: '',
- installationTime: '',
- serviceInterval:'',
- process:'',
-
- },
- {
- standardName: '',
- deviceName: '',
- buyingTime: '',
- installationTime: '',
- serviceInterval:'',
- process:'',
-
- },
- {
- standardName: '',
- deviceName: '',
- buyingTime: '',
- installationTime: '',
- serviceInterval:'',
- process:'',
-
- },
- {
- standardName: '',
- deviceName: '',
- buyingTime: '',
- installationTime: '',
- serviceInterval:'',
- process:'',
-
- },
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['maintenanceFrequency','MaintenancesFrequency']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['', '']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '鍚堣:'
@@ -146,69 +114,108 @@
})
+const teamGridEvents = {
+ toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'addRow': {
+ $grid.insertAt({})
+ break
+ }
+
+ case 'removeRow': {
+ let result = toolbarButtonClickEvent()
+ if (result) {
+ $grid.remove(result.row)
+ }
+ break
+ }
+ case 'save': {
+ const tableData = $grid.getTableData().fullData
+ //console.log(tableData)
+ let machineData = ref({
+ machine: tableData
+ })
+ request.post("/maintenance/saveMachine", machineData.value).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success("淇濆瓨鎴愬姛")
+ //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
+ router.push({
+ path: '/main/machine/AddMachine',
+ query: {random: Math.random()}
+ })
+
+ //location.reload();
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+ break
+ }
+ }
+ }
+ }
+}
+
const size = ref<'default' | 'large' | 'small'>('default')
const value1 = ref('')
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
-})
</script>
<template>
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ height="650px"
+ max-height="100%"
v-bind="gridOptions"
+ v-on="teamGridEvents"
+ @filter-change="filterChanged"
>
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
- <ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{key+': '}}</span>
- <span>{{ item }}</span>
- </li>
- </ul>
- </template>
-
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="dialogFormVisible = true" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
- </template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
-
-
+ <!--宸ュ簭-->
+ <template #basicCategory="{ row }">
+ <vxe-select v-model="row.basicCategory"
+ clearable
+ filterable
+ placeholder="">
+ <vxe-option v-for="item in titleSelectJson.processType"
+ :key="item.basic_name"
+ :label="item.basic_name"
+ :value="item.basic_name"/>
+ </vxe-select>
+ </template>
+ <template #basicCategory_default="{ row }">
+ <span>{{ row.basicCategory }}</span>
+ </template>
</vxe-grid>
</div>
</template>
<style scoped>
-.main-div-customer{
- width: 99%;
+.main-div-customer {
+ width: 80%;
+ margin: 0 auto;
height: 100%;
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
index 9855cd1..9371b52 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
@@ -1,50 +1,62 @@
<script setup>
-import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
- break
- }
- }
-}
+import {computed, nextTick, onMounted, reactive, ref, toRefs} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import request from "@/utils/request";
+import {ElMessage} from "element-plus";
+import {changeFilterEvent, filterChanged} from "@/hook"
+import userInfo from "@/stores/userInfo"
+import {useI18n} from 'vue-i18n'
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
+//璇█鑾峰彇
+const {t} = useI18n()
+const route = useRoute()
+const user = userInfo()
+let router = useRouter()
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
- })
- return count.toFixed(2)
-}
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+ deviceType: [],
+
+})
+
+const titleUploadData = ref({
+ process: '',
+})
+
+onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+})
+
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/maintenance/selectData`).then((res) => {
+ if (res.code == 200) {
+ //宸ュ簭涓嬫媺妗�
+ titleSelectJson.value.processType = res.data.process;
+ //璁惧涓嬫媺妗�
+ titleSelectJson.value.deviceType = res.data.device
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
//瀛愮粍浠舵帴鏀跺弬鏁�
-
+const xGrid = ref()
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
@@ -60,107 +72,85 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'deviceName', width: 100,title: '璁惧鍚嶇О', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'types',width: 80, title: '绫诲瀷',editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'faultDate', width: 100,title: '鏁呴殰鏃ユ湡',editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'failureCause', width: 100,title: '鏁呴殰鍘熷洜', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'maintenanceDate',width: 100, title: '淇濆吇鏃ユ湡', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'maintenanceInstructions',width: 110, title: '淇濆吇璇存槑', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'RepairMaintenanceStartTime', width: 160,title: '缁翠慨/淇濆吇寮�濮嬫椂闂�', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'RepairMaintenanceEndTime',width: 160, title: '缁翠慨/淇濆吇缁撴潫鏃堕棿', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'process',width: 100, title: '鎵�鍦ㄥ伐鑹�', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'RepairMaintenancePersonnel',width: 150, title: '缁翠慨/淇濆吇浜哄憳', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'cost', title: '璐圭敤', editRender: { name: 'input', attrs: { placeholder: '' } }},
- ],//琛ㄥご鎸夐挳
+ columns: [
+ {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {
+ field: 'deviceName',
+ title: '璁惧鍚嶇О',
+ editRender: {},
+ slots: {default: 'basicCategory_default', edit: 'deviceName'}
+ },
+ {
+ field: 'type',
+ title: '绫诲瀷',
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ },
+ {
+ field: 'faultTime',
+ title: '鏁呴殰鏃ユ湡',
+ editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
+ },
+ {
+ field: 'faultReason',
+ title: '鏁呴殰鍘熷洜',
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ },
+ {
+ field: 'maintenanceTime',
+ title: '淇濆吇鏃ユ湡',
+ editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
+ },
+ {
+ field: 'maintenanceIllustrate',
+ title: '淇濆吇璇存槑',
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ },
+ {
+ field: 'startTime',
+ title: '缁翠慨/淇濆吇寮�濮嬫椂闂�',
+ editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
+ },
+ {
+ field: 'stopTime',
+ title: '缁翠慨/淇濆吇缁撴潫鏃堕棿',
+ editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
+ },
+ {
+ field: 'process',
+ title: '鎵�鍦ㄥ伐搴�',
+ editRender: {},
+ slots: {default: 'reportingDeviceSort_default', edit: 'process'}
+ },
+ {
+ field: 'personnel',
+ title: '缁翠慨/淇濆吇浜哄憳',
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ },
+ {
+ field: 'cost',
+ title: '璐圭敤',
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ },
+ ],
+ //琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'print_lck', name: '淇濆瓨',status:'primary' ,icon:'vxe-icon-save'},
+ {code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
+ {code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
+ {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
],
- import: false,
- export: true,
- print: true,
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
- data: [
- {
- deviceName: '',
- types: '',
- faultDate: '',
- failureCause: '',
- maintenanceDate:'',
- maintenanceInstructions:'',
- RepairMaintenanceStartTime:'',
- RepairMaintenanceEndTime:'',
- process:'',
- RepairMaintenancePersonnel:'',
- cost:'',
-
- },
- {
- deviceName: '',
- types: '',
- faultDate: '',
- failureCause: '',
- maintenanceDate:'',
- maintenanceInstructions:'',
- RepairMaintenanceStartTime:'',
- RepairMaintenanceEndTime:'',
- process:'',
- RepairMaintenancePersonnel:'',
- cost:'',
-
- },
- {
- deviceName: '',
- types: '',
- faultDate: '',
- failureCause: '',
- maintenanceDate:'',
- maintenanceInstructions:'',
- RepairMaintenanceStartTime:'',
- RepairMaintenanceEndTime:'',
- process:'',
- RepairMaintenancePersonnel:'',
- cost:'',
-
- },
- {
- deviceName: '',
- types: '',
- faultDate: '',
- failureCause: '',
- maintenanceDate:'',
- maintenanceInstructions:'',
- RepairMaintenanceStartTime:'',
- RepairMaintenanceEndTime:'',
- process:'',
- RepairMaintenancePersonnel:'',
- cost:'',
-
- },
- {
- deviceName: '',
- types: '',
- faultDate: '',
- failureCause: '',
- maintenanceDate:'',
- maintenanceInstructions:'',
- RepairMaintenanceStartTime:'',
- RepairMaintenanceEndTime:'',
- process:'',
- RepairMaintenancePersonnel:'',
- cost:'',
-
- },
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['maintenanceFrequency','MaintenancesFrequency']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['', '']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '鍚堣:'
@@ -175,21 +165,60 @@
})
+const teamGridEvents = {
+ toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'addRow': {
+ $grid.insertAt({})
+ break
+ }
+ case 'removeRow': {
+ let result = toolbarButtonClickEvent()
+ if (result) {
+ $grid.remove(result.row)
+ }
+ break
+ }
+ case 'save': {
+ const tableData = $grid.getTableData().fullData
+ //console.log(tableData)
+ let machineData = ref({
+ machine: tableData
+ })
+ request.post("/maintenance/saveMaintenanceAndRepair", machineData.value).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success("淇濆瓨鎴愬姛")
+ //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
+ router.push({
+ path: '/main/machine/AddMaintenanceAndRepair',
+ query: {random: Math.random()}
+ })
+
+ //location.reload();
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+ break
+ }
+ }
+ }
+ }
+}
+
const size = ref<'default' | 'large' | 'small'>('default')
const value1 = ref('')
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
+const computedDevice = computed((name) => {
+ return function (name) {
+ return titleSelectJson.value.deviceType.filter((item) => {
+
+ return item.basic_name === name
+ })
+ }
})
</script>
@@ -197,38 +226,52 @@
<template>
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ height="650px"
+ max-height="100%"
v-bind="gridOptions"
-
+ v-on="teamGridEvents"
+ @filter-change="filterChanged"
>
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
- <ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{key+': '}}</span>
- <span>{{ item }}</span>
- </li>
- </ul>
- </template>
-
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="dialogFormVisible = true" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
- </template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
+ <!--璁惧-->
+ <template #deviceName="{ row }">
+ <vxe-select v-model="row.deviceName"
+ clearable
+ filterable
+ placeholder="">
+ <vxe-option v-for="item in titleSelectJson.deviceType"
+ :key="item.basic_name"
+ :label="item.basic_name"
+ :value="item.basic_name"/>
+ </vxe-select>
+ </template>
+ <template #basicCategory_default="{ row }">
+ <span>{{ row.deviceName }}</span>
+ </template>
+
+ <!--宸ュ簭-->
+ <template #process="{ row }">
+ <vxe-select v-model="row.process"
+ clearable
+ filterable
+ placeholder="">
+ <vxe-option v-for="item in computedDevice(row.deviceName)" :key="item.id" :label="item.basic_category"
+ :value="item.basic_category"/>
+ </vxe-select>
+ </template>
+ <template #reportingDeviceSort_default="{ row }">
+ <span>{{ row.process }}</span>
+ </template>
</vxe-grid>
@@ -236,8 +279,16 @@
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
}
+
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
index 76916e1..f18bce5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -1,20 +1,38 @@
<script setup>
import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
+import {useRouter} from 'vue-router'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import {useI18n} from 'vue-i18n'
+import deepClone from "@/utils/deepClone";
+import {ElMessage} from "element-plus";
+import request from "@/utils/request";
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+const getTableRow = (row, type) => {
switch (type) {
- case 'edit' :{
+ case 'edit' : {
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
+ router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: {id: row.id}})
break
}
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+ case 'delete': {
+ request.post(`/maintenance/deleteMaintenance/${row.id}`).then((res) => {
+ if (res.code === 200) {
+ ElMessage.success(t('workOrder.deleteOk'))
+ router.push({path: '/main/machine/MaintenanceAndRepair', query: {random:Math.random()}})
+ } else {
+
+ ElMessage.warning(res.msg)
+
+ }
+ })
break
}
- case 'setType':{
+ case 'setType': {
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
break
}
@@ -30,27 +48,38 @@
return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//棣栨鍔犺浇
+request.post(`/maintenance/selectMaintenance`).then((res) => {
+ if (res.code === 200) {
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -60,79 +89,57 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: '鎿嶄綔', width: 140, slots: {default: 'button_slot'}, fixed: "left"},
+ {
+ field: 'id', width: 130, title: 'Id'
+ },
- {field: '璁惧鍚嶇О', width: 130,title: '璁惧鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '绫诲瀷',width: 120, title: '绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '鏁呴殰鏃ユ湡', width: 100,title: '鏁呴殰鏃ユ湡', sortable: true,showOverflow:"ellipsis"},
- {field: '鏁呴殰鍘熷洜', width: 100,title: '鏁呴殰鍘熷洜', sortable: true},
- {field: '淇濆吇鏃ユ湡',width: 100, title: '淇濆吇鏃ユ湡', sortable: true},
- {field: '淇濆吇璇存槑',width: 120, title: '淇濆吇璇存槑', sortable: true,showOverflow:"ellipsis"},
- {field: '缁翠慨淇濆吇寮�濮嬫椂闂�', width: 160,title: '缁翠慨/淇濆吇寮�濮嬫椂闂�', sortable: true},
- {field: '缁翠慨淇濆吇缁撴潫鏃堕棿',width: 160, title: '缁翠慨/淇濆吇缁撴潫鏃堕棿', sortable: true},
- {field: '鎵�鍦ㄥ伐鑹�',width: 120, title: '鎵�鍦ㄥ伐鑹�', sortable: true},
- {field: '缁翠慨淇濆吇浜哄憳',width: 150, title: '缁翠慨/淇濆吇浜哄憳', sortable: true},
- {field: '璐圭敤',width: 120, title: '璐圭敤', sortable: true},
+ {
+ field: 'deviceName', width: 130, title: '璁惧鍚嶇О', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'type', width: 120, title: '绫诲瀷', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'faultTime', width: 100, title: '鏁呴殰鏃ユ湡', showOverflow: "ellipsis"},
+ {
+ field: 'faultReason', width: 100, title: '鏁呴殰鍘熷洜', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'maintenanceTime', width: 100, title: '淇濆吇鏃ユ湡'},
+ {field: 'maintenanceIllustrate', width: 120, title: '淇濆吇璇存槑', showOverflow: "ellipsis"},
+ {field: 'startTime', width: 160, title: '缁翠慨/淇濆吇寮�濮嬫椂闂�'},
+ {field: 'stopTime', width: 160, title: '缁翠慨/淇濆吇缁撴潫鏃堕棿'},
+ {
+ field: 'process', width: 120, title: '鎵�鍦ㄥ伐鑹�', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'personnel', width: 150, title: '缁翠慨/淇濆吇浜哄憳'},
+ {field: 'cost', width: 120, title: '璐圭敤'},
],//琛ㄥご鎸夐挳
toolbarConfig: {
// buttons: [{
//
// }],
- import: false,
- export: true,
- print: true,
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
- data: [
- {
- 璁惧鍚嶇О: '閽㈠寲鐐�(22E)',
- 绫诲瀷: '缁翠慨',
- 鏁呴殰鏃ユ湡: '2022-03-16',
- 鏁呴殰鍘熷洜: '鍧忎簡',
- 淇濆吇鏃ユ湡:'',
- 淇濆吇璇存槑:'',
- 缁翠慨淇濆吇寮�濮嬫椂闂�:'2022-03-16',
- 缁翠慨淇濆吇缁撴潫鏃堕棿:'2022-03-16',
- 鎵�鍦ㄥ伐鑹�:'閽㈠寲',
- 缁翠慨淇濆吇浜哄憳:'SSS',
- 璐圭敤:'112',
- },
- {
- 璁惧鍚嶇О: '閽㈠寲鐐�(22E)',
- 绫诲瀷: '缁翠慨',
- 鏁呴殰鏃ユ湡: '2022-03-16',
- 鏁呴殰鍘熷洜: '鍧忎簡',
- 淇濆吇鏃ユ湡:'',
- 淇濆吇璇存槑:'',
- 缁翠慨淇濆吇寮�濮嬫椂闂�:'2022-03-16',
- 缁翠慨淇濆吇缁撴潫鏃堕棿:'2022-03-16',
- 鎵�鍦ㄥ伐鑹�:'閽㈠寲',
- 缁翠慨淇濆吇浜哄憳:'SSS',
- 璐圭敤:'112',
- },
- {
- 璁惧鍚嶇О: '閽㈠寲鐐�(22E)',
- 绫诲瀷: '缁翠慨',
- 鏁呴殰鏃ユ湡: '2022-03-16',
- 鏁呴殰鍘熷洜: '鍧忎簡',
- 淇濆吇鏃ユ湡:'',
- 淇濆吇璇存槑:'',
- 缁翠慨淇濆吇寮�濮嬫椂闂�:'2022-03-16',
- 缁翠慨淇濆吇缁撴潫鏃堕棿:'2022-03-16',
- 鎵�鍦ㄥ伐鑹�:'閽㈠寲',
- 缁翠慨淇濆吇浜哄憳:'SSS',
- 璐圭敤:'112',
- },
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['璐圭敤']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['璐圭敤']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '鍚堣:'
@@ -169,19 +176,19 @@
<template>
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ max-height="100%"
v-bind="gridOptions"
+ @filter-change="filterChanged"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row}">
<ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{key+': '}}</span>
+ <li v-for="(item,key,index) in row">
+ <span style="font-weight: bold">{{ key + ': ' }}</span>
<span>{{ item }}</span>
</li>
</ul>
@@ -189,14 +196,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="dialogFormVisible = true" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button link size="small" type="primary" @click="dialogFormVisible = true">缂栬緫</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'delete')">鍒犻櫎</el-button>
</template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -209,91 +216,93 @@
<el-form :model="form">
<el-row>
<el-col :span="12">
- <el-form-item label="璁惧鍚嶇О" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-form-item :label-width="formLabelWidth" label="璁惧鍚嶇О">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绫诲瀷" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="绫诲瀷">
<el-select v-model="form.region" placeholder="缁翠慨" style="width: 220px">
- <el-option label="淇濆吇" value="shanghai" />
- <el-option label="缁翠慨" value="mobian" />
+ <el-option label="淇濆吇" value="shanghai"/>
+ <el-option label="缁翠慨" value="mobian"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鏁呴殰鏃ユ湡" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="鏁呴殰鏃ユ湡">
<el-date-picker
v-model="value1"
- type="date"
+ :size="size"
placeholder="2023-01-01"
- :size="size"
+ type="date"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏁呴殰鍘熷洜" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-form-item :label-width="formLabelWidth" label="鏁呴殰鍘熷洜">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="淇濆吇鏃ユ湡" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇鏃ユ湡">
<el-date-picker
v-model="value1"
- type="date"
- placeholder="2023-02-01"
:size="size"
+ placeholder="2023-02-01"
+ type="date"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="淇濆吇璇存槑" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇璇存槑">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="淇濆吇/缁翠慨寮�濮嬫椂闂�" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨寮�濮嬫椂闂�">
<el-date-picker
v-model="value1"
- type="date"
- placeholder="2023-02-01"
:size="size"
+ placeholder="2023-02-01"
+ type="date"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="淇濆吇/缁翠慨瀹屾垚鏃堕棿" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨瀹屾垚鏃堕棿">
<el-date-picker
v-model="value1"
- type="date"
- placeholder="2023-02-01"
:size="size"
+ placeholder="2023-02-01"
+ type="date"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鎵�鍦ㄥ伐鑹�" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="鎵�鍦ㄥ伐鑹�">
<el-select v-model="form.region" placeholder="閽㈠寲" style="width: 220px">
- <el-option label="鍒囧壊" value="shanghai" />
- <el-option label="纾ㄨ竟" value="mobian" />
- <el-option label="閽㈠寲" value="ganghua" />
+ <el-option label="鍒囧壊" value="shanghai"/>
+ <el-option label="纾ㄨ竟" value="mobian"/>
+ <el-option label="閽㈠寲" value="ganghua"/>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12"><el-form-item label="淇濆吇/缁翠慨浜哄憳" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
- </el-form-item></el-col>
+ <el-col :span="12">
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨浜哄憳">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ </el-form-item>
+ </el-col>
</el-row>
- <el-form-item label="璐圭敤" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-form-item :label-width="formLabelWidth" label="璐圭敤">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-form>
<template #footer>
@@ -309,7 +318,7 @@
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index 77d62b2..93e80c6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -278,6 +278,7 @@
</div>
<vxe-grid
max-height="100%"
+ height="600px"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 59ba7ac..3e96af6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -134,10 +134,10 @@
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{field: 'order_id', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
- {field: 'process_id', width: 130, title: '娴佺▼鍗″彿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'process_id', width: 140, title: '娴佺▼鍗″彿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'order_number', title: '璁㈠崟搴忓彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
{field: 'technology_number', title: '灏忕墖椤哄簭' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'quantity', title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
+ {field: 'quantity', title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
{field: 'area', title: '闈㈢Н' ,showOverflow:"ellipsis"},
{field: 'product_name', title: '浜у搧鍚嶇О', },
{field: 'glass_child', title: '鍗曠墖鍚嶇О', },
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 3b8cc20..c546fb8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -283,8 +283,8 @@
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{title: t('basicData.operate'), width: 160, slots: { default: 'button_slot' },fixed:"left"},
{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
- {field: 'orderId', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
- {field: 'processId', width: 130, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderId', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 110 },
+ {field: 'processId', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'orderDetail.productId', title: t('order.productId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
{field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
{field: 'order.project', title: t('order.project') ,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
index 7f2cf16..cbd78d3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
@@ -76,6 +76,7 @@
if (res.code == 200) {
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
+ console.log('produceList', produceList)
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -117,8 +118,8 @@
request.post(`/processCard/detailsSelect/${id}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
-
produceList = deepClone(res.data.data)
+
xGrid.value.loadData(produceList)
gridOptions.loading = false
} else {
@@ -213,6 +214,7 @@
<div class="main-div-customer">
<vxe-grid
max-height="100%"
+ height="600px"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue
index 120fcd7..de404eb 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue
@@ -7,11 +7,17 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import userInfo from "@/stores/userInfo"
import {useI18n} from 'vue-i18n'
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
//璇█鑾峰彇
const {t} = useI18n()
const route = useRoute()
const user = userInfo()
let router = useRouter()
+
+onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+})
//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
@@ -56,8 +62,9 @@
//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
{code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
+ {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
],
// import: false,
// export: true,
@@ -92,6 +99,13 @@
switch (code) {
case 'addRow': {
$grid.insertAt({})
+ break
+ }
+ case 'removeRow': {
+ let result = toolbarButtonClickEvent()
+ if (result) {
+ $grid.remove(result.row)
+ }
break
}
case 'save': {
@@ -170,4 +184,11 @@
margin: 0 auto;
height: 100%;
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue
index 0fea024..b79e069 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue
@@ -6,12 +6,17 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import userInfo from "@/stores/userInfo"
import {useI18n} from 'vue-i18n'
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
//璇█鑾峰彇
const {t} = useI18n()
const route = useRoute()
const user = userInfo()
let router = useRouter()
+onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+})
//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
@@ -57,8 +62,9 @@
//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
{code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
+ {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
],
// import: false,
// export: true,
@@ -94,6 +100,13 @@
switch (code) {
case 'addRow': {
$grid.insertAt({})
+ break
+ }
+ case 'removeRow': {
+ let result = toolbarButtonClickEvent()
+ if (result) {
+ $grid.remove(result.row)
+ }
break
}
case 'save': {
@@ -171,4 +184,11 @@
margin: 0 auto;
height: 100%;
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue
index ed9604c..1cf136a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue
@@ -7,6 +7,7 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import userInfo from "@/stores/userInfo"
import {useI18n} from 'vue-i18n'
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
//璇█鑾峰彇
const {t} = useI18n()
const route = useRoute()
@@ -26,6 +27,11 @@
} else {
ElMessage.warning(res.msg)
}
+})
+
+onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
})
//瀛愮粍浠舵帴鏀跺弬鏁�
@@ -77,8 +83,9 @@
//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
{code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
+ {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
],
// import: false,
// export: true,
@@ -112,6 +119,13 @@
switch (code) {
case 'addRow': {
$grid.insertAt({})
+ break
+ }
+ case 'removeRow': {
+ let result = toolbarButtonClickEvent()
+ if (result) {
+ $grid.remove(result.row)
+ }
break
}
case 'save': {
@@ -193,4 +207,11 @@
width: 99%;
height: 100%;
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
index d244896..a44f8c2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
@@ -74,8 +74,8 @@
return count.toFixed(2)
}
+//棣栨鍔犺浇
request.post(`/basicDataProduce/selectBasic`).then((res) => {
-
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
titleSelectJson.value.processType = res.data.process;
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
new file mode 100644
index 0000000..68d768e
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
@@ -0,0 +1,67 @@
+package com.example.erp.controller.pp;
+
+import com.example.erp.common.Constants;
+import com.example.erp.common.Result;
+import com.example.erp.exception.ServiceException;
+import com.example.erp.service.pp.DeviceMaintenanceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+
+@Api(value="璁惧淇濆吇缁翠慨controller",tags={"璁惧淇濆吇缁翠慨鎿嶄綔鎺ュ彛"})
+@RequestMapping("/maintenance")
+public class DeviceMaintenanceController {
+ @Autowired
+ DeviceMaintenanceService deviceMaintenanceService;
+
+ @ApiOperation("璁惧鏂板鎺ュ彛")
+ @PostMapping("/saveMachine")
+ public Result saveTeamGroup( @RequestBody Map<String,Object> object){
+ if(deviceMaintenanceService.saveMachineSv(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+
+ }
+ }
+ @ApiOperation("鏌ヨ涓嬫媺妗嗘暟鎹帴鍙�")
+ @PostMapping ("/selectData")
+ public Result selectData() {
+ return Result.seccess(deviceMaintenanceService.selectDataSv());
+ }
+
+ @ApiOperation("淇濆吇缁翠慨鏂板鎺ュ彛")
+ @PostMapping("/saveMaintenanceAndRepair")
+ public Result saveMaintenanceAndRepair( @RequestBody Map<String,Object> object){
+ if(deviceMaintenanceService.saveMaintenanceAndRepairSv(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+
+ }
+ }
+
+ @ApiOperation("鏌ヨ缁翠慨淇濆吇鏁版嵁鎺ュ彛")
+ @PostMapping ("/selectMaintenance")
+ public Result selectMaintenance() {
+ return Result.seccess(deviceMaintenanceService.selectMaintenanceSv());
+ }
+
+
+ @ApiOperation("鍒犻櫎缁翠慨淇濆吇璁板綍鎺ュ彛")
+ @PostMapping("/deleteMaintenance/{id}")
+ public Result deleteMaintenance(@PathVariable String id){
+ if(deviceMaintenanceService.deleteMaintenanceSv(id)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触锛�");
+
+ }
+ }
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
index a925a63..7f18bd0 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
@@ -1,36 +1,48 @@
package com.example.erp.entity.pp;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+
@Data
public class DeviceMaintenance {
+
//鑷id
private Integer id;
//璁惧缂栧彿
private String deviceId;
+ //璁惧鍚嶇О
+ private String deviceName;
//绫诲瀷
- private Integer type;
+ private String type;
//鏁呴殰鏃ユ湡
- private LocalDate faultTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime faultTime;
//鏁呴殰鍘熷洜
private String faultReason;
//淇濆吇鏃ユ湡
- private LocalDate maintenanceTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime maintenanceTime;
//淇濆吇璇存槑
private String maintenanceIllustrate;
//缁翠慨/淇濆吇寮�濮嬫椂闂�
- private LocalDate startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startTime;
//缁翠慨/淇濆吇缁撴潫鏃堕棿
- private LocalDate stopTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime stopTime;
+ //鎵�鍦ㄥ伐搴�
+ private String process;
//缁翠慨/淇濆吇浜哄憳
private String personnel;
//璐圭敤
private String cost;
//鍒涘缓鏃堕棿
- private LocalDate createTime;
+ private LocalDateTime createTime;
//淇敼鏃堕棿
- private LocalDate updateTime;
+ private LocalDateTime updateTime;
//澶栭敭璁惧琛�
private Device device;
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
index fdcfa82..82874c7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
@@ -1,6 +1,7 @@
package com.example.erp.entity.pp;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
@@ -62,11 +63,15 @@
private LocalDate updateTime;
//澶栭敭璁㈠崟琛�
+ @TableField(select = false,exist= false)
private Order order;
//澶栭敭璁㈠崟鏄庣粏琛�
+ @TableField(select = false,exist= false)
private OrderDetail orderDetail;
//澶栭敭璁㈠崟宸ヨ壓瀹℃牳琛�
+ @TableField(select = false,exist= false)
private OrderGlassDetail orderGlassDetail;
+ @TableField(select = false,exist= false)
private Product product;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java
new file mode 100644
index 0000000..cd28f3d
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java
@@ -0,0 +1,31 @@
+package com.example.erp.mapper.pp;
+
+import com.example.erp.entity.pp.DeviceMaintenance;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DeviceMaintenanceMapper {
+
+
+ String getBasicData(String process);
+ Boolean addMachineMp(String basicId, String basicName);
+
+ List<Map<String,String>> selectProcessMp();
+
+ List<Map<String,String>> selectDeviceMp();
+
+ String getDeviceData(String deviceName);
+
+ Boolean saveMaintenanceAndRepairMp(String deviceId, String deviceName, String type, LocalDateTime faultTime,
+ String faultReason, LocalDateTime maintenanceTime, String maintenanceIllustrate,
+ LocalDateTime stopTime, LocalDateTime startTime,String process, String personnel, String cost);
+
+ List<DeviceMaintenance> selectMaintenanceMp();
+
+ Boolean deleteMaintenanceMp(String id);
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 43abc0b..1efab6e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -11,6 +11,9 @@
import java.util.List;
import java.util.Map;
+/**
+ * @author SNG-016
+ */
@Mapper
public interface FlowCardMapper extends BaseMapper<FlowCard> {
//娴佺▼鍗＄鐞嗘煡璇�
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java
index 451f221..ee17693 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java
@@ -14,7 +14,7 @@
import java.util.Map;
@Service
-@DS("sd")
+@DS("pp")
public class BasicDateProduceService {
@Autowired
private BasicDateProduceMapper basicDateProduceMapper;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
new file mode 100644
index 0000000..2a2aafe
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
@@ -0,0 +1,80 @@
+package com.example.erp.service.pp;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.entity.pp.BasicDataProduce;
+import com.example.erp.entity.pp.DeviceMaintenance;
+import com.example.erp.mapper.pp.DeviceMaintenanceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@DS("pp")
+public class DeviceMaintenanceService {
+ @Autowired
+ private DeviceMaintenanceMapper deviceMaintenanceMapper;
+
+
+ public Boolean saveMachineSv(Map<String, Object> object) {
+ List<BasicDataProduce> basicDataProduceList = JSONArray.parseArray(JSONObject.toJSONString(object.get("machine")), BasicDataProduce.class);
+ if (!basicDataProduceList.isEmpty()) {
+ for (BasicDataProduce basicDataProduce : basicDataProduceList) {
+ //鏌ヨ宸ュ簭瀵瑰簲鐨勫伐搴廼d
+ String BasicId = deviceMaintenanceMapper.getBasicData(basicDataProduce.getBasicCategory());
+ deviceMaintenanceMapper.addMachineMp(BasicId,basicDataProduce.getBasicName());
+ }
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ public Map<String, Object> selectDataSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("process", deviceMaintenanceMapper.selectProcessMp());
+ map.put("device", deviceMaintenanceMapper.selectDeviceMp());
+ return map;
+ }
+
+ public Boolean saveMaintenanceAndRepairSv(Map<String, Object> object) {
+ List<DeviceMaintenance> deviceMaintenanceList = JSONArray.parseArray(JSONObject.toJSONString(object.get("machine")), DeviceMaintenance.class);
+ if (!deviceMaintenanceList.isEmpty()) {
+ for (DeviceMaintenance deviceMaintenance : deviceMaintenanceList) {
+ //鏌ヨ璁惧瀵瑰簲鐨勮澶嘔d
+ String deviceId = deviceMaintenanceMapper.getDeviceData(deviceMaintenance.getDeviceName());
+ //娣诲姞
+ deviceMaintenanceMapper.saveMaintenanceAndRepairMp(deviceId,deviceMaintenance.getDeviceName(),
+ deviceMaintenance.getType(),deviceMaintenance.getFaultTime(),deviceMaintenance.getFaultReason(),
+ deviceMaintenance.getMaintenanceTime(),deviceMaintenance.getMaintenanceIllustrate(),
+ deviceMaintenance.getStopTime(),deviceMaintenance.getStartTime(),deviceMaintenance.getProcess(),
+ deviceMaintenance.getPersonnel(),
+ deviceMaintenance.getCost()
+ );
+ }
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ public Map<String, Object> selectMaintenanceSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", deviceMaintenanceMapper.selectMaintenanceMp());
+ return map;
+ }
+
+ public Boolean deleteMaintenanceSv(String id) {
+ if (!id.isEmpty()) {
+
+ return deviceMaintenanceMapper.deleteMaintenanceMp(id);
+ } else {
+
+ return false;
+ }
+ }
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index 3e43562..73c8648 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -24,7 +24,6 @@
//鏌ヨ宸ュ崟
public Map<String, Object> defaultDateWork(Date selectTime1, Date selectTime2, Integer state, OrderGlassDetail orderGlassDetail) {
Map<String, Object> map = new HashMap<>();
- // System.out.println(workOrderMapper.selectWordOrder( selectTime1,selectTime2,state, orderGlassDetail));
if (state == 1) {
map.put("data", workOrderMapper.selectWordOrder(selectTime1, selectTime2, orderGlassDetail));
} else {
@@ -55,38 +54,34 @@
String productIdVl = "";
//灏嗘帴鏀跺埌鐨勪俊鎭В鏋愭垚list
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderdetail")), OrderDetail.class);
- String orderID = orderDetaillist.get(0).getOrderId();
+ String orderId = orderDetaillist.get(0).getOrderId();
- if (!orderDetaillist.isEmpty()) {
- for (OrderDetail orderDetail : orderDetaillist) {
- //鐢熸垚鐢熶骇璁㈠崟鍙�
- for (int i = 0; i < count; i++) {
- letters = lettr++;
- productIdVl = orderID + letters;
- //鏌ヨ鐢熸垚鐨勭敓浜ц鍗曞彿鏄惁瀛樺湪
- Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
- if (workCount < 1) {
- break;
- }
+ for (OrderDetail orderDetail : orderDetaillist) {
+ //鐢熸垚鐢熶骇璁㈠崟鍙�
+ for (int i = 0; i < count; i++) {
+ letters = lettr++;
+ productIdVl = orderId + letters;
+ //鏌ヨ鐢熸垚鐨勭敓浜ц鍗曞彿鏄惁瀛樺湪
+ Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
+ if (workCount < 1) {
+ break;
+ }
- }
- //娣诲姞鐢熶骇璁㈠崟
- workOrderMapper.addOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName);
- Integer State = 2;
- Integer States = 1;
- //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
- Integer NoWorkCount = workOrderMapper.selectWorkCount(orderDetail.getOrderId());
- if (NoWorkCount == 0) {
- //鏉℃暟涓�0淇敼杞敓浜ц鍗曠姸鎬佷负2锛屽惁鍒欎负1
- workOrderMapper.updateWorkType(orderDetail.getOrderId(), State);
- } else {
- workOrderMapper.updateWorkType(orderDetail.getOrderId(), States);
- }
}
- return true;
- } else {
- return false;
+ //娣诲姞鐢熶骇璁㈠崟
+ workOrderMapper.addOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName);
+ Integer state = 2;
+ Integer states = 1;
+ //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
+ Integer noWorkCount = workOrderMapper.selectWorkCount(orderDetail.getOrderId());
+ if (noWorkCount == 0) {
+ //鏉℃暟涓�0淇敼杞敓浜ц鍗曠姸鎬佷负2锛屽惁鍒欎负1
+ workOrderMapper.updateWorkType(orderDetail.getOrderId(), state);
+ } else {
+ workOrderMapper.updateWorkType(orderDetail.getOrderId(), states);
+ }
}
+ return true;
}
@@ -95,16 +90,16 @@
if (!orderId.isEmpty() && !productName.isEmpty()) {
//鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿
workOrderMapper.deleteOrderWorkMp(orderId, productName);
- Integer State = 0;
- Integer States = 1;
+ Integer state = 0;
+ Integer states = 1;
//鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
- Integer NoWorkCount = workOrderMapper.selectWorkCount(orderId);
+ Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
//鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
- Integer YesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
- if (NoWorkCount == YesWorkCount) {
- workOrderMapper.updateWorkType(orderId, State);
+ Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
+ if (noWorkCount == yesWorkCount) {
+ workOrderMapper.updateWorkType(orderId, state);
} else {
- workOrderMapper.updateWorkType(orderId, States);
+ workOrderMapper.updateWorkType(orderId, states);
}
return true;
} else {
diff --git a/north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml b/north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml
new file mode 100644
index 0000000..bce9660
--- /dev/null
+++ b/north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.mapper.pp.DeviceMaintenanceMapper">
+ <resultMap id="DeviceMaintenanceMapper" type="com.example.erp.entity.pp.DeviceMaintenance">
+ <id column="id" property="id"/>
+ <result column="device_id" property="deviceId"/>
+ <result column="type" property="type"/>
+ <result column="fault_time" property="faultTime"/>
+ <result column="fault_reason" property="faultReason"/>
+ <result column="maintenance_time" property="maintenanceTime"/>
+ <result column="maintenance_illustrate" property="maintenanceIllustrate"/>
+ <result column="start_time" property="startTime"/>
+ <result column="stop_time" property="stopTime"/>
+ <result column="personnel" property="personnel"/>
+ <result column="cost" property="cost"/>
+
+
+ </resultMap>
+ <select id="getBasicData">
+ select id
+ from sd.basic_data
+ where basic_category = 'process'
+ and basic_name = #{process}
+ </select>
+
+<insert id="addMachineMp">
+ insert into pp.basic_data_produce(basic_type,basic_name,basic_category,create_time)
+ values('device',#{basicName},#{basicId},now())
+</insert>
+
+ <select id="selectProcessMp">
+ select * from sd.basic_data where basic_type='product' and basic_category='process'
+ </select>
+
+ <select id="selectDeviceMp">
+ SELECT
+ bdp.id,
+ bdp.basic_type,
+ bdp.basic_name,
+ bd.basic_name AS basic_category
+ FROM
+ sd.basic_data AS bd
+ LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
+ WHERE
+ bd.basic_category = 'process'
+ AND bdp.basic_type = 'device'
+ </select>
+
+ <select id="getDeviceData">
+ select id
+ from basic_data_produce
+ where basic_type = 'device'
+ and basic_name = #{deviceName}
+ </select>
+
+ <insert id="saveMaintenanceAndRepairMp">
+ insert into device_maintenance(device_id,device_name,type,fault_time,fault_reason,maintenance_time,
+ maintenance_illustrate,start_time,stop_time,process,personnel,cost,create_time)
+ values (#{deviceId},#{deviceName},#{type},#{faultTime},#{faultReason},#{maintenanceTime},
+ #{maintenanceIllustrate},#{stopTime},#{startTime},#{process},#{personnel},#{cost},now())
+ </insert>
+
+ <select id="selectMaintenanceMp" resultMap="DeviceMaintenanceMapper">
+ select * from device_maintenance
+ </select>
+
+ <delete id="deleteMaintenanceMp">
+ delete from device_maintenance where id = #{id}
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index dd4a3a8..3d6aeab 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -61,7 +61,7 @@
sum(c.compute_gross_area) as compute_gross_area,
a.founder,
c.processing_note,
- if(a.layout_status=0,"涓嶅彲鎺掔増",if(a.layout_status=1,"鍙帓鐗�","宸叉帓鐗�")) as layout_status
+ if(a.layout_status=0,'涓嶅彲鎺掔増',if(a.layout_status=1,'鍙帓鐗�','宸叉帓鐗�')) as layout_status
from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time from flow_card group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id
left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
where a.create_time between #{selectTime1} and #{selectTime2}
diff --git a/north-glass-erp/target/classes/mapper/pp/DeviceMaintenance.xml b/north-glass-erp/target/classes/mapper/pp/DeviceMaintenance.xml
new file mode 100644
index 0000000..bce9660
--- /dev/null
+++ b/north-glass-erp/target/classes/mapper/pp/DeviceMaintenance.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.mapper.pp.DeviceMaintenanceMapper">
+ <resultMap id="DeviceMaintenanceMapper" type="com.example.erp.entity.pp.DeviceMaintenance">
+ <id column="id" property="id"/>
+ <result column="device_id" property="deviceId"/>
+ <result column="type" property="type"/>
+ <result column="fault_time" property="faultTime"/>
+ <result column="fault_reason" property="faultReason"/>
+ <result column="maintenance_time" property="maintenanceTime"/>
+ <result column="maintenance_illustrate" property="maintenanceIllustrate"/>
+ <result column="start_time" property="startTime"/>
+ <result column="stop_time" property="stopTime"/>
+ <result column="personnel" property="personnel"/>
+ <result column="cost" property="cost"/>
+
+
+ </resultMap>
+ <select id="getBasicData">
+ select id
+ from sd.basic_data
+ where basic_category = 'process'
+ and basic_name = #{process}
+ </select>
+
+<insert id="addMachineMp">
+ insert into pp.basic_data_produce(basic_type,basic_name,basic_category,create_time)
+ values('device',#{basicName},#{basicId},now())
+</insert>
+
+ <select id="selectProcessMp">
+ select * from sd.basic_data where basic_type='product' and basic_category='process'
+ </select>
+
+ <select id="selectDeviceMp">
+ SELECT
+ bdp.id,
+ bdp.basic_type,
+ bdp.basic_name,
+ bd.basic_name AS basic_category
+ FROM
+ sd.basic_data AS bd
+ LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
+ WHERE
+ bd.basic_category = 'process'
+ AND bdp.basic_type = 'device'
+ </select>
+
+ <select id="getDeviceData">
+ select id
+ from basic_data_produce
+ where basic_type = 'device'
+ and basic_name = #{deviceName}
+ </select>
+
+ <insert id="saveMaintenanceAndRepairMp">
+ insert into device_maintenance(device_id,device_name,type,fault_time,fault_reason,maintenance_time,
+ maintenance_illustrate,start_time,stop_time,process,personnel,cost,create_time)
+ values (#{deviceId},#{deviceName},#{type},#{faultTime},#{faultReason},#{maintenanceTime},
+ #{maintenanceIllustrate},#{stopTime},#{startTime},#{process},#{personnel},#{cost},now())
+ </insert>
+
+ <select id="selectMaintenanceMp" resultMap="DeviceMaintenanceMapper">
+ select * from device_maintenance
+ </select>
+
+ <delete id="deleteMaintenanceMp">
+ delete from device_maintenance where id = #{id}
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
index dd4a3a8..3d6aeab 100644
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
@@ -61,7 +61,7 @@
sum(c.compute_gross_area) as compute_gross_area,
a.founder,
c.processing_note,
- if(a.layout_status=0,"涓嶅彲鎺掔増",if(a.layout_status=1,"鍙帓鐗�","宸叉帓鐗�")) as layout_status
+ if(a.layout_status=0,'涓嶅彲鎺掔増',if(a.layout_status=1,'鍙帓鐗�','宸叉帓鐗�')) as layout_status
from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time from flow_card group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id
left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
where a.create_time between #{selectTime1} and #{selectTime2}
diff --git a/north-glass-erp/target/classes/mapper/pp/Report.xml b/north-glass-erp/target/classes/mapper/pp/Report.xml
index 70dfae6..e984782 100644
--- a/north-glass-erp/target/classes/mapper/pp/Report.xml
+++ b/north-glass-erp/target/classes/mapper/pp/Report.xml
@@ -63,7 +63,11 @@
e.reportWorkQuantityCount,
e.broken_num,
round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
+<<<<<<< HEAD
+=======
+
+>>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7
from
flow_card as c
left join
@@ -96,8 +100,14 @@
) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
+<<<<<<< HEAD
where a.order_id = #{orderId}
+=======
+
+ where a.order_id = #{orderId}
+
+>>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0