From 2ad00b6623beac3b504105beba9cb56143f7db13 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 22 一月 2024 08:29:45 +0800
Subject: [PATCH] 实体类相关文件提交
---
north-glass-erp/northglass-erp/src/router/index.js | 6
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 245 ++++++++++++++++++
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java | 44 +++
north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue | 2
north-glass-erp/src/main/java/com/example/erp/entity/pp/SetupBom.java | 45 +++
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 2
north-glass-erp/src/main/java/com/example/erp/entity/pp/BaseBom.java | 47 +++
north-glass-erp/northglass-erp/src/views/pp/report/Report.vue | 1
north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue | 11
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 2
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 61 ++++
north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java | 36 ++
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 12
north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java | 35 ++
north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue | 2
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue | 2
north-glass-erp/src/main/java/com/example/erp/entity/pp/OrderBom.java | 45 +++
north-glass-erp/src/main/java/com/example/erp/entity/pp/Device.java | 31 ++
north-glass-erp/src/main/java/com/example/erp/entity/pp/WorkprogressMonthlySettlement.java | 33 ++
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 2
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java | 69 +++++
23 files changed, 717 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 223482d..20868dc 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -471,6 +471,12 @@
component: () => import('../views/pp/report/ProductionSchedule.vue'),
},
{
+ //娴佺▼鍗¤繘搴�
+ path: 'processCardProgress',
+ name: 'processCardProgress',
+ component: () => import('../views/pp/report/ProcessCardProgress.vue'),
+ },
+ {
//鍝佽川鎶ヨ〃
path: 'qualityReport',
name: 'qualityReport',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index e5ca6ad..266412f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -67,13 +67,13 @@
{ type: 'checkbox',fixed:"left", title: '閫夋嫨', width: 80 },
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{field: '鎺掍骇缂栧彿', title: '鎺掍骇缂栧彿', sortable: true, width: 120 },
- {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',slots: { filter: 'num1_filter' }, sortable: true, width: 100 },
- {field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О', sortable: true, width: 110},
- {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', sortable: true , width: 100},
+ {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 100 },
+ {field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 110},
+ {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 120},
{field: '搴忓彿', title: '搴忓彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90},
- {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sortable: true, width: 140},
- {field: '瀹�', title: '瀹�', sortable: true , width: 70},
- {field: '楂�', title: '楂�', sortable: true , width: 70},
+ {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 140},
+ {field: '瀹�', title: '瀹�', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 90},
+ {field: '楂�', title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true , width: 90},
{field: '鏁伴噺', title: '鏁伴噺', sortable: true , width: 70},
{field: '闈㈢Н', title: '闈㈢Н', sortable: true , width: 90},
{field: '鎺掍骇鏁伴噺' , width: 120,editRender: { name: 'input', attrs: { placeholder: '' } }, title: '鎺掍骇鏁伴噺', sortable: true},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index f298d8b..dffb0ef 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -68,7 +68,7 @@
{field: '娴佺▼鍗″彿', width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '浜у搧缂栧彿', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
+ {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: '鎬绘暟閲�', title: '鎬绘暟閲�', sortable: true},
{field: '鎬婚潰绉�', title: '鎬婚潰绉�', sortable: true},
{field: '鍒嗙鏁�', title: '鍒嗙鏁�', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
index 38a20fd..849a725 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
@@ -69,7 +69,7 @@
{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: '7',width: 100, title: '閿�鍞崟鍙�', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, 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},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
new file mode 100644
index 0000000..62cec04
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -0,0 +1,245 @@
+<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
+ }
+ }
+}
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+
+const gridOptions = reactive({
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe:true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'CustomerList',
+ showFooter: true,//鏄剧ず鑴�
+ printConfig: {},
+ importConfig: {},
+ exportConfig: {},
+ scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+ showOverflow:true,
+ columnConfig: {
+ resizable: true,
+ useKey: true
+ },
+ filterConfig: { //绛涢�夐厤缃」
+ remote: true
+ },
+ customConfig: {
+ storage: true
+ },
+ editConfig: {
+ trigger: 'click',
+ mode: 'row',
+ showStatus: true
+ },//琛ㄥご鍙傛暟
+ columns:[
+ {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+ {field: '1', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: '2',width: 130, title: '鍗曠墖鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '3', width: 120,title: '璁㈠崟绫诲瀷', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '4',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '5', width: 90,title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
+ {field: '6', width: 90,title: '鏁伴噺', sortable: true},
+ {field: '7',width: 90, title: '娆＄牬鏁伴噺', sortable: true},
+ {field: '8',width: 120, title: '鍒囧壊', sortable: true},
+ {field: '9',width: 120, title: '纾ㄨ竟', sortable: true},
+ {field: '10',width: 120, title: '閽㈠寲', sortable: true},
+ {field: '11',width: 120, title: '鍏ュ簱闈㈢Н', sortable: true},
+ ],//琛ㄥご鎸夐挳
+
+ toolbarConfig: {
+ // buttons: [{
+ //
+ // }],
+ import: false,
+ export: true,
+ print: true,
+ zoom: true,
+ custom: true
+ },
+ data: [
+ {
+ 1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 2:'10mm瓒呯櫧UD60骞抽挗(澶�)',
+ 3:'鏅�氳鍗�',
+ 4:'NG23052602A01/1',
+ 5:'1',
+ 6:'33',
+ 7:'1',
+ 8:'22',
+ 9:'22',
+ 10:'22',
+ 11:'314.13',
+ },
+ {
+ 1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 2:'10mm瓒呯櫧骞抽挗+12Ar(缁�)',
+ 3:'鏅�氳鍗�',
+ 4:'NG23052602A01/2',
+ 5:'2',
+ 6:'33',
+ 7:'1',
+ 8:'22',
+ 9:'22',
+ 10:'22',
+ 11:'314.13',
+ },
+ {
+ 1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
+ 2:'10mm瓒呯櫧骞抽挗(鍐�)',
+ 3:'鏅�氳鍗�',
+ 4:'NG23052602A01/3',
+ 5:'3',
+ 6:'33',
+ 7:'1',
+ 8:'22',
+ 9:'22',
+ 10:'22',
+ 11:'314.13',
+ },
+ ],//table body瀹為檯鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let footList=['7','8','9','10']
+ return[
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return '鍚堣:'
+ }
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
+
+})
+
+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: '',
+
+})
+
+const mergeCells = ref([
+ { row: 0, col: 1, rowspan: 3, colspan: 0},
+ { row: 3, col: 1, rowspan: 3, colspan: 0},
+
+ { row: 0, col: 6, rowspan: 3, colspan: 0},
+ { row: 3, col: 6, rowspan: 3, colspan: 0},
+
+])
+
+</script>
+
+<template>
+ <div class="main-div-customer">
+ <div id="selectForm">
+ <el-row :gutter="0">
+ <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>
+
+ <el-button type="primary">鏌ヨ</el-button>
+ </el-row>
+
+ </div>
+ <vxe-grid
+ max-height="100%"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ :merge-cells="mergeCells"
+
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <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>
+ <span>{{ row[item.field] }}</span>
+ </li>
+ </ul>
+ </template>
+
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <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>
+ </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)"/>
+ </div>
+ </div>
+ </template>
+
+
+ </vxe-grid>
+ </div>
+</template>
+
+<style scoped>
+.main-div-customer{
+ width: 99%;
+ height: 100%;
+}
+#selectForm {
+ width: 60%;
+ text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
index 20344a6..b9d9d7b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
@@ -62,7 +62,6 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{field: '1', width: 100, 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: 100,title: '褰㈢姸', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -217,7 +216,7 @@
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['7','11','12','13','14','15','16','17','18']
+ let footList=['11','12','13','14','15','16','17','18']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
@@ -262,6 +261,9 @@
})
const mergeCells = ref([
+ { row: 0, col: 1, rowspan: 3, colspan: 0},
+ { row: 3, col: 1, rowspan: 3, colspan: 0},
+
{ row: 0, col: 2, rowspan: 3, colspan: 0},
{ row: 3, col: 2, rowspan: 3, colspan: 0},
@@ -271,11 +273,8 @@
{ row: 0, col: 4, rowspan: 3, colspan: 0},
{ row: 3, col: 4, rowspan: 3, colspan: 0},
- { row: 0, col: 5, rowspan: 3, colspan: 0},
- { row: 3, col: 5, rowspan: 3, colspan: 0},
- { row: 0, col: 8, rowspan: 3, colspan: 0},
- { row: 3, col: 8, rowspan: 3, colspan: 0},
+
])
</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 1407a3c..c5dc4ba 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
@@ -49,6 +49,7 @@
<el-menu-item index="/main/report/WorkInProgress">鍦ㄥ埗鍝佹姤琛�</el-menu-item>
<el-menu-item index="/main/report/ProcessToBeCompleted">宸ュ簭寰呭畬鎴�</el-menu-item>
<el-menu-item index="/main/report/ProductionSchedule">鐢熶骇鍙戣揣杩涘害</el-menu-item>
+ <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">
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue b/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
index a675c4a..d66aad4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
@@ -67,7 +67,7 @@
{field: '2',width: 100, title: '搴忓彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '3', width: 100,title: '钀芥灦椤哄簭', sortable: true,},
{field: '4',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5', width: 100,title: '鎵规', sortable: true,showOverflow:"ellipsis"},
+ {field: '5', width: 100,title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: '6', width: 100,title: '妤煎眰缂栧彿', sortable: true},
{field: '7',width: 90, title: '瀹�', sortable: true},
{field: '8',width: 90, title: '楂�', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index e07d22a..6e3103f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -67,7 +67,7 @@
{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: '5', width: 100,title: '娴佺▼鍗″彿', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: '6', width: 100,title: '浜у搧澶х被', sortable: true},
{field: '7',width: 100, title: '浜у搧灏忕被', sortable: true},
{field: '8',width: 120, title: '鍦ㄥ埗鍝佸悕绉�', sortable: true,showOverflow:"ellipsis"},
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 710fd3c..dee16ff 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
@@ -67,7 +67,7 @@
{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: '5', width: 100,title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: '6', width: 100,title: '搴忓彿', sortable: true},
{field: '7',width: 100, title: '褰㈢姸', sortable: true},
{field: '8',width: 120, title: '妤煎眰缂栧彿', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 3d58161..8a62ae0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -68,7 +68,7 @@
{field: 'reportingWorkTime',width: 120, title: '鎶ュ伐鏃堕棿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'processCard', width: 130,title: '娴佺▼鍗″彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'entryName',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch', width: 100,title: '鎵规', sortable: true,showOverflow:"ellipsis"},
+ {field: 'batch', width: 100,title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'device', width: 100,title: '璁惧', sortable: true},
{field: 'thisProcess',width: 100, title: '鏈伐搴�', sortable: true},
{field: 'finishedNumber',width: 120, title: '鏈伐搴忓畬宸�', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
index e7b4593..ef5a882 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -70,7 +70,7 @@
{field: 'salesOrderNo',width: 120, title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'processCardNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'entryName', width: 120,title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch',width: 80, title: '鎵规', sortable: true,showOverflow:"ellipsis"},
+ {field: 'batch',width: 100, title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'serialNumber',width: 80, title: '搴忓彿', sortable: true},
{field: 'singlePieceName',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
{field: 'marking',width: 80, title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
index 28caba4..80a0380 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -83,7 +83,7 @@
{field: 'salesOrderNo',width: 120, title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'processCardNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'entryName', width: 120,title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch',width: 80, title: '鎵规', sortable: true,showOverflow:"ellipsis"},
+ {field: 'batch',width: 100, title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'serialNumber',width: 80, title: '搴忓彿', sortable: true},
{field: 'singlePieceName',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
{field: 'marking',width: 80, title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/BaseBom.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/BaseBom.java
new file mode 100644
index 0000000..19964e6
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/BaseBom.java
@@ -0,0 +1,47 @@
+package com.example.erp.entity.pp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
+
+public class BaseBom {
+ @TableId(type = IdType.AUTO)
+ //鑷id
+ private Integer id;
+ //浜у搧澶х被缂栧彿
+ private String productCategoriesId;
+ //澶х被鍚嶇О
+ private String productCategories;
+ //鍩烘暟
+ private Integer base;
+ //鐗╂枡缂栫爜
+ private String materialId;
+ //鐗╂枡鍚嶇О
+ private String materialName;
+ //涓诲崟浣�
+ private String mainUnit;
+ //鎹㈢畻鐜�
+ private String conversion;
+ //鍓崟浣�
+ private String deputyUnit;
+ //鏁伴噺
+ private String number;
+ //宸ュ簭
+ private String process;
+ //浜у湴
+ private String producingArea;
+ //瀹℃牳鐘舵��
+ private Integer reviewStatus;
+ //鍒涘缓浜�
+ private String founder;
+ //瀹℃牳浜�
+ private String reviewer;
+ //浣跨敤鐘舵��
+ private Integer state;
+ //寤虹珛鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/Device.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/Device.java
new file mode 100644
index 0000000..d98d39f
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/Device.java
@@ -0,0 +1,31 @@
+package com.example.erp.entity.pp;
+
+import java.time.LocalDate;
+
+public class Device {
+ //鑷ID
+ private Integer id;
+ //璁惧缂栧彿
+ private String deviceId;
+ //鏍囧噯鍚嶇О
+ private String standardName;
+ //璁惧鍚嶇О
+ private String deviceName;
+ //璐拱鏃堕棿
+ private LocalDate purchaseTime;
+ //瀹夎鏃堕棿
+ private LocalDate installTime;
+ //浣跨敤鍛ㄦ湡(骞�)
+ private Integer lifeCycle;
+ //浣跨敤鐘舵��
+ private Integer useState;
+ //鎵�鍦ㄥ伐鑹�
+ private String process;
+ //浣滃簾鐘舵��
+ private String cancelState;
+ //鍒涘缓鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
new file mode 100644
index 0000000..a9cd2c5
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
@@ -0,0 +1,36 @@
+package com.example.erp.entity.pp;
+
+import java.time.LocalDate;
+
+public class DeviceMaintenance {
+ //鑷id
+ private Integer id;
+ //璁惧缂栧彿
+ private String deviceId;
+ //绫诲瀷
+ private Integer type;
+ //鏁呴殰鏃ユ湡
+ private LocalDate faultTime;
+ //鏁呴殰鍘熷洜
+ private String faultReason;
+ //淇濆吇鏃ユ湡
+ private LocalDate maintenanceTime;
+ //淇濆吇璇存槑
+ private String maintenanceIllustrate;
+ //缁翠慨/淇濆吇寮�濮嬫椂闂�
+ private LocalDate startTime;
+ //缁翠慨/淇濆吇缁撴潫鏃堕棿
+ private LocalDate stopTime;
+ //缁翠慨/淇濆吇浜哄憳
+ private String personnel;
+ //璐圭敤
+ private String cost;
+ //鍒涘缓鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+ //澶栭敭璁惧琛�
+ private Device device;
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
new file mode 100644
index 0000000..aed3c54
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
@@ -0,0 +1,61 @@
+package com.example.erp.entity.pp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
+
+public class FlowCard {
+ @TableId(type = IdType.AUTO)
+ //鑷id
+ private Integer id;
+ //閿�鍞崟鍙�
+ private String orderId;
+ //鐢熶骇璁㈠崟鍙�
+ private String productionId;
+ //娴佺▼鍗″彿
+ private String processId;
+ //搴忓彿
+ private Integer orderNumber;
+ //宸ヨ壓纭搴忓彿
+ private Integer technologyNumber;
+ //宸蹭紭鍖栨暟閲�
+ private Integer optimizeQuantity;
+ //鎺掔増鐘舵��
+ private Integer layoutStatus;
+ //琛ョ墖鏁伴噺
+ private Integer numberPatches;
+ //搴撳瓨鏁伴噺
+ private Integer inventoryQuantity;
+ //宸插叆鏁伴噺
+ private Integer receivedQuantity;
+ //琛ョ墖缂栧彿
+ private String patchId;
+ //宸ョ▼鍗犵敤
+ private Integer engineeringOccupancy;
+ //搴撳瓨鏁伴噺
+ private Integer inventoryNumber;
+ //鍏ュ簱鏃堕棿
+ private LocalDate storageTime;
+ //鐢熶骇缁堟鐘舵��
+ private Integer terminationStatus;
+ //鎵撳嵃鐘舵��
+ private Integer printStatus;
+ //澶囩敤閿�
+ private String alternateKey;
+ //鍒嗘灦鍛�
+ private String founder;
+ //鍒嗘灦鏃堕棿
+ private LocalDate splitFrameTime;
+ //寤虹珛鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+ //澶栭敭璁㈠崟琛�
+// private Order order;
+// //澶栭敭璁㈠崟鏄庣粏琛�
+// private OrderDetail orderDetail;
+// //澶栭敭璁㈠崟宸ヨ壓瀹℃牳琛�
+// private orderGlassDetail orderGlassDetail;
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/OrderBom.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/OrderBom.java
new file mode 100644
index 0000000..ceb7d2d
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/OrderBom.java
@@ -0,0 +1,45 @@
+package com.example.erp.entity.pp;
+
+import java.time.LocalDate;
+
+public class OrderBom {
+ //鑷ID
+ private Integer id;
+ //閿�鍞崟鍙�
+ private String orderId;
+ //浜у搧缂栧彿
+ private String prodId;
+ //浜у搧鍚嶇О
+ private String productName;
+ //浜у搧鏁伴噺
+ private Integer number;
+ //宸ュ簭
+ private String process;
+ //鐗╂枡缂栫爜
+ private String materialId;
+ //鐗╂枡鍚嶇О
+ private String materialName;
+ //鐗╂枡鏁伴噺
+ private Integer materialNumber;
+ //浜у湴
+ private String producingArea;
+ //閲囪喘鏁伴噺
+ private Integer purchaseQuantity;
+ //瀹℃牳鐘舵��
+ private Integer reviewStatus;
+ //閲囪喘鐘舵��
+ private Integer procureStatus;
+ //閲囪喘鍗曞彿
+ private String procureId;
+ //鍗曚环
+ private String unitPrice;
+ //渚涘簲鍟嗙姸鎬�
+ private Integer supplierStatus;
+ //璁″垝鏃ユ湡
+ private LocalDate scheduleDate;
+ //寤虹珛鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
new file mode 100644
index 0000000..d12051e
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
@@ -0,0 +1,69 @@
+package com.example.erp.entity.pp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
+
+public class ReportingWork {
+ @TableId(type = IdType.AUTO)
+ //鑷id
+ private Integer id;
+ //鎶ュ伐缂栧彿
+ private String reportingWorkId;
+ //閿�鍞崟鍙�
+ private String orderId;
+ //鐢熶骇璁㈠崟鍙�
+ private String productionId;
+ //娴佺▼鍗″彿
+ private String processId;
+ //璁惧缂栧彿
+ private String deviceId;
+ //璁惧鍚嶇О
+ private String deviceName;
+ //涓婂伐搴�
+ private String previousProcess;
+ //涓婂伐搴忔暟閲�
+ private Integer previousProcessQuantity;
+ //鏈伐搴�
+ private String thisProcess;
+ //涓婂伐搴忔暟閲�
+ private Integer thisProcessQuantity;
+ //鏈伐搴忓畬宸ユ暟閲�
+ private Integer thisCompletedQuantity;
+ //鏈伐搴忔鐮存暟閲�
+ private Integer thisWornQuantity;
+ //涓嬪伐搴�
+ private String nextProcess;
+ //鐝
+ private String classes;
+ //鐝粍缂栧彿
+ private String teamsgroupsId;
+ //鐝粍鍚嶇О
+ private String teamsgroupsName;
+ //鎶ュ伐鐘舵��
+ private Integer reportingWorkState;
+ //瀹℃牳浜�
+ private String reviewed;
+ //瀹℃牳鐘舵��
+ private Integer reviewedState;
+ //澶囨敞
+ private String notes;
+ //璐ㄦ鍛�
+ private String qualityInsPector;
+ //鍖呰鏂瑰紡
+ private String packagingMethod;
+ //鎶ュ伐鏃堕棿
+ private LocalDate reportingWorkTime;
+ //瀹℃牳鏃堕棿
+ private LocalDate examineTime;
+ //璐ㄦ鏃堕棿
+ private LocalDate qualityInsTime;
+ //寤虹珛鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+ //澶栭敭娴佺▼鍗¤〃
+ private FlowCard flowCard;
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
new file mode 100644
index 0000000..0d2ca2b
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
@@ -0,0 +1,44 @@
+package com.example.erp.entity.pp;
+
+public class ReportingWorkDetail {
+ //鑷ID
+ private Integer id;
+ //鎶ュ伐缂栧彿
+ private String reportingWorkId;
+ //浜у搧搴忓彿
+ private String orderNumber;
+ //宸ヨ壓纭搴忓彿
+ private String technologyNumber;
+ //瀹屽伐鏁伴噺
+ private Integer completedQuantity;
+ //娆＄牬鏁伴噺
+ private Integer breakageNumber;
+ //娆＄牬鍘熷洜
+ private String breakageReason;
+ //鍙埄鐢�
+ private Integer available;
+ //閫�鍥炲伐搴�
+ private String returnProcess;
+ //璐ｄ换宸ュ簭
+ private String responsibleProcess;
+ //璐ｄ换浜哄憳
+ private String responsiblePersonnel;
+ //璐ｄ换鐝粍
+ private String responsibleTeam;
+ //璐ｄ换璁惧
+ private String responsibleEquipment;
+ //璐ㄦ鍛�
+ private String qualityInspector;
+ //琛ョ墖鐘舵��
+ private Integer patchStatus;
+ //鍦ㄥ埗鍝佸悕绉�
+ private String workProgress;
+ //璐ㄦ鐘舵��
+ private Integer qualityInsStatus;
+ //鎶ュ伐绫诲瀷
+ private Integer type;
+
+ //澶栭敭鎶ュ伐涓昏〃
+ private ReportingWork reportingWork;
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java
new file mode 100644
index 0000000..7a5aa60
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java
@@ -0,0 +1,35 @@
+package com.example.erp.entity.pp;
+
+import java.time.LocalDate;
+
+public class Rework {
+ //鑷id
+ private Integer id;
+ //杩斿伐缂栧彿
+ private String reworkId;
+ //娴佺▼鍗″彿
+ private String processId;
+ //杩斿伐绫诲瀷
+ private String reworkType;
+ //杩斿伐鍘熷洜
+ private String reworkReason;
+ //杩斿伐宸ュ簭
+ private String reworkProcesses;
+ //杩斿伐鏁伴噺
+ private Integer reworkNum;
+ //杩斿伐闈㈢Н
+ private Double reworkArea;
+ //杩斿伐鐝粍
+ private String reworkTeam;
+ //瀹℃牳浜�
+ private String reviewer;
+ //瀹℃牳鐘舵��
+ private Integer reviewStatus;
+ //鍒涘缓鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+ //澶栭敭娴佺▼鍗¤〃
+ private FlowCard flowCard;
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/SetupBom.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/SetupBom.java
new file mode 100644
index 0000000..fae37e6
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/SetupBom.java
@@ -0,0 +1,45 @@
+package com.example.erp.entity.pp;
+
+import java.time.LocalDate;
+
+public class SetupBom {
+ //鑷ID
+ private Integer id;
+ //浜у搧缂栧彿
+ private String prodId;
+ //浜у搧鍚嶇О
+ private String productName;
+ //鍩烘暟
+ private Integer base;
+ ///鐗╂枡缂栫爜
+ private String materialID;
+ //鐗╂枡鍚嶇О
+ private String materialName;
+ //鍗曚綅
+ private String unit;
+ //鎹㈢畻鐜�
+ private String conversion;
+ //鍗曚綅2
+ private String unit2;
+ //鏁伴噺
+ private Integer number;
+ //宸ュ簭
+ private String process;
+ //浜у湴
+ private String producingArea;
+ //瀹℃牳鐘舵��
+ private Integer reviewStatus;
+ //鍒涘缓浜�
+ private String founder;
+ //瀹℃牳浜�
+ private String reviewer;
+ //浣跨敤鐘舵��
+ private Integer state;
+ //鐢熶骇鐘舵��
+ private Integer productionStatus;
+ //寤虹珛鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/WorkprogressMonthlySettlement.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/WorkprogressMonthlySettlement.java
new file mode 100644
index 0000000..5741d9c
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/WorkprogressMonthlySettlement.java
@@ -0,0 +1,33 @@
+package com.example.erp.entity.pp;
+
+import java.time.LocalDate;
+
+public class WorkprogressMonthlySettlement {
+ //鑷ID
+ private Integer id;
+ //浜у搧缂栧彿
+ private String prodId;
+ //浜у搧鍚嶇О
+ private String productName;
+ //鍔犲伐瑕佹眰
+ private String processingNote;
+ //宸ュ簭
+ private String process;
+ //瀹�
+ private Double width;
+ //楂�
+ private Double height;
+ //鍘氬害
+ private Double thickness;
+ //鍗曚环
+ private Double price;
+ //鎬婚噾棰�
+ private Double grossAmount;
+ //鏈堢粨鏃ユ湡
+ private LocalDate monthlyClosingDate;
+ //寤虹珛鏃堕棿
+ private LocalDate createTime;
+ //淇敼鏃堕棿
+ private LocalDate updateTime;
+
+}
--
Gitblit v1.8.0