From fcd6de629c4f6b8d9e610da854f15ef40115b058 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 17:03:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStock.vue | 2
north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue | 4
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 17
north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue | 370 +++++++++---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 17
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/mapper/pp/ReportMapper.java | 19
north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml | 25
north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue | 267 +++++---
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/northglass-erp/src/views/mm/mainIngredientStock/IngredientsStock.vue | 4
north-glass-erp/src/main/java/com/example/erp/entity/pp/Report.java | 60 ++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 27
north-glass-erp/target/classes/mapper/pp/Report.xml | 204 +++++++
16 files changed, 1,293 insertions(+), 378 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/IngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/IngredientsStock.vue
index e7d24ca..c0bf993 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/IngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/IngredientsStock.vue
@@ -28,8 +28,8 @@
<el-breadcrumb :separator-icon="ArrowRight">
<el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/ingredientsStock/SelectIngredientsStock' }">鐗╂枡搴撳瓨</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/ingredientsStock/MaterialOutbound' }">鐗╂枡鍑哄簱</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/ingredientsStock/OriginalMonthlySettlement' }">鍘熺墖鏈堢粨</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/ingredientsStock/AccessoriesMonthlySettlement' }">杈呮枡鏈堢粨</el-breadcrumb-item>
+<!-- <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/ingredientsStock/OriginalMonthlySettlement' }">鍘熺墖鏈堢粨</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/ingredientsStock/AccessoriesMonthlySettlement' }">杈呮枡鏈堢粨</el-breadcrumb-item>-->
<el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/ingredientsStock/ReturnToStorage' }">杩斿簱</el-breadcrumb-item>
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">鎶ヨ〃</el-breadcrumb-item>
</el-breadcrumb>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStock.vue
index fe9044d..fd549f4 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStock.vue
@@ -26,7 +26,7 @@
<el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/productStock/ProductStockList' }" >{{$t('productStock.inventoryQuery')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/productStock/CreateProductStock' }">{{$t('productStock.finishedProductWarehousing')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/productStock/FinishedProductOut' }">{{$t('productStock.finishedProductOutbound')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/productStock/FinishedProductReturn' }">{{$t('productStock.finishedProductOrderReturn')}}</el-breadcrumb-item>
+<!-- <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/productStock/FinishedProductReturn' }">{{$t('productStock.finishedProductOrderReturn')}}</el-breadcrumb-item>-->
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
<!-- <el-breadcrumb-item :to="{ path: '/main/productStock/OrderAllocation' }">璁㈠崟璋冩嫧</el-breadcrumb-item>-->
<!-- <el-breadcrumb-item :to="{ path: '/main/productStock/FinishedGoodsIssue' }">鎴愬搧棰嗗嚭</el-breadcrumb-item>-->
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue
index 03cbbb0..4e69fe0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue
@@ -26,8 +26,8 @@
<el-breadcrumb :separator-icon="ArrowRight">
<el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/Replenish/SelectReplenish' }">{{$t('replenish.patchManagement')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/Replenish/AddReplenish' }">{{$t('replenish.addPatches')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/Replenish/PrintReplenishFlowCard' }">{{$t('replenish.printPatches')}}</el-breadcrumb-item>
- <el-breadcrumb-item :to="{ path: '/main/processCard/SelectPrintFlowCard' }" style="display: none">鎵撳嵃</el-breadcrumb-item>
+<!-- <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/Replenish/PrintReplenishFlowCard' }">{{$t('replenish.printPatches')}}</el-breadcrumb-item>-->
+
</el-breadcrumb>
</div>
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/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 07ea07f..920287c 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -393,14 +393,16 @@
custom: true
},
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let footList=['deliveryDetail.quantity','quantity']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- // if (props.tableProp.footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
+ console.log(column.field)
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
return ''
})
]
@@ -408,6 +410,15 @@
})
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
+
const gridEvents = {
async toolbarButtonClick({code}) {
const $grid = xGrid.value
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 0b29400..618f499 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -262,20 +262,31 @@
},
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let footList=['quantity','area']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- // if (props.tableProp.footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
return ''
})
]
}
})
+
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
</script>
<template>
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/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/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/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/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/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
new file mode 100644
index 0000000..35e803f
--- /dev/null
+++ b/north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.mapper.userInfo.PermissionRoleMapper">
+ <select id="getUserPermission">
+ select
+ concat(
+ if(d.page=null || d.page='','',concat(d.page, '.')),
+ d.permission
+ ) as 'permission'
+ from user as a
+ left join user_role as e
+ on e.user_id = a.id
+ left join role as b
+ on e.role_id = b.id
+ left join permission_role as c
+ on b.id = c.role_id
+ left join permission_basic d
+ on d.id = c.permission_id
+ where a.id = #{loginId}
+ and d.state = 1
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0