From ad03e69a942f88e8c7d0c4002532a6ec18360f4e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 09 五月 2024 11:14:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 11
north-glass-erp/src/main/java/com/example/erp/service/userInfo/RoleService.java | 6
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java | 33
north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue | 370 +++++++---
north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionBasic.java | 3
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionRoleController.java | 34 +
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 19
north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml | 16
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java | 21
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java | 20
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 204 ++++++
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 400 +++++++----
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 8
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserRoleController.java | 7
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 27
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java | 14
north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionBasicMapper.java | 6
north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java | 6
north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue | 112 ++
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java | 14
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 39
north-glass-erp/northglass-erp/src/views/pp/report/Report.vue | 12
north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java | 18
north-glass-erp/src/main/java/com/example/erp/entity/userInfo/SysMenuItem.java | 1
north-glass-erp/northglass-erp/src/layout/MainErpView.vue | 2
north-glass-erp/northglass-erp/src/views/system/user/NotPermission.vue | 0
north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml | 16
north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue | 267 ++++--
north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java | 2
north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml | 54 +
north-glass-erp/src/main/java/com/example/erp/entity/pp/Report.java | 60 +
north-glass-erp/target/classes/mapper/pp/Report.xml | 204 ++++++
32 files changed, 1,576 insertions(+), 430 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
index 650259f..1271591 100644
--- a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
+++ b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
@@ -21,7 +21,7 @@
switch (newVal){
case 401:{
if(userStore.msg.split('.')[1] === 'search'){
- router.push({path:'/main/order/notPermission'});
+ router.push({path:'/main/user/notPermission'});
}else{
ElMessage.warning(t('error.Code_401'))
}
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 1a0f6b0..9fef966 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -28,6 +28,11 @@
component: () => import('../views/system/user/User.vue'),
children:[
{
+ path: 'notPermission',
+ name: 'notPermission',
+ component: () => import('../views/system/user/NotPermission.vue'),
+ },
+ {
path: 'userList',
name: 'userList',
component: () => import('../views/system/user/UserList.vue')
@@ -117,11 +122,7 @@
name: 'order',
component: () => import('../views/sd/order/Order.vue'),
children:[
- {
- path: 'notPermission',
- name: 'notPermission',
- component: () => import('../views/sd/order/NotPermission.vue'),
- },
+
{
path: 'selectOrder',
name: 'selectOrder',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
index 556f38a..5f98653 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -1,25 +1,25 @@
<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 {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+let filterData = ref({})
+//鎻愪氦鐨勮〃鍗�
+const form = reactive({
+ date1: '',
+ orderId: '',
+ project: ''
+})
+
+//宸ュ簭
+const value = ref('纾ㄨ竟')
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -30,27 +30,187 @@
return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+ // 鍐呭楂樺害
+ scrollTop.value = row.$event.target.scrollTop
+ scrollHeight.value = row.$event.target.scrollHeight
+ clientHeight.value = row.$event.target.clientHeight
+}
+
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = ref(1)
+let pageState = null
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+ return [start, end]
+}
+
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1 = getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let selectProcesses = value.value
+let inputVal = form.orderId
+if (inputVal == '') {
+ inputVal = null
+}
+let inputProject = form.project
+if (inputProject == '') {
+ inputProject = null
+}
+let total = reactive({
+ pageTotal: 0,
+ dataTotal: 0,
+ pageSize: 100
+})
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+})
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/report/selectProcessToBeCompleted/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ // total.dataTotal = res.data.total.total*1
+ // total.pageTotal= res.data.total.pageTotal
+ // pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ titleSelectJson.value.processType = res.data.process
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = () => {
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let inputVal = form.orderId
+ if (inputVal == '') {
+ inputVal = null
+ }
+
+ request.post(`/report/selectProcessToBeCompleted/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let selectProcesses = value.value
+ let inputVal = form.orderId
+ if (inputVal == '') {
+ inputVal = null
+ }
+ let inputProject = form.project
+ if (inputProject == '') {
+ inputProject = null
+ }
+ request.post(`/report/selectProcessToBeCompleted/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ // total.dataTotal = res.data.total.total*1
+ // total.pageTotal= res.data.total.pageTotal
+ // pageTotal.value = res.data.total
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({currentPage, pageSize}) => {
+ pageNum.value = currentPage
+ total.pageTotal = pageSize
+ selectPageList()
+}
+
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+// const changeFilterEvent = (event, option, $panel,) => {
+// // 鎵嬪姩瑙﹀彂绛涢��
+// $panel.changeOption(event, !!option.data, option)
+// }
+
+// function filterChanged(column){
+// //gridOptions.loading=true
+// //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+// let value = column.datas[0]!=undefined?column.datas[0]:''
+// value = value.trim()
+// //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+// if (column.property.indexOf('.')>-1){
+// const columnArr = column.property.split('.')
+// filterData.value[columnArr[0]] = {
+// [columnArr[1]]:value
+// }
+// }else{
+// filterData.value[column.property] = value
+// }
+//
+// gridOptions.loading = true
+//
+// }
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+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: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
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,14 +220,53 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: '1', title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: '2', title: '鍗曠墖鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '3',title: '鏈畬鏁�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '4', title: '鏈畬闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {field: 'create_time', width: 120, title: '涓嬪崟鏃堕棿'},
+ {field: 'delivery_date', width: 120, title: '浜よ揣鏃ユ湡'},
+ {
+ field: 'order_id', width: 120, title: '閿�鍞崟鍙�', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'process_id',
+ width: 120,
+ title: '娴佺▼鍗″彿',
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'customer_name', width: 130, title: '瀹㈡埛鍚嶇О', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'project', width: 120, title: '椤圭洰鍚嶇О', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'batch', width: 100, title: '鎵规', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'order_number', width: 100, title: '搴忓彿'},
+ {field: 'technology_number', width: 120, title: '灏忕墖椤哄簭', showOverflow: "ellipsis"},
+ {field: 'glass_child', width: 100, title: '鍗曠墖鍚嶇О'},
+ {field: 'child_width', width: 120, title: '瀹�'},
+ {field: 'child_height', width: 120, title: '楂�'},
+ {field: 'quantity', width: 120, title: '璁㈠崟鏁伴噺'},
+ {field: 'childArea', width: 120, title: '鍗曠墖闈㈢Н'},
+ {field: 'actualArea', width: 120, title: '瀹為檯闈㈢Н'},
+ {field: 'completeNum', width: 120, title: '宸插畬鎴愭暟閲�'},
+ {field: 'completeArea', width: 120, title: '宸插畬鎴愰潰绉�'},
+ {field: 'incompleteNum', width: 120, title: '鏈畬鎴愭暟閲�'},
+ {field: 'incompleteArea', width: 120, title: '鏈畬鎴愰潰绉�'},
+ {field: 'product_name', width: 120, title: '鎴愬搧鍚嶇О'},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -80,36 +279,11 @@
zoom: true,
custom: true
},
- data: [
- {
- 1:'鏂板畨鍖楃幓浜т笟鍥�',
- 2:'19mm瓒呯櫧骞抽挗',
- 3:'1',
- 4:'3.11',
- },
- {
- 1:'鏂板畨鍖楃幓浜т笟鍥�',
- 2:'19mm瓒呯櫧骞抽挗',
- 3:'1',
- 4:'3.11',
- },
- {
- 1:'鏂板畨鍖楃幓浜т笟鍥�',
- 2:'19mm瓒呯櫧骞抽挗',
- 3:'1',
- 4:'3.11',
- },
- {
- 1:'鏂板畨鍖楃幓浜т笟鍥�',
- 2:'19mm瓒呯櫧骞抽挗',
- 3:'1',
- 4:'3.11',
- },
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['finishedNumber','finishedArea','wornNumber','wornArea']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '鍚堣:'
@@ -124,33 +298,6 @@
})
-const value = ref('')
-const options = [
- {
- value: 'Option1',
- label: 'Option1',
- },
- {
- value: 'Option2',
- label: 'Option2',
- },
- {
- value: 'Option3',
- label: 'Option3',
- },
-]
-
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
-
-})
</script>
@@ -163,30 +310,34 @@
<el-date-picker
v-model="form.date1"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
- :default-time="defaultTime"
+ format="YYYY/MM/DD"
+ start-placeholder="寮�濮嬫椂闂�"
style="width: 100px"
+ type="daterange"
+ value-format="YYYY-MM-DD"
/>
- <el-select v-model="value" class="m-2" placeholder="鏌ヨ绫诲瀷">
+ <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 130px"></el-input>
+
+ <el-input v-model="form.project" clearable placeholder="椤圭洰鍚嶇О" style="width: 130px"></el-input>
+
+ <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.basic_name"
+ :value="item.basic_name"
/>
</el-select>
- <el-button type="primary">鏌ヨ</el-button>
+ <el-button type="primary" @click="getWorkOrder">鏌ヨ</el-button>
</el-row>
</div>
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ max-height="100%"
v-bind="gridOptions"
>
@@ -194,8 +345,8 @@
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
<ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{item.title+': '}}</span>
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
<span>{{ row[item.field] }}</span>
</li>
</ul>
@@ -203,15 +354,15 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'setType')" 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="getTableRow(row,'edit')">缂栬緫</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'setType')">鍙嶅</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="type" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -222,10 +373,11 @@
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
}
+
#selectForm {
width: 60%;
text-align: center;
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
index c039857..8443a61 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
@@ -2,24 +2,15 @@
import {reactive, ref} from "vue";
import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElMessage} from "element-plus";
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
- }
- }
-}
+//鎻愪氦鐨勮〃鍗�
+const form = reactive({
+ date1: '',
+ orderId: ''
+})
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -30,8 +21,165 @@
return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+ // 鍐呭楂樺害
+ scrollTop.value = row.$event.target.scrollTop
+ scrollHeight.value = row.$event.target.scrollHeight
+ clientHeight.value = row.$event.target.clientHeight
+}
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum=ref(1)
+let pageState = null
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+ const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0,10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ const end = new Date(new Date().getTime()+3600 * 1000 * 24)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+ return [start, end]
+}
+
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1=getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let inputVal = form.orderId
+if (inputVal == '') {
+ inputVal = null
+}
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = ()=>{
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let inputVal = form.orderId
+ if (inputVal == '') {
+ inputVal = null
+ }
+ request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`,filterData.value).then((res) => {
+ if(res.code==200){
+
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let inputVal = form.orderId
+ if (inputVal == '') {
+ inputVal = null
+ }
+ request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ pageTotal.value = res.data.total
+ xGrid.value.loadData(res.data.data)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+ pageNum.value=currentPage
+ total.pageTotal = pageSize
+ selectPageList()
+}
+
+
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+const changeFilterEvent = (event, option, $panel,) => {
+ // 鎵嬪姩瑙﹀彂绛涢��
+ $panel.changeOption(event, !!option.data, option)
+}
+
+function filterChanged(column) {
+ gridOptions.loading = true
+ //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+ let value = column.datas[0] != undefined ? column.datas[0] : ''
+ value = value.trim()
+ //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+ if (column.property.indexOf('.') > -1) {
+ const columnArr = column.property.split('.')
+ filterData.value[columnArr[0]] = {
+ [columnArr[1]]: value
+ }
+ } else {
+ filterData.value[column.property] = value
+ }
+
+//鑾峰彇閫変腑鏃堕棿
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+
+ request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
+ if(res.code==200){
+ pageTotal.value=res.data.total
+ total.pageTotal=parseInt(res.data.total)
+ pageNum.value=1
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -87,62 +235,6 @@
custom: true
},
data: [
- {
- 1:'姝︽眽瀹夐摥鍗庝鲸鍩�',
- 2:'23绗�1鎵�',
- 3:'N0231210',
- 4:'骞抽挗',
- 5:'10mm瓒呯櫧UD60',
- 6:'灞变笢鍏ㄥ搧',
- 7:'3360',
- 8:'4567',
- 9:'6',
- 10:'22.76',
- 11:'2023-10-22',
-
- },
- {
- 1:'姝︽眽瀹夐摥鍗庝鲸鍩�',
- 2:'23绗�1鎵�',
- 3:'N0231210',
- 4:'骞抽挗',
- 5:'10mm瓒呯櫧UD60',
- 6:'灞变笢鍏ㄥ搧',
- 7:'3360',
- 8:'4567',
- 9:'6',
- 10:'22.76',
- 11:'2023-10-22',
-
- },
- {
- 1:'姝︽眽瀹夐摥鍗庝鲸鍩�',
- 2:'23绗�1鎵�',
- 3:'N0231210',
- 4:'骞抽挗',
- 5:'10mm瓒呯櫧UD60',
- 6:'灞变笢鍏ㄥ搧',
- 7:'3360',
- 8:'4567',
- 9:'6',
- 10:'22.76',
- 11:'2023-10-22',
-
- },
- {
- 1:'姝︽眽瀹夐摥鍗庝鲸鍩�',
- 2:'23绗�1鎵�',
- 3:'N0231210',
- 4:'骞抽挗',
- 5:'10mm瓒呯櫧UD60',
- 6:'灞变笢鍏ㄥ搧',
- 7:'3360',
- 8:'4567',
- 9:'6',
- 10:'22.76',
- 11:'2023-10-22',
-
- },
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
@@ -162,33 +254,6 @@
})
-const value = ref('')
-const options = [
- {
- value: 'Option1',
- label: 'Option1',
- },
- {
- value: 'Option2',
- label: 'Option2',
- },
- {
- value: 'Option3',
- label: 'Option3',
- },
-]
-
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
-
-})
</script>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
index 9399229..16e9974 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
@@ -52,11 +52,11 @@
<el-menu-item index="/main/report/ProcessCardProgress">娴佺▼鍗¤繘搴�</el-menu-item>
<el-menu-item index="/main/report/OrderPlanDecomposition">璁㈠崟璁″垝鍒嗚В</el-menu-item>
</el-sub-menu>
- <el-sub-menu index="2" popper-class="test">
- <template #title>浜ч噺鎶ヨ〃</template>
- <el-menu-item index="/main/report/TeamOutput">鐝粍浜ч噺</el-menu-item>
- <el-menu-item index="/main/report/EquipmentOutput">璁惧浜ч噺</el-menu-item>
- </el-sub-menu>
+<!-- <el-sub-menu index="2" popper-class="test">-->
+<!-- <template #title>浜ч噺鎶ヨ〃</template>-->
+<!-- <el-menu-item index="/main/report/TeamOutput">鐝粍浜ч噺</el-menu-item>-->
+<!-- <el-menu-item index="/main/report/EquipmentOutput">璁惧浜ч噺</el-menu-item>-->
+<!-- </el-sub-menu>-->
<el-sub-menu index="3" popper-class="test">
<template #title>娆＄牬鎶ヨ〃</template>
<el-menu-item index="/main/report/DamageReport">娆＄牬鎶ヨ〃</el-menu-item>
@@ -68,7 +68,7 @@
<el-menu-item index="/main/report/RawMaterialRequisition">鍘熺墖棰嗘枡</el-menu-item>
<el-menu-item index="/main/report/QualityReport">鍝佽川鎶ヨ〃</el-menu-item>
<el-menu-item index="/main/report/Yield">鎴愬搧鐜囨姤琛�</el-menu-item>
- <el-menu-item index="/main/report/OrderBOMOutside">BOM鎶ヨ〃</el-menu-item>
+<!-- <el-menu-item index="/main/report/OrderBOMOutside">BOM鎶ヨ〃</el-menu-item>-->
</el-menu>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index 2c01ce5..cb15553 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -1,8 +1,25 @@
<script setup>
import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+let filterData = ref({})
+//鎻愪氦鐨勮〃鍗�
+const form = reactive({
+ date1: '',
+ orderId: '',
+ project: ''
+})
+
+//宸ュ簭
+const value = ref('纾ㄨ竟')
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -13,27 +30,190 @@
return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+ // 鍐呭楂樺害
+ scrollTop.value = row.$event.target.scrollTop
+ scrollHeight.value = row.$event.target.scrollHeight
+ clientHeight.value = row.$event.target.clientHeight
+}
+
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = ref(1)
+let pageState = null
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+ return [start, end]
+}
+
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1 = getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let selectProcesses = value.value
+let inputVal = form.orderId
+if (inputVal == '') {
+ inputVal = null
+}
+let inputProject = form.project
+if (inputProject == '') {
+ inputProject = null
+}
+let total = reactive({
+ pageTotal: 0,
+ dataTotal: 0,
+ pageSize: 100
+})
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+})
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/report/workInProgress/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ // total.dataTotal = res.data.total.total*1
+ // total.pageTotal= res.data.total.pageTotal
+ // pageTotal.value = res.data.total
+ console.log(res.data.data)
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ titleSelectJson.value.processType = res.data.process
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = () => {
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let inputVal = form.orderId
+ if (inputVal == '') {
+ inputVal = null
+ }
+
+ request.post(`/report/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let selectProcesses = value.value
+ let inputVal = form.orderId
+ if (inputVal == '') {
+ inputVal = null
+ }
+ let inputProject = form.project
+ if (inputProject == '') {
+ inputProject = null
+ }
+ console.log(startTime, endTime)
+ request.post(`/report/workInProgress/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ // total.dataTotal = res.data.total.total*1
+ // total.pageTotal= res.data.total.pageTotal
+ // pageTotal.value = res.data.total
+ console.log(res.data.data)
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({currentPage, pageSize}) => {
+ pageNum.value = currentPage
+ total.pageTotal = pageSize
+ selectPageList()
+}
+
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+// const changeFilterEvent = (event, option, $panel,) => {
+// // 鎵嬪姩瑙﹀彂绛涢��
+// $panel.changeOption(event, !!option.data, option)
+// }
+
+// function filterChanged(column){
+// //gridOptions.loading=true
+// //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+// let value = column.datas[0]!=undefined?column.datas[0]:''
+// value = value.trim()
+// //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+// if (column.property.indexOf('.')>-1){
+// const columnArr = column.property.split('.')
+// filterData.value[columnArr[0]] = {
+// [columnArr[1]]:value
+// }
+// }else{
+// filterData.value[column.property] = value
+// }
+//
+// gridOptions.loading = true
+//
+// }
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+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: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
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
@@ -43,26 +223,49 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: '1', width: 120, title: '宸ュ簭',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: '2',width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '3', width: 130,title: '瀹㈡埛鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '4',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5', width: 100,title: '鎵规', sortable: true,showOverflow:"ellipsis"},
- {field: '6', width: 100,title: '搴忓彿', sortable: true},
- {field: '7',width: 100, title: '褰㈢姸', sortable: true},
- {field: '8',width: 120, title: '妤煎眰缂栧彿', sortable: true,showOverflow:"ellipsis"},
- {field: '9', width: 120,title: '宸ヨ壓娴佺▼', sortable: true},
- {field: '10', width: 120,title: '璁㈠崟鏁�', sortable: true},
- {field: '11',width: 120, title: '瀹�', sortable: true},
- {field: '12',width: 120, title: '楂�', sortable: true},
- {field: '13',width: 120, title: '搴撳瓨鏁�', sortable: true},
- {field: '14',width: 120, title: '搴撳瓨闈㈢Н', sortable: true},
- {field: '15',width: 120, title: '鎴愬搧鍚嶇О', sortable: true},
- {field: '16',width: 120, title: '鍦ㄥ埗鍝佸悕绉�', sortable: true},
- {field: '17',width: 120, title: '寮挗鍗婂緞', sortable: true},
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {
+ field: 'thisProcess', width: 120, title: '宸ュ簭', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'process_id',
+ width: 120,
+ title: '娴佺▼鍗″彿',
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'customer_name', width: 130, title: '瀹㈡埛鍚嶇О', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'project', width: 120, title: '椤圭洰鍚嶇О', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'batch', width: 100, title: '鎵规', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'order_number', width: 100, title: '搴忓彿'},
+ {field: 'technology_number', width: 120, title: '灏忕墖椤哄簭', showOverflow: "ellipsis"},
+ {field: 'shape', width: 100, title: '褰㈢姸'},
+ {field: 'process', width: 120, title: '宸ヨ壓娴佺▼'},
+ {field: 'quantity', width: 120, title: '璁㈠崟鏁�'},
+ {field: 'child_width', width: 120, title: '瀹�'},
+ {field: 'child_height', width: 120, title: '楂�'},
+ {field: 'stockNum', width: 120, title: '搴撳瓨鏁�'},
+ {field: 'stockArea', width: 120, title: '搴撳瓨闈㈢Н'},
+ {field: 'product_name', width: 120, title: '鎴愬搧鍚嶇О'},
+ {field: 'bend_radius', width: 120, title: '寮挗鍗婂緞'},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -75,72 +278,11 @@
zoom: true,
custom: true
},
- data: [
- {
- 1:'纾ㄨ竟',
- 2:'NG22091906A02/1',
- 3:'涓浗寤虹瓚瑁呴グ闆嗗洟鏈夐檺鍏徃',
- 4:'閾跺窛缁垮湴涓績鍗楀(25鎵�2)',
- 5:'25鎵�2',
- 6:'褰㈢姸',
- 7:'2',
- 8:'25-BL19',
- 9:'鍒囧壊->闀�鑶�->纾ㄨ竟->閽㈠寲->鍖呰',
- 10:'40',
- 11:'1345',
- 12:'1556',
- 13:'1',
- 14:'1.99',
- 15:'8mm瓒呯櫧銆怢YTM-46銆戝钩閽�',
- 16:'8mm瓒呯櫧銆怢YTM-46銆戝钩閽�',
- 17:'0',
-
- },
- {
- 1:'纾ㄨ竟',
- 2:'NG22091906A02/1',
- 3:'涓浗寤虹瓚瑁呴グ闆嗗洟鏈夐檺鍏徃',
- 4:'閾跺窛缁垮湴涓績鍗楀(25鎵�2)',
- 5:'25鎵�2',
- 6:'褰㈢姸',
- 7:'2',
- 8:'25-BL19',
- 9:'鍒囧壊->闀�鑶�->纾ㄨ竟->閽㈠寲->鍖呰',
- 10:'40',
- 11:'1345',
- 12:'1556',
- 13:'1',
- 14:'1.99',
- 15:'8mm瓒呯櫧銆怢YTM-46銆戝钩閽�',
- 16:'8mm瓒呯櫧銆怢YTM-46銆戝钩閽�',
- 17:'0',
-
- },
- {
- 1:'纾ㄨ竟',
- 2:'NG22091906A02/1',
- 3:'涓浗寤虹瓚瑁呴グ闆嗗洟鏈夐檺鍏徃',
- 4:'閾跺窛缁垮湴涓績鍗楀(25鎵�2)',
- 5:'25鎵�2',
- 6:'褰㈢姸',
- 7:'2',
- 8:'25-BL19',
- 9:'鍒囧壊->闀�鑶�->纾ㄨ竟->閽㈠寲->鍖呰',
- 10:'40',
- 11:'1345',
- 12:'1556',
- 13:'1',
- 14:'1.99',
- 15:'8mm瓒呯櫧銆怢YTM-46銆戝钩閽�',
- 16:'8mm瓒呯櫧銆怢YTM-46銆戝钩閽�',
- 17:'0',
-
- },
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['finishedNumber','finishedArea','wornNumber','wornArea']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '鍚堣:'
@@ -155,33 +297,6 @@
})
-const value = ref('')
-const options = [
- {
- value: 'Option1',
- label: 'Option1',
- },
- {
- value: 'Option2',
- label: 'Option2',
- },
- {
- value: 'Option3',
- label: 'Option3',
- },
-]
-
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
-
-})
</script>
@@ -194,30 +309,34 @@
<el-date-picker
v-model="form.date1"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
- :default-time="defaultTime"
+ format="YYYY/MM/DD"
+ start-placeholder="寮�濮嬫椂闂�"
style="width: 100px"
+ type="daterange"
+ value-format="YYYY-MM-DD"
/>
- <el-select v-model="value" class="m-2" placeholder="鏌ヨ绫诲瀷">
+ <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 130px"></el-input>
+
+ <el-input v-model="form.project" clearable placeholder="椤圭洰鍚嶇О" style="width: 130px"></el-input>
+
+ <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.basic_name"
+ :value="item.basic_name"
/>
</el-select>
- <el-button type="primary">鏌ヨ</el-button>
+ <el-button type="primary" @click="getWorkOrder">鏌ヨ</el-button>
</el-row>
</div>
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ max-height="100%"
v-bind="gridOptions"
>
@@ -225,8 +344,8 @@
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
<ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{item.title+': '}}</span>
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
<span>{{ row[item.field] }}</span>
</li>
</ul>
@@ -234,15 +353,15 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'setType')" 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="getTableRow(row,'edit')">缂栬緫</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'setType')">鍙嶅</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="type" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -253,10 +372,11 @@
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
}
+
#selectForm {
width: 60%;
text-align: center;
diff --git a/north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue b/north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
index 9866f6d..2741a9a 100644
--- a/north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
+++ b/north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
@@ -4,13 +4,17 @@
import request from "@/utils/request"
import {useRouter,useRoute} from "vue-router"
import {useI18n} from "vue-i18n"
+import i18n from "@/lang/index"
+const lang = i18n.global.locale.value
import {ElMessage, ElMessageBox} from "element-plus"
const { t } = useI18n()
const router = useRouter()
const route = useRoute()
const dialogVisible = ref(false)
-let selectValue = ref(null)
-let options = ref([])
+let selectValue = ref([null,null])
+let options = ref(null)
+let checkId = ref(null)
+
const xGrid = ref()
const gridOptions = reactive({
@@ -51,6 +55,10 @@
buttons: [
],
+ slots:{
+ buttons: "role_add"
+
+ },
zoom: true,
custom: true
},
@@ -79,6 +87,9 @@
customConfig: {
storage: true
},
+ checkboxConfig: {
+ checkField:'checked',
+ },
editConfig: {
trigger: 'click',
mode: 'row',
@@ -92,12 +103,13 @@
//琛ㄥご鎸夐挳
toolbarConfig: {
- buttons: [
-
- ],
slots:{
- buttons: "toolbar_buttons"
+ buttons: "toolbar_buttons",
+ tools:'save_buttons'
+
},
+ buttons: [
+ ],
zoom: true,
custom: true
},
@@ -122,7 +134,11 @@
let columnsP = [
{ type: 'seq', width: 60 },
- { type: 'checkbox', width: 50 }
+ { type: 'checkbox',
+ width: 50 ,
+ field:"checked",
+
+ }
]
const columnNameP = {
id: 'ID',
@@ -141,10 +157,10 @@
})
onMounted(()=>{
- request.get('/role/findAll').then(res=>{
+ request.get(`/role/findAll`).then(res=>{
gridOptions.data = res.data
})
- request.post('/permission/getPermissionList').then(res=>{
+ request.post(`/permission/getPermissionList/${lang}`).then(res=>{
options.value = res.data
})
})
@@ -153,19 +169,73 @@
switch (type) {
case 'edit': {
dialogVisible.value = true
+ checkId.value = row.id
break
}
}
}
const getPermissionList = () => {
- request.post(`/permission/getPermission/${2}`).then(res=>{
- permissionOptions.data = res.data
+ request.post(`/permission/getPermission/${checkId.value}/${lang}`,selectValue.value).then(res=>{
+ pGrid.value.reloadData(res.data)
})
}
-const selectChange = ()=>{
- console.log(selectValue.value)
+const selectChange = () => {
+ getPermissionList()
+}
+
+const saveBatch = () => {
+ const $grid = pGrid.value
+ if($grid.getCheckboxRecords().length === 0){
+ ElMessage.warning("璇峰厛閫夋嫨鏉冮檺")
+ return
+ }
+ ElMessageBox.confirm(
+ '纭淇敼瑙掕壊鏉冮檺?',
+ 'Warning',
+ {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
+ ).then(() => {
+ const permission = {
+ id: checkId.value,
+ detail: $grid.getCheckboxRecords()
+ }
+ request.post(`/permissionRole/savePermissionRole`,permission).then(res=>{
+ if(res.data=== true && res.code==='200'){
+ ElMessage.success('淇濆瓨鎴愬姛')
+ dialogVisible.value = false
+ getPermissionList()
+ }else{
+ ElMessage.error('淇濆瓨澶辫触')
+ }
+ })
+ })
+}
+
+const addRole = () =>{
+ ElMessageBox.prompt('璇疯緭鍏ユ柊瑙掕壊', '鏂板瑙掕壊', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputPattern:/^.{1,255}$/,
+ inputErrorMessage: '涓嶈兘涓虹┖涓旈暱搴︿笉鑳借秴杩�255',
+ })
+ .then(({ value }) => {
+ const role= {
+ role: value
+ }
+ request.post("/role/add",role).then(res=>{
+ if(res.code==='200' && res.data===true){
+ ElMessage.success('鏂板鎴愬姛')
+ router.push({path:'/main/role/roleList',query:{random:Math.random()}})
+ }else{
+ ElMessage.error('鏂板澶辫触')
+ }
+ })
+ })
}
</script>
@@ -178,6 +248,15 @@
ref="xGrid"
v-bind="gridOptions"
>
+ <template #role_add>
+ <vxe-button
+ @click="addRole"
+ status='primary'
+ style="margin-right: 1rem"
+ >瑙掕壊鏂板</vxe-button>
+ </template>
+
+
<template #filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
@@ -209,6 +288,13 @@
@change="selectChange"
/>
</template>
+ <template #save_buttons>
+ <vxe-button
+ @click="saveBatch"
+ status='primary'
+ style="margin-right: 1rem"
+ >鏂板</vxe-button>
+ </template>
</vxe-grid>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/NotPermission.vue b/north-glass-erp/northglass-erp/src/views/system/user/NotPermission.vue
similarity index 100%
rename from north-glass-erp/northglass-erp/src/views/sd/order/NotPermission.vue
rename to north-glass-erp/northglass-erp/src/views/system/user/NotPermission.vue
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 21f4e95..ac84714 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -4,6 +4,7 @@
import com.example.erp.common.Result;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.pp.Report;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
@@ -45,4 +46,30 @@
}
+ @ApiOperation("鍦ㄥ埗鍝佹姤琛�")
+ @PostMapping("/workInProgress/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
+ public Result workInProgress(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.workInProgressSv(selectTime1,selectTime2,orderId,inputProject,selectProcesses,report));
+
+ }
+
+ @ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
+ @PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
+ public Result selectProcessToBeCompleted(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.selectProcessToBeCompletedSv(selectTime1,selectTime2,orderId,inputProject,selectProcesses,report));
+
+ }
+
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
index ecc355f..818b89e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
@@ -1,14 +1,18 @@
package com.example.erp.controller.sd;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.BasicData;
import com.example.erp.service.sd.BasicDateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@RestController
@RequestMapping("/basicData")
+@Api(value="璁㈠崟鍩虹controller",tags={"璁㈠崟鍩虹鏁版嵁鎿嶄綔鎺ュ彛"})
public class BasicDataController {
final
BasicDateService basicDateService;
@@ -29,24 +33,36 @@
public Result getBasicDataByTypeAndChildType(@PathVariable String type,@PathVariable String childType){
return Result.seccess(basicDateService.getBasicDataByTypeAndChildType(type,childType));
}
+
+
+ @ApiOperation("鏌ヨ鍩虹鏁版嵁")
+ @SaCheckPermission("searchOrderBasicData.search")
@GetMapping("/getBasicData")
public Result getBasicData(){
return Result.seccess(basicDateService.getBasicData());
}
+ @ApiOperation("鏌ヨ鍩虹鏁版嵁绫诲瀷")
+ @SaCheckPermission("searchOrderBasicData.search")
@GetMapping("/getBasicDataType")
public Result getBasicDataType(){
return Result.seccess(basicDateService.getBasicDataType());
}
+ @ApiOperation("鏂板鍩虹鏁版嵁")
+ @SaCheckPermission("searchOrderBasicData.add")
@PostMapping("addBasicData")
public Result addBasicData(@RequestBody Map<String,Object> map){
return Result.seccess(basicDateService.addBasicData(map));
}
+
+ @ApiOperation("鏇存柊鍩虹鏁版嵁")
+ @SaCheckPermission("searchOrderBasicData.update")
@PostMapping("updateBasicData")
public Result updateBasicData(@RequestBody BasicData basicData){
return Result.seccess(basicDateService.updateBasicData(basicData));
}
-
+ @ApiOperation("鍒犻櫎鍩虹鏁版嵁")
+ @SaCheckPermission("searchOrderBasicData.delete")
@PostMapping("deleteBasicData")
public Result deleteBasicData(@RequestBody BasicData basicData){
return Result.seccess(basicDateService.deleteBasicData(basicData));
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index a65b541..909d354 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -33,6 +33,7 @@
@ApiOperation("璁㈠崟淇濆瓨")
@PostMapping("/saveOrder")
+ @SaCheckPermission("createOrder.add")
public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
if(orderService.saveOrder(orderMap)) {
return Result.seccess(true);
@@ -54,39 +55,46 @@
}
@ApiOperation("璁㈠崟浣滃簾")
+ @SaCheckPermission("createOrder.cancel")
@PostMapping("/cancelOrder/{id}")
public Result cancelOrder(@PathVariable String id) {
return Result.seccess(orderService.cancelOrder(id));
}
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅")
+ @SaCheckPermission("selectOrder.edit")
@PostMapping("/getOrderById/{id}")
public Result getOrderById(@PathVariable String id) {
return Result.seccess(orderService.getOrderById(id));
}
@ApiOperation("鏌ヨ璁㈠崟宸ヨ壓")
+ @SaCheckPermission("updateOrderCraft.search")
@PostMapping("/getOrderCraftById/{id}")
public Result getOrderCraftById(@PathVariable String id) {
return Result.seccess(orderService.getOrderCraftById(id));
}
@ApiOperation("瀹℃牳璁㈠崟")
+ @SaCheckPermission("createOrder.review")
@PostMapping("/reviewOrderById/{id}/{status}")
public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) {
return Result.seccess(orderService.reviewOrderById(id,status));
}
@ApiOperation("瀹℃牳宸ヨ壓")
+ @SaCheckPermission("updateOrderCraft.review")
@PostMapping("/reviewProcessById/{id}/{status}")
public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails) {
return Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails));
}
@ApiOperation("鏇存柊璁㈠崟閲戦鍗曚环")
+ @SaCheckPermission("createOrder.amountReset")
@PostMapping("/updateOrderMoney")
public Result updateOrderMoney(@RequestBody Map<String,Object> map) {
return Result.seccess(orderService.updateOrderMoney(map));
}
+ @SaCheckPermission("orderReport.search")
@ApiOperation("鏌ヨ璁㈠崟鎶ヨ〃")
@PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
public Result getOrderReport(@PathVariable Integer pageNum,
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
index 8c6d027..431e698 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.sd;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Product;
import com.example.erp.service.sd.ProductService;
@@ -24,27 +25,32 @@
}
@ApiOperation("浜у搧鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectProduct.search")
@PostMapping ("/{pageNum}/{pageSize}/{glassType}")
public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> glassType, @RequestBody Product product){
return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product));
}
@ApiOperation("浜у搧淇濆瓨鎺ュ彛")
+ @SaCheckPermission("selectProduct.add")
@PostMapping("/saveProduct")
public Result saveProduct(@RequestBody Map<String,Object> product){
return Result.seccess(productService.saveProduct(product));
}
@ApiOperation("浜у搧鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("selectProduct.delete")
@PostMapping("/deleteProductById/{id}")
public Result deleteProductById(@PathVariable Integer id){
return Result.seccess(productService.deleteProductById(id));
}
@ApiOperation("浜у搧瀹℃牳鐘舵�佷慨鏀规帴鍙�")
+ @SaCheckPermission("selectProduct.review")
@PostMapping("/updateProductStateById/{id}/{state}")
public Result updateProductStateById(@PathVariable Integer id,@PathVariable Integer state){
return Result.seccess(productService.updateProductStateById(id,state));
}
@ApiOperation("鏍规嵁浜у搧id鏌ヨ浜у搧鎺ュ彛")
+ @SaCheckPermission("selectProduct.edit")
@PostMapping("/selectProductById/{id}")
public Result selectProductById(@PathVariable Integer id){
return Result.seccess(productService.selectProductById(id));
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java
index 63de0f6..3da88fb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java
@@ -2,11 +2,9 @@
import com.example.erp.common.Result;
import com.example.erp.service.userInfo.PermissionBasicService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/permission")
@@ -17,13 +15,13 @@
this.permissionBasicService = permissionBasicService;
}
- @PostMapping("getPermission/{userId}")
- public Result getPermission(@PathVariable Integer userId){
- return Result.seccess(permissionBasicService.getPermission(userId));
+ @PostMapping("getPermission/{roleId}/{lang}")
+ public Result getPermission(@PathVariable Integer roleId,@PathVariable String lang, @RequestBody List<Integer> selectPageId){
+ return Result.seccess(permissionBasicService.getPermission(roleId,lang,selectPageId));
}
- @PostMapping("getPermissionList")
- public Result getPermission(){
- return Result.seccess(permissionBasicService.getPermissionList());
+ @PostMapping("getPermissionList/{lang}")
+ public Result getPermission(@PathVariable String lang){
+ return Result.seccess(permissionBasicService.getPermissionList(lang));
}
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionRoleController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionRoleController.java
new file mode 100644
index 0000000..efa8c7b
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionRoleController.java
@@ -0,0 +1,34 @@
+package com.example.erp.controller.userInfo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.example.erp.common.Result;
+import com.example.erp.service.userInfo.PermissionRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@Api(value="瑙掕壊鏉冮檺controller",tags={"瑙掕壊鏉冮檺鎿嶄綔鎺ュ彛"})
+@RequestMapping("/permissionRole")
+public class PermissionRoleController {
+ private final PermissionRoleService permissionRoleService;
+
+ public PermissionRoleController(PermissionRoleService permissionRoleService) {
+ this.permissionRoleService = permissionRoleService;
+ }
+
+
+ @ApiOperation("瑙掕壊鏉冮檺淇濆瓨")
+ @SaCheckPermission("roleList.update")
+ @RequestMapping("/savePermissionRole")
+ public Result savePermissionRole(@RequestBody Map<String, Object> permissionRole) {
+ return Result.seccess(permissionRoleService.savePermissionRole(permissionRole));
+ }
+
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java
index 30e9443..4b33b05 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java
@@ -1,13 +1,16 @@
package com.example.erp.controller.userInfo;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
+import com.example.erp.entity.userInfo.Role;
import com.example.erp.service.userInfo.RoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
+@Api(value="瑙掕壊controller",tags={"瑙掕壊鎿嶄綔鎺ュ彛"})
@RequestMapping("/role")
public class RoleController {
private final RoleService roleService;
@@ -16,8 +19,20 @@
this.roleService = roleService;
}
+
+ @ApiOperation("鏌ヨ鎵�鏈夎鑹�")
+ @SaCheckPermission("roleList.search")
@GetMapping("/findAll")
public Result findAll(){
return Result.seccess(roleService.findAll());
}
+
+
+ @ApiOperation("鏂板瑙掕壊")
+ @SaCheckPermission("roleList.add")
+ @PostMapping("/add")
+ public Result add(@RequestBody Role role){
+ return Result.seccess(roleService.add(role));
+
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
index 6045054..9e2efd8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
@@ -6,9 +6,12 @@
import com.example.erp.common.Result;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.service.userInfo.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@RestController
+@Api(value="鐢ㄦ埛controller",tags={"鐢ㄦ埛鎿嶄綔鎺ュ彛"})
@RequestMapping("/userInfo")
public class UserInfoController {
private final UserService userService;
@@ -19,30 +22,41 @@
}
@PostMapping("/login")
+ @ApiOperation("鐢ㄦ埛鐧诲綍")
public Result login(@RequestBody UserDTO userDTO) {
return Result.seccess(userService.doLogin(userDTO));
}
+
+ @ApiOperation("鐢ㄦ埛閫�鍑�")
@PostMapping("/logout")
public Result logout() {
return Result.seccess(userService.logout());
}
+ @ApiOperation("鍒ゆ柇鐢ㄦ埛鏄惁鐧诲綍")
@PostMapping("/isLogin")
public Result isLogin() {
return Result.seccess(userService.isLogin()); }
@SaCheckLogin
+ @ApiOperation("鑾峰彇鐢ㄦ埛token")
@PostMapping("/getTokenInfo")
public Result userAdd() {
return Result.seccess(StpUtil.getTokenInfo());
}
+
+ @SaCheckPermission("userList.delete")
+ @ApiOperation("鍒犻櫎鐢ㄦ埛")
@PostMapping("/userDelete/{id}")
public Result userDelete(@PathVariable Integer id) {
return Result.seccess(userService.userDelete(id));
}
+
+ @ApiOperation("鏌ヨ鐢ㄦ埛鍒楄〃")
+ @SaCheckPermission("userList.search")
@GetMapping("findAll")
public Result findAll(){
return Result.seccess(userService.findAll());
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserRoleController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserRoleController.java
index c6cc324..c2e3752 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserRoleController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserRoleController.java
@@ -1,8 +1,11 @@
package com.example.erp.controller.userInfo;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.service.userInfo.UserRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -12,6 +15,7 @@
import java.util.Map;
@RestController
+@Api(value="鐢ㄦ埛瑙掕壊controller",tags={"鐢ㄦ埛瑙掕壊鎿嶄綔鎺ュ彛"})
@RequestMapping("/userRole")
public class UserRoleController {
private final UserRoleService userRoleService;
@@ -20,6 +24,9 @@
this.userRoleService = userRoleService;
}
+
+ @ApiOperation("鏇存柊鐢ㄦ埛瑙掕壊")
+ @SaCheckPermission("userList.update")
@PostMapping("/updateUserRole")
public Result updateUserRole(@RequestBody Map<String,Object> params) {
return Result.seccess(userRoleService.updateUserRole(params));
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/Report.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/Report.java
new file mode 100644
index 0000000..4ecba7a
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/Report.java
@@ -0,0 +1,60 @@
+package com.example.erp.entity.pp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.sd.BasicData;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class Report {
+ @TableId(type = IdType.AUTO)
+ //宸ュ簭
+ private String process;
+ //娴佺▼鍗″彿
+ private String processId;
+ //瀹㈡埛鍚嶇О
+ private String customerName;
+ //椤圭洰鍚嶇О
+ private String project;
+ //閿�鍞崟鍙�
+ private String orderId;
+ //鎵规
+ private String batch;
+ //搴忓彿
+ private String orderNumber;
+ //灏忕墖椤哄簭
+ private String technologyNumber;
+ //褰㈢姸
+ private String shape;
+ //宸ヨ壓娴佺▼
+ private String technologyFlow;
+ //璁㈠崟鏁�
+ private String orderNum;
+ //瀹�
+ private String childWidth;
+ //楂�
+ private String childHeight;
+ //搴撳瓨鏁�
+ private String stockNum;
+ //搴撳瓨闈㈢Н
+ private String stockArea;
+ //浜у搧鍚嶇О
+ private String productName;
+ //寮挗鍗婂緞
+ private String bendRadius;
+
+ //鍗曠墖闈㈢Н
+ private String childArea;
+ //瀹為檯闈㈢Н
+ private String actualArea;
+ //瀹屾垚鏁伴噺
+ private String completeNum;
+ //瀹屾垚闈㈢Н
+ private String completeArea;
+ //鏈畬鏁伴噺
+ private String incompleteNum;
+ //鏈畬闈㈢Н
+ private String incompleteArea;
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionBasic.java b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionBasic.java
index 0d530f2..526cc80 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionBasic.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionBasic.java
@@ -1,6 +1,7 @@
package com.example.erp.entity.userInfo;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
@@ -12,4 +13,6 @@
private String page;
private String permission;
private String state;
+ @TableField(select = false,exist = false)
+ private Boolean checked;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/SysMenuItem.java b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/SysMenuItem.java
index cfb6096..facf493 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/SysMenuItem.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/SysMenuItem.java
@@ -11,6 +11,7 @@
private Integer menuID;
private String itemName;
private String url;
+ private String menu;
private String languageType;
private Integer state;
private Integer listSort;
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
index 2e1e171..286703a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
@@ -2,9 +2,7 @@
import com.example.erp.entity.pp.DamageDetails;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.pp.Report;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,5 +17,18 @@
List<DamageDetails> getProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
- Map<String,Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
+ Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
+
+ List<Map<String, String>> workInProgressMp(
+ @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
+ @Param("orderId") String orderId, @Param("inputProject") String inputProject,
+ @Param("selectProcesses") String selectProcesses, Report report);
+
+ List<Map<String, String>> processToBeCompletedMp(Date selectTime1, Date selectTime2, String orderId,
+ String inputProject, String selectProcesses, Report report);
+
+// Map<String, Integer> getWorkInProgressTotal(
+// @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
+// @Param("orderId") String orderId, @Param("inputProject") String inputProject,
+// @Param("selectProcesses") String selectProcesses, Report report);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionBasicMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionBasicMapper.java
index 25a841b..9a63096 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionBasicMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionBasicMapper.java
@@ -9,9 +9,9 @@
@Mapper
public interface PermissionBasicMapper extends BaseMapper<PermissionBasic> {
- List<PermissionBasic> getPermission(Integer userId);
+ List<PermissionBasic> getPermission(Integer roleId, String lang, Integer id);
- List<PermissionBasic> selectOneLevel();
+ List<PermissionBasic> selectOneLevel(String lang);
- List<Map<String,Object>> selectTowLevel(String menu);
+ List<Map<String,Object>> selectTowLevel(Integer id);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java
index f25e420..73b3ece 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java
@@ -9,4 +9,6 @@
@Mapper
public interface PermissionRoleMapper extends BaseMapper<PermissionRole> {
List<String> getUserPermission(Integer loginId);
+
+ Boolean saveBatch(List<PermissionRole> permissionRoles);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index 24631bc..f6195a4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -1,21 +1,18 @@
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.DamageDetails;
-import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.pp.Report;
+import com.example.erp.mapper.pp.ProductionSchedulingMapper;
import com.example.erp.mapper.pp.ReportMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Date;
import java.time.LocalDate;
import java.util.*;
-import java.util.stream.Collectors;
@Service
@DS("pp")
@@ -23,12 +20,13 @@
private final ReportMapper reportMapper;
private final OrderProcessDetailMapper orderProcessDetailMapper;
+ private final ProductionSchedulingMapper productionSchedulingMapper;
-
- public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper) {
+ public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper,ProductionSchedulingMapper productionSchedulingMapper) {
this.reportMapper = reportMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
+ this.productionSchedulingMapper = productionSchedulingMapper;
}
//娴佺▼鍗¤繘搴︽柟娉�
@@ -125,4 +123,31 @@
// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
return map;
}
+
+ public Map<String,Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {
+
+ if ("null".equals(orderId)) {
+ orderId = "";
+ }
+ if ("null".equals(inputProject)) {
+ inputProject = "";
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportMapper.workInProgressMp( selectTime1, selectTime2,orderId,inputProject,selectProcesses,report));
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
+ }
+
+ public Map<String,Object> selectProcessToBeCompletedSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {
+ if ("null".equals(orderId)) {
+ orderId = "";
+ }
+ if ("null".equals(inputProject)) {
+ inputProject = "";
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportMapper.processToBeCompletedMp( selectTime1, selectTime2,orderId,inputProject,selectProcesses,report));
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java
index f535f61..32c4f43 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java
@@ -1,9 +1,7 @@
package com.example.erp.service.userInfo;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.mapper.userInfo.PermissionBasicMapper;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -19,20 +17,20 @@
this.permissionBasicMapper = permissionBasicMapper;
}
- public List<PermissionBasic> getPermission(Integer userId) {
- return permissionBasicMapper.getPermission(userId);
+ public List<PermissionBasic> getPermission(Integer roleId, String lang, List<Integer> selectPageId) {
+ return permissionBasicMapper.getPermission(roleId,lang, selectPageId.get(1));
}
- public Object getPermissionList() {
- List<PermissionBasic> getOne = permissionBasicMapper.selectOneLevel();
+ public Object getPermissionList(String lang) {
+ List<PermissionBasic> getOne = permissionBasicMapper.selectOneLevel(lang);
List<Map<String,Object>> ListOne = new ArrayList<>();
for(PermissionBasic permissionBasic : getOne){
-
+ System.out.println(permissionBasic.getMenu());
Map<String,Object> map = new HashMap<>();
map.put("value",permissionBasic.getId());
map.put("label",permissionBasic.getMenu());
- map.put("children",permissionBasicMapper.selectTowLevel(permissionBasic.getMenu()));
+ map.put("children",permissionBasicMapper.selectTowLevel(permissionBasic.getId()));
ListOne.add(map);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java
index 63e4378..46b7530 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java
@@ -1,11 +1,18 @@
package com.example.erp.service.userInfo;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.erp.entity.userInfo.PermissionBasic;
+import com.example.erp.entity.userInfo.PermissionRole;
import com.example.erp.mapper.userInfo.PermissionRoleMapper;
import com.example.erp.mapper.userInfo.UserMapper;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
@DS("user_info")
@Service
@@ -26,4 +33,30 @@
public List<String> getUserRole(Integer id) {
return userMapper.getUserRole(id);
}
+
+ public Boolean savePermissionRole(Map<String, Object> permissionRoleMap) {
+ JSONObject permissionRoleJson = new JSONObject(permissionRoleMap);
+ List<PermissionBasic> permissionBasics =
+ JSONArray.parseArray(
+ JSONObject.toJSONString(permissionRoleJson.get("detail")),
+ PermissionBasic.class);
+ Integer roleId = (Integer) permissionRoleMap.get("id");
+ if(permissionBasics.isEmpty() || roleId == null ){
+ return false;
+ }
+
+
+ List<PermissionRole> permissionRoles = new ArrayList<>();
+ for (PermissionBasic permissionBasic : permissionBasics) {
+ PermissionRole permissionRole = new PermissionRole();
+ permissionRole.setRoleId(roleId);
+ permissionRole.setPermissionId(permissionBasic.getId());
+ permissionRoles.add(permissionRole);
+ }
+ permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));
+ return permissionRoleMapper.saveBatch(permissionRoles);
+
+
+
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/RoleService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/RoleService.java
index bc687f3..371aaf6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/RoleService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/RoleService.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.userInfo.Role;
import com.example.erp.mapper.userInfo.RoleMapper;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -24,4 +23,9 @@
.ne("role","admin")
);
}
+
+ public Boolean add(Role role) {
+
+ return roleMapper.insert(role) > 0;
+ }
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index d4a9dcd..fa088b6 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -66,6 +66,26 @@
</resultMap>
+ <resultMap id="reportMap" type="com.example.erp.entity.pp.Report">
+ <result column="process_id" property="processId"/>
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="batch" property="batch"/>
+ <result column="shape" property="shape"/>
+ <result column="order_number" property="orderNumber"/>
+ <result column="technology_number" property="technologyNumber"/>
+ <result column="process" property="technologyFlow"/>
+ <result column="quantity" property="orderNum"/>
+ <result column="child_width" property="childWidth"/>
+ <result column="child_height" property="childHeight"/>
+ <result column="stockNum" property="stockNum"/>
+ <result column="stockArea" property="stockArea"/>
+ <result column="product_name" property="productName"/>
+ <result column="bend_radius" property="bendRadius"/>
+ </resultMap>
+
+
<!-- 娴佺▼鍗¤繘搴�-->
<select id="processCardProgressMp">
select
@@ -160,4 +180,188 @@
order by dd.id desc
</select>
+ <select id="workInProgressMp">
+ select #{selectProcesses} as thisProcess,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ o.batch,
+ od.shape,
+ ogd.order_number,
+ ogd.technology_number,
+ ogd.process,
+ od.quantity,
+ ogd.child_width,
+ ogd.child_height,
+ odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) / 1000000, 2) as stockArea,
+ od.product_name,
+ od.bend_radius
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where rwk.this_process = #{selectProcesses}
+ and rw.review_status = 1
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0
+ and odpd.process = #{selectProcesses} and o.create_time between #{selectTime1} and #{selectTime2}
+ and position(#{orderId} in od.order_id) and position(#{inputProject} in o.project)
+
+ group by fc.process_id, fc.order_number, fc.technology_number
+ order by fc.process_id, fc.order_number, fc.technology_number
+ </select>
+
+ <!--
+ <if test="Report.processId != null and Report.processId != ''">
+ and fc.process_id regexp #{Report.processId}
+ </if>
+ <if test="Report.customerName != null and Report.customerName != ''">
+ and o.customer_name regexp #{Report.customerName}
+ </if>
+ <if test="Report.project != null and Report.project != ''">
+ and o.project regexp #{Report.project}
+ </if>
+ <if test="Report.batch != null and Report.batch != ''">
+ and o.batch regexp #{Report.batch}
+ </if>
+ <if test="Report.shape != null and Report.shape != ''">
+ and od.shape regexp #{Report.shape}
+ </if>
+ -->
+
+<!-- <select id="getWorkInProgressTotal">-->
+<!-- select CEILING(count(fc.id) / #{pageSize}) as 'pageTotal',-->
+<!-- count(distinct fc.id) as 'total'-->
+
+<!-- from sd.order_detail AS od-->
+<!-- LEFT JOIN sd.order_glass_detail AS ogd-->
+<!-- ON od.order_id = ogd.order_id-->
+<!-- AND od.order_number = ogd.order_number-->
+<!-- LEFT JOIN flow_card AS fc-->
+<!-- ON fc.order_id = ogd.order_id-->
+<!-- and fc.production_id = ogd.production_id-->
+<!-- AND fc.order_number = ogd.order_number-->
+<!-- AND fc.technology_number = ogd.technology_number-->
+<!-- left join sd.order_process_detail as odpd-->
+<!-- ON odpd.order_id = fc.order_id-->
+<!-- AND odpd.order_number = fc.order_number-->
+<!-- AND odpd.technology_number = fc.technology_number-->
+<!-- and odpd.process_id = fc.process_id-->
+<!-- left join sd.order_process_detail as odpds-->
+<!-- ON odpds.id = odpd.id - 1-->
+<!-- left join-->
+<!-- (SELECT sum(rw.rework_num) as 'patchNumSum',-->
+<!-- rw.process_id,-->
+<!-- rw.order_sort,-->
+<!-- rw.technology_number,-->
+<!-- rwk.this_process-->
+<!-- from rework as rw-->
+<!-- LEFT JOIN-->
+<!-- reporting_work as rwk-->
+<!-- on rw.reporting_work_id = rwk.reporting_work_id-->
+<!-- where rwk.this_process = #{selectProcesses}-->
+<!-- and rw.review_status = 1-->
+<!-- GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c-->
+<!-- on c.process_id = fc.process_id-->
+<!-- and c.order_sort = fc.order_number-->
+<!-- and c.technology_number = fc.technology_number-->
+<!-- left join sd.`order` as o-->
+<!-- on o.order_id = od.order_id-->
+<!-- where LENGTH(fc.process_id) = 14-->
+<!-- and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - -->
+<!-- odpd.broken_num != 0-->
+<!-- and odpd.process = #{selectProcesses}-->
+<!-- and o.create_time between #{selectTime1} and #{selectTime2}-->
+<!-- and position(#{orderId} in od.order_id)-->
+<!-- and position(#{inputProject} in o.project)-->
+<!-- group by fc.process_id, fc.order_number, fc.technology_number-->
+<!-- order by fc.process_id, fc.order_number, fc.technology_number-->
+<!-- limit #{offset},#{pageSize};-->
+<!-- </select>-->
+
+ <select id="processToBeCompletedMp">
+ select DATE(o.create_time) as create_time,
+ DATE(o.delivery_date) as delivery_date,
+ o.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ o.batch,
+ od.order_number,
+ ogd.technology_number,
+ ogd.glass_child,
+ ogd.child_width,
+ ogd.child_height,
+ od.quantity,
+ ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
+ ROUND(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as actualArea,
+ odpd.reporting_work_num as completeNum,
+ ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,
+ 2) as completeArea,
+ od.quantity - odpd.reporting_work_num as incompleteNum,
+ ROUND(ogd.child_width * ogd.child_height * (od.quantity - odpd.reporting_work_num) / 1000000,
+ 2) as incompleteArea,
+ od.product_name
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpd.process = #{selectProcesses}
+ and o.create_time between #{selectTime1} and #{selectTime2}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ and od.quantity > odpd.reporting_work_num
+
+ group by fc.process_id, fc.order_number, fc.technology_number
+ order by fc.process_id, fc.order_number, fc.technology_number
+ </select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml
index 5ab8fbd..c515579 100644
--- a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml
@@ -4,28 +4,46 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.userInfo.PermissionBasicMapper">
<select id="getPermission">
- select a.*,
- CASE
- WHEN b.id IS NULL THEN 0
- ELSE 1
- END
+ select a.id,
+ <if test="lang=='en'">
+ a.menu,
+ </if>
+ <if test="lang=='zh'">
+ c.itemName as menu,
+ </if>
+ a.page,
+ a.permission,
+ a.state,
+ IF(b.id IS NULL, 0, 1) as 'checked'
from permission_basic as a
left join permission_role as b
- on a.id = b.permission_id
- left join user_role as c
- on b.role_id = c.role_id
- left join user as d
- on c.user_id = d.id
- and d.id = #{userId}
+ on b.permission_id = a.id
+ and b.role_id = #{roleId}
+ <if test="lang=='zh'">
+ left join sys_menu_item as c
+ on c.menu = a.menu
+ </if>
+
where a.id!=1 and a.state=1
+ <if test="id != null and id != ''">
+ and a.page = (select page from permission_basic where id = #{id})
+ </if>
group by a.id
</select>
<select id="selectOneLevel">
- select *
- from permission_basic
- where id!=1 and state=1
- group by menu
+ select a.id,
+ <if test="lang=='zh'">
+ b.itemName as menu
+ </if>
+ <if test="lang=='en'">
+ a.menu
+ </if>
+ from permission_basic as a
+ left join sys_menu_item as b
+ on a.menu = b.menu
+ where a.id!=1 and a.state=1
+ group by a.menu
</select>
@@ -34,8 +52,10 @@
id as value,
page as label
from permission_basic
- where id!=1 and state=1
- group by menu
+ where
+ state=1
+ and menu = (select menu from permission_basic where id = #{id})
+ group by page
</select>
diff --git a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml
index 35e803f..d8085f7 100644
--- a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml
@@ -21,5 +21,21 @@
where a.id = #{loginId}
and d.state = 1
</select>
+
+ <insert id="saveBatch">
+ insert into
+ permission_role(
+ role_id,
+ permission_id
+ )
+ values
+ <foreach collection ="permissionRoles" item="permissionRole" separator =",">
+ (
+ #{permissionRole.roleId},
+ #{permissionRole.permissionId}
+ )
+ </foreach>
+
+ </insert>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/Report.xml b/north-glass-erp/target/classes/mapper/pp/Report.xml
index d4a9dcd..fa088b6 100644
--- a/north-glass-erp/target/classes/mapper/pp/Report.xml
+++ b/north-glass-erp/target/classes/mapper/pp/Report.xml
@@ -66,6 +66,26 @@
</resultMap>
+ <resultMap id="reportMap" type="com.example.erp.entity.pp.Report">
+ <result column="process_id" property="processId"/>
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="batch" property="batch"/>
+ <result column="shape" property="shape"/>
+ <result column="order_number" property="orderNumber"/>
+ <result column="technology_number" property="technologyNumber"/>
+ <result column="process" property="technologyFlow"/>
+ <result column="quantity" property="orderNum"/>
+ <result column="child_width" property="childWidth"/>
+ <result column="child_height" property="childHeight"/>
+ <result column="stockNum" property="stockNum"/>
+ <result column="stockArea" property="stockArea"/>
+ <result column="product_name" property="productName"/>
+ <result column="bend_radius" property="bendRadius"/>
+ </resultMap>
+
+
<!-- 娴佺▼鍗¤繘搴�-->
<select id="processCardProgressMp">
select
@@ -160,4 +180,188 @@
order by dd.id desc
</select>
+ <select id="workInProgressMp">
+ select #{selectProcesses} as thisProcess,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ o.batch,
+ od.shape,
+ ogd.order_number,
+ ogd.technology_number,
+ ogd.process,
+ od.quantity,
+ ogd.child_width,
+ ogd.child_height,
+ odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) / 1000000, 2) as stockArea,
+ od.product_name,
+ od.bend_radius
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where rwk.this_process = #{selectProcesses}
+ and rw.review_status = 1
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0
+ and odpd.process = #{selectProcesses} and o.create_time between #{selectTime1} and #{selectTime2}
+ and position(#{orderId} in od.order_id) and position(#{inputProject} in o.project)
+
+ group by fc.process_id, fc.order_number, fc.technology_number
+ order by fc.process_id, fc.order_number, fc.technology_number
+ </select>
+
+ <!--
+ <if test="Report.processId != null and Report.processId != ''">
+ and fc.process_id regexp #{Report.processId}
+ </if>
+ <if test="Report.customerName != null and Report.customerName != ''">
+ and o.customer_name regexp #{Report.customerName}
+ </if>
+ <if test="Report.project != null and Report.project != ''">
+ and o.project regexp #{Report.project}
+ </if>
+ <if test="Report.batch != null and Report.batch != ''">
+ and o.batch regexp #{Report.batch}
+ </if>
+ <if test="Report.shape != null and Report.shape != ''">
+ and od.shape regexp #{Report.shape}
+ </if>
+ -->
+
+<!-- <select id="getWorkInProgressTotal">-->
+<!-- select CEILING(count(fc.id) / #{pageSize}) as 'pageTotal',-->
+<!-- count(distinct fc.id) as 'total'-->
+
+<!-- from sd.order_detail AS od-->
+<!-- LEFT JOIN sd.order_glass_detail AS ogd-->
+<!-- ON od.order_id = ogd.order_id-->
+<!-- AND od.order_number = ogd.order_number-->
+<!-- LEFT JOIN flow_card AS fc-->
+<!-- ON fc.order_id = ogd.order_id-->
+<!-- and fc.production_id = ogd.production_id-->
+<!-- AND fc.order_number = ogd.order_number-->
+<!-- AND fc.technology_number = ogd.technology_number-->
+<!-- left join sd.order_process_detail as odpd-->
+<!-- ON odpd.order_id = fc.order_id-->
+<!-- AND odpd.order_number = fc.order_number-->
+<!-- AND odpd.technology_number = fc.technology_number-->
+<!-- and odpd.process_id = fc.process_id-->
+<!-- left join sd.order_process_detail as odpds-->
+<!-- ON odpds.id = odpd.id - 1-->
+<!-- left join-->
+<!-- (SELECT sum(rw.rework_num) as 'patchNumSum',-->
+<!-- rw.process_id,-->
+<!-- rw.order_sort,-->
+<!-- rw.technology_number,-->
+<!-- rwk.this_process-->
+<!-- from rework as rw-->
+<!-- LEFT JOIN-->
+<!-- reporting_work as rwk-->
+<!-- on rw.reporting_work_id = rwk.reporting_work_id-->
+<!-- where rwk.this_process = #{selectProcesses}-->
+<!-- and rw.review_status = 1-->
+<!-- GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c-->
+<!-- on c.process_id = fc.process_id-->
+<!-- and c.order_sort = fc.order_number-->
+<!-- and c.technology_number = fc.technology_number-->
+<!-- left join sd.`order` as o-->
+<!-- on o.order_id = od.order_id-->
+<!-- where LENGTH(fc.process_id) = 14-->
+<!-- and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - -->
+<!-- odpd.broken_num != 0-->
+<!-- and odpd.process = #{selectProcesses}-->
+<!-- and o.create_time between #{selectTime1} and #{selectTime2}-->
+<!-- and position(#{orderId} in od.order_id)-->
+<!-- and position(#{inputProject} in o.project)-->
+<!-- group by fc.process_id, fc.order_number, fc.technology_number-->
+<!-- order by fc.process_id, fc.order_number, fc.technology_number-->
+<!-- limit #{offset},#{pageSize};-->
+<!-- </select>-->
+
+ <select id="processToBeCompletedMp">
+ select DATE(o.create_time) as create_time,
+ DATE(o.delivery_date) as delivery_date,
+ o.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ o.batch,
+ od.order_number,
+ ogd.technology_number,
+ ogd.glass_child,
+ ogd.child_width,
+ ogd.child_height,
+ od.quantity,
+ ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
+ ROUND(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as actualArea,
+ odpd.reporting_work_num as completeNum,
+ ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,
+ 2) as completeArea,
+ od.quantity - odpd.reporting_work_num as incompleteNum,
+ ROUND(ogd.child_width * ogd.child_height * (od.quantity - odpd.reporting_work_num) / 1000000,
+ 2) as incompleteArea,
+ od.product_name
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpd.process = #{selectProcesses}
+ and o.create_time between #{selectTime1} and #{selectTime2}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ and od.quantity > odpd.reporting_work_num
+
+ group by fc.process_id, fc.order_number, fc.technology_number
+ order by fc.process_id, fc.order_number, fc.technology_number
+ </select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml b/north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml
index 35e803f..d8085f7 100644
--- a/north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml
+++ b/north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml
@@ -21,5 +21,21 @@
where a.id = #{loginId}
and d.state = 1
</select>
+
+ <insert id="saveBatch">
+ insert into
+ permission_role(
+ role_id,
+ permission_id
+ )
+ values
+ <foreach collection ="permissionRoles" item="permissionRole" separator =",">
+ (
+ #{permissionRole.roleId},
+ #{permissionRole.permissionId}
+ )
+ </foreach>
+
+ </insert>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0