From b64211f3002ec0f620d3e9bbd70f5d5991a72b59 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 30 一月 2024 10:43:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml | 21 +
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java | 11 +
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java | 13 +
north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml | 66 ++++++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java | 25 ++
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue | 1
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java | 4
north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml | 66 ++++++
north-glass-erp/northglass-erp/src/views/pp/rework/Rework.vue | 4
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java | 4
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue | 349 +++++++++++++++++++++++--------
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 29 ++
north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml | 21 +
13 files changed, 522 insertions(+), 92 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
index c1ad059..f8a96f2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -283,6 +283,7 @@
<el-button type="primary">鏌ヨ</el-button>
</el-row>
</div>
+
<vxe-grid
max-height="100%"
@filter-change="filterChanged"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/Rework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/Rework.vue
index 652261a..1a1bea4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/Rework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/Rework.vue
@@ -52,7 +52,7 @@
/*main-body鏍峰紡*/
#main-body{
width: 99%;
- height: 92%;
- margin-top: 1%;
+ height: 95%;
+ /*margin-top: 1%;*/
}
</style>
\ No newline at end of file
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..f2a2195 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
@@ -1,9 +1,12 @@
<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 {ElMessage} from "element-plus";
+let router = useRouter()
+const dateValue = ref("");//鏌ヨ鏃ユ湡
const dialogFormVisible = ref(false)
const formLabelWidth = '140px'
@@ -17,19 +20,19 @@
resource: '',
desc: '',
})
-const getTableRow = (row,type) =>{
+const getTableRow = (row, type) => {
switch (type) {
- case 'edit' :{
+ case 'edit' : {
console.log(type)
- // router.push({path: '/main/Rework/SelectRework', query: { id: row.id }})
+ // router.push({path: '/main/Rework/SelectRework', query: { id: row.id }})
break
}
- case 'delete':{
+ case 'delete': {
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
- case 'setType':{
+ case 'setType': {
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
break
}
@@ -48,18 +51,18 @@
//瀛愮粍浠舵帴鏀跺弬鏁�
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
@@ -75,31 +78,43 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'reworkNumber',width: 120, title: '杩斿伐缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {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: 'serialNumber',width: 80, title: '搴忓彿', sortable: true},
- {field: 'singlePieceName',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
- {field: 'marking',width: 80, title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
- {field: 'pieces',width: 90, title: '鐗囨爣璁�', sortable: true},
- {field: 'number',width: 80, title: '鏁伴噺', sortable: true},
- {field: 'width',width: 80, title: '瀹�', sortable: true},
- {field: 'height',width: 80, title: '楂�', sortable: true},
- {field: 'shape',width: 80, title: '褰㈢姸', sortable: true},
- {field: 'type',width: 100, title: '杩斿伐绫诲瀷', sortable: true},
- {field: 'damage',width: 120, title: '杩斿伐鍘熷洜', sortable: true},
- {field: 'device',width: 120, title: '璐ｄ换璁惧', sortable: true},
- {field: 'teams',width: 120, title: '璐ｄ换鐝粍', sortable: true},
- {field: 'area',width: 120, title: '杩斿伐闈㈢Н', sortable: true},
- {field: 'reworkProcess',width: 120, title: '杩斿伐宸ュ簭', sortable: true},
- {field: 'reworkTeams',width: 120, title: '杩斿伐鐝粍', sortable: true},
- {field: 'qualityInspector',width: 100, title: '璐ㄦ鍛�', sortable: true}
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: '鎿嶄綔', width: 110, slots: {default: 'button_slot'}, fixed: "left"},
+ {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {
+ field: 'reworkNumber',
+ width: 120,
+ title: '杩斿伐缂栧彿',
+ filters: [{data: ''}],/*slots: { filter: 'num1_filter' } ,*/
+ },
+ {
+ field: 'salesOrderNo',
+ width: 120,
+ title: '閿�鍞崟鍙�',
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'}
+ },
+ {field: 'processCardNo', width: 120, title: '娴佺▼鍗″彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'entryName', width: 120, title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'batch', width: 80, title: '鎵规', showOverflow: "ellipsis"},
+ {field: 'serialNumber', width: 80, title: '搴忓彿'},
+ {field: 'singlePieceName', width: 120, title: '鍗曠墖鍚嶇О'},
+ {field: 'marking', width: 80, title: '鏍囪', showOverflow: "ellipsis"},
+ {field: 'pieces', width: 90, title: '鐗囨爣璁�'},
+ {field: 'number', width: 80, title: '鏁伴噺'},
+ {field: 'width', width: 80, title: '瀹�'},
+ {field: 'height', width: 80, title: '楂�'},
+ {field: 'shape', width: 80, title: '褰㈢姸'},
+ {field: 'type', width: 100, title: '杩斿伐绫诲瀷'},
+ {field: 'damage', width: 120, title: '杩斿伐鍘熷洜'},
+ {field: 'device', width: 120, title: '璐ｄ换璁惧'},
+ {field: 'teams', width: 120, title: '璐ｄ换鐝粍'},
+ {field: 'area', width: 120, title: '杩斿伐闈㈢Н'},
+ {field: 'reworkProcess', width: 120, title: '杩斿伐宸ュ簭'},
+ {field: 'reworkTeams', width: 120, title: '杩斿伐鐝粍'},
+ {field: 'qualityInspector', width: 100, title: '璐ㄦ鍛�'}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -112,58 +127,58 @@
zoom: true,
custom: true
},
- data: [
+ data: [
{
- reworkNumber:'FG20202020',
- salesOrderNo:'NG23010101',
- processCardNo:'NG23010101A01',
- entryName:'xxxx',
- batch:'浜屾壒涓�',
- serialNumber:'1',
- area:'23.11',
- qualityInspector:"寮犱笁",
- number:'1',
+ reworkNumber: 'FG20202020',
+ salesOrderNo: 'NG23010101',
+ processCardNo: 'NG23010101A01',
+ entryName: 'xxxx',
+ batch: '浜屾壒涓�',
+ serialNumber: '1',
+ area: '23.11',
+ qualityInspector: "寮犱笁",
+ number: '1',
singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
marking: '1',
pieces: '(澶�)',
width: '575',
- height:"2241",
+ height: "2241",
shape: '鏅舰',
- reworkTeams:'XX浜岀彮',
+ reworkTeams: 'XX浜岀彮',
type: '鏈哄櫒',
- damage:'姘旀场瓒呮爣',
- reworkProcess:'XXXX',
- device:'XXX'
+ damage: '姘旀场瓒呮爣',
+ reworkProcess: 'XXXX',
+ device: 'XXX'
},
{
- reworkNumber:'FG20203333',
- salesOrderNo:'NG23010101',
- processCardNo:'NG23010101A01',
- entryName:'xxxx',
- batch:'浜屾壒涓�',
- serialNumber:'1',
- area:'23.11',
- qualityInspector:"寮犱笁",
- number:'1',
+ reworkNumber: 'FG20203333',
+ salesOrderNo: 'NG23010101',
+ processCardNo: 'NG23010101A01',
+ entryName: 'xxxx',
+ batch: '浜屾壒涓�',
+ serialNumber: '1',
+ area: '23.11',
+ qualityInspector: "寮犱笁",
+ number: '1',
singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
marking: '1',
pieces: '(澶�)',
width: '575',
- height:"2241",
+ height: "2241",
shape: '鏅舰',
- reworkTeams:'XX浜岀彮',
+ reworkTeams: 'XX浜岀彮',
type: '鏈哄櫒',
- damage:'姘旀场瓒呮爣',
- reworkProcess:'XXXX',
- device:'XXX'
+ damage: '姘旀场瓒呮爣',
+ reworkProcess: 'XXXX',
+ device: 'XXX'
},
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['number','area']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['number', 'area']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '鍚堣:'
@@ -174,9 +189,146 @@
return ''
})
]
- }
+ }, mergeFooterItems: [
+ {row: 0, col: 0, rowspan: 1, colspan: 2}
+ ],//鍚堝苟鑴�
})
+
+
+/*鏌ヨ*/
+const queryData=()=>{
+
+/* if(dateValue.value===""){
+ MessageShow("鏈�夋嫨鏃堕棿锛岃閫夋嫨鏃堕棿鍚庡啀娆¤繘琛屾煡璇�","warning");
+ return;
+ }*/
+
+
+ /*else{
+
+ MessageShow(dateValue);
+ }
+
+
+ console.log(filterData.value);*/
+ //MessageShow(`/Rework/1/100/`+dateValue.value[0]+"/"+dateValue.value[1]+"\r\n"+filterData.value);
+ /*console.log(`/Rework/1/100/`+dateValue.value);
+ debugger*/
+ request.post(`/rework/query/1/100/${dateValue.value[0]}/${dateValue.value[1]}`).then((res) => {
+
+
+ console.log(res);
+ MessageShow(res);
+ if(res.code===200){
+ pageTotal.value=res.data.total
+ xGrid.value.loadData(res.data.data)
+
+
+
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+
+}
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+
+})
+
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal=ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum=$ref(1)
+let pageState = null
+
+//瀹氫箟婊氬姩鏉￠珮搴�
+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
+}
+
+/*鏃堕棿妗嗗揩閫熼�夋嫨*/
+const shortcuts = [
+ {
+ text: '杩戜竴鍛�',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+ return [start, end]
+ },
+ },
+ {
+ text: '杩戜竴涓湀',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+ return [start, end]
+ },
+ },
+ {
+ text: '杩戜笁涓湀',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+ return [start, end]
+ },
+ },
+]
+
+const MessageShow = (content, type = 'success') => {
+ ElMessage({
+ message: content,
+ type: type,
+ showClose: true,
+ })
+}
+
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+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
+ }
+request.post("/product/1/100/"+productGlassTypeStore.GlassType,filterData.value).then((res) => {
+ if(res.code==200){
+ pageTotal.value=res.data.total
+ pageNum=1
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })*/
+}
@@ -184,32 +336,45 @@
<template>
<div class="main-div-customer">
- <div id="head" >
- <el-row :gutter="0">
- <el-date-picker
- v-model="value"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- />
-
- <el-button type="primary">鏌ヨ</el-button>
+ <el-header height="auto" style="padding: 0;margin:0">
+ <el-row :gutter="0" style="margin-bottom: 5px">
+ <el-col :span="7">
+ <el-date-picker
+ v-model="dateValue"
+ type="daterange"
+ unlink-panels
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :shortcuts="shortcuts"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ width:99%
+ />
+ </el-col>
+
+ <el-col :span="2">
+ <el-button type="primary" @click="queryData()">鏌ヨ</el-button>
+ </el-col>
</el-row>
- </div>
+ </el-header>
+
+
<vxe-grid
max-height="100%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
+ @scroll ="scrollEvnt"
>
<!-- @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>
+ <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>
@@ -231,15 +396,17 @@
</vxe-grid>
+
+
<el-dialog v-model="dialogFormVisible" title="杩斿伐缂栬緫">
<el-form :model="form">
<el-form-item label="杩斿伐缂栧彿" :label-width="formLabelWidth">
- <el-input v-model="form.name" disabled autocomplete="off" style="width: 200px"/>
+ <el-input v-model="form.name" disabled autocomplete="off" style="width: 200px"/>
</el-form-item>
<el-form-item label="杩斿伐鐝粍" :label-width="formLabelWidth">
<el-select v-model="form.region" placeholder="鐝粍涓�" style="width: 200px">
- <el-option label="鐝粍涓�" value="shanghai" />
- <el-option label="鐝粍浜�" value="beijing" />
+ <el-option label="鐝粍涓�" value="shanghai"/>
+ <el-option label="鐝粍浜�" value="beijing"/>
</el-select>
</el-form-item>
</el-form>
@@ -253,15 +420,17 @@
</template>
</el-dialog>
</div>
+
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
- height: 100%;
+ height: 98%;
}
-#head{
- width:40%;
+:deep(.el-col div) {
+ font-weight: bold;
+ width: 99%;
}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java
new file mode 100644
index 0000000..fcd98ef
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java
@@ -0,0 +1,4 @@
+package com.example.erp.controller.pp;
+
+public class ReportWorkController {
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
new file mode 100644
index 0000000..f7a4d0d
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
@@ -0,0 +1,25 @@
+package com.example.erp.controller.pp;
+
+import com.example.erp.common.Result;
+import com.example.erp.service.pp.ReworkService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/rework")
+public class ReworkController {
+
+ @Autowired
+ ReworkService reworkService;
+
+ @PostMapping("/query/{pageNum}/{pageSize}/{startTime}/{endTime}")
+ public Result queryRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,
+ @PathVariable String startTime,@PathVariable String endTime
+ ){
+
+ return Result.seccess(reworkService.queryRework(pageNum,pageSize,startTime,endTime,null));
+ }
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
new file mode 100644
index 0000000..09fa243
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
@@ -0,0 +1,11 @@
+package com.example.erp.mapper.pp;
+
+
+import com.example.erp.entity.pp.ReportingWorkDetail;
+
+import java.util.List;
+
+public interface ReportingWorkDetailMapper {
+ /*List<ReportingWorkDetail> getDetail();*/
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java
new file mode 100644
index 0000000..5be6e5c
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java
@@ -0,0 +1,13 @@
+package com.example.erp.mapper.pp;
+
+import com.example.erp.entity.pp.Rework;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ReworkMapper {
+
+ List<Rework> queryRework(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startTime,String endTime,Rework rework);
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
new file mode 100644
index 0000000..822e566
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
@@ -0,0 +1,4 @@
+package com.example.erp.service.pp;
+
+public class ReportWorkService {
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
new file mode 100644
index 0000000..d0e4168
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
@@ -0,0 +1,29 @@
+package com.example.erp.service.pp;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.entity.pp.Rework;
+import com.example.erp.mapper.pp.ReworkMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+@DS("pp")
+public class ReworkService {
+ @Autowired
+ ReworkMapper reworkMapper;
+
+ /*鏌ヨ杩斿伐鏁版嵁*/
+ public Map<String,Object> queryRework(Integer pageNum, Integer pageSize,String startTime,String endTime,Rework rework) {
+ Integer offset = (pageNum-1)*pageSize;
+
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reworkMapper.queryRework(offset,pageSize,startTime,endTime,rework));
+ return map;
+ }
+}
+
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
new file mode 100644
index 0000000..0a4e259
--- /dev/null
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.mapper.pp.ReportingWorkDetailMapper">
+ <resultMap id="reworkAdd" type="com.example.erp.entity.pp.ReportingWorkDetail">
+
+
+
+ </resultMap>
+
+
+ <!--鑾峰彇琛ョ墖鏁版嵁-->
+ <select id="getDetail">
+ select
+ *
+ from
+ reporting_work_detail
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
new file mode 100644
index 0000000..c9ea9ce
--- /dev/null
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--杩斿伐鏁版嵁-->
+
+<mapper namespace="com.example.erp.mapper.pp.ReworkMapper">
+ <resultMap id="reworkDataTitle" type="com.example.erp.entity.pp.Rework">
+
+
+ </resultMap>
+
+
+ <!--鑾峰彇杩斿伐鏁版嵁-->
+ <select id="queryRework" resultMap="reworkDataTitle">
+ select * from rework
+ <!--<where>
+
+ create_time <![CDATA[>=]]> #{startTime} and create_time <![CDATA[<=]]> #{endTime}}
+ <!–杩斿伐缂栧彿–>
+ <if test="rework_id!=null and rework != ''">
+ and rework_id = #{reworkId}
+ </if>
+ <!–娴佺▼鍗″彿–>
+ <if test="process_id != null and process_id != ''">
+ and process_id=#{processId}
+ </if>
+ <!–杩斿伐绫诲瀷–>
+ <if test="rework_Type != null and rework_Type!=''">
+ and rework_Type=#{rework_Type}
+ </if>
+ <!–杩斿伐鍘熷洜–>
+ <if test="rework_Reason != null and rework_Reason!=''">
+ and rework_Reason=#{rework_Reason}
+ </if>
+ <!–杩斿伐宸ュ簭–>
+ <if test="rework_Processes != null and rework_Processes!=''">
+ and rework_Processes=#{rework_Processes}
+ </if>
+ <!–杩斿伐鏁伴噺–>
+ <if test="rework_Num != null and rework_Num!=''">
+ and rework_Num=#{rework_Num}
+ </if>
+ <!–杩斿伐鐝粍–>
+ <if test="rework_Team != null and rework_Team!=''">
+ and rework_Team=#{rework_Team}
+ </if>
+ <!–瀹℃牳浜�–>
+ <if test="reviewer != null and reviewer!=''">
+ and reviewer=#{reviewer}
+ </if>
+ <!–瀹℃牳鐘舵��–>
+ <if test="review_Status != null and review_Status!=''">
+ and review_Status=#{review_Status}
+ </if>
+ <!–杩斿伐闈㈢Н–>
+ <if test="rework_Area != null and rework_Area!=''">
+ and rework_Area=#{rework_Area}
+ </if>
+
+ </where>-->
+
+ </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml b/north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml
new file mode 100644
index 0000000..0a4e259
--- /dev/null
+++ b/north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.mapper.pp.ReportingWorkDetailMapper">
+ <resultMap id="reworkAdd" type="com.example.erp.entity.pp.ReportingWorkDetail">
+
+
+
+ </resultMap>
+
+
+ <!--鑾峰彇琛ョ墖鏁版嵁-->
+ <select id="getDetail">
+ select
+ *
+ from
+ reporting_work_detail
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml b/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
new file mode 100644
index 0000000..c9ea9ce
--- /dev/null
+++ b/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--杩斿伐鏁版嵁-->
+
+<mapper namespace="com.example.erp.mapper.pp.ReworkMapper">
+ <resultMap id="reworkDataTitle" type="com.example.erp.entity.pp.Rework">
+
+
+ </resultMap>
+
+
+ <!--鑾峰彇杩斿伐鏁版嵁-->
+ <select id="queryRework" resultMap="reworkDataTitle">
+ select * from rework
+ <!--<where>
+
+ create_time <![CDATA[>=]]> #{startTime} and create_time <![CDATA[<=]]> #{endTime}}
+ <!–杩斿伐缂栧彿–>
+ <if test="rework_id!=null and rework != ''">
+ and rework_id = #{reworkId}
+ </if>
+ <!–娴佺▼鍗″彿–>
+ <if test="process_id != null and process_id != ''">
+ and process_id=#{processId}
+ </if>
+ <!–杩斿伐绫诲瀷–>
+ <if test="rework_Type != null and rework_Type!=''">
+ and rework_Type=#{rework_Type}
+ </if>
+ <!–杩斿伐鍘熷洜–>
+ <if test="rework_Reason != null and rework_Reason!=''">
+ and rework_Reason=#{rework_Reason}
+ </if>
+ <!–杩斿伐宸ュ簭–>
+ <if test="rework_Processes != null and rework_Processes!=''">
+ and rework_Processes=#{rework_Processes}
+ </if>
+ <!–杩斿伐鏁伴噺–>
+ <if test="rework_Num != null and rework_Num!=''">
+ and rework_Num=#{rework_Num}
+ </if>
+ <!–杩斿伐鐝粍–>
+ <if test="rework_Team != null and rework_Team!=''">
+ and rework_Team=#{rework_Team}
+ </if>
+ <!–瀹℃牳浜�–>
+ <if test="reviewer != null and reviewer!=''">
+ and reviewer=#{reviewer}
+ </if>
+ <!–瀹℃牳鐘舵��–>
+ <if test="review_Status != null and review_Status!=''">
+ and review_Status=#{review_Status}
+ </if>
+ <!–杩斿伐闈㈢Н–>
+ <if test="rework_Area != null and rework_Area!=''">
+ and rework_Area=#{rework_Area}
+ </if>
+
+ </where>-->
+
+ </select>
+
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0