From 8202686b06680db9b82d4a99a31dc7f9dca4ee86 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 四月 2024 08:20:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 2
north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java | 2
north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue | 10 +
north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue | 155 +++++++++------------
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 4
north-glass-erp/target/classes/mapper/pp/FolwCard.xml | 17 -
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 2
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue | 16 +
north-glass-erp/target/classes/mapper/sd/OrderDetail.xml | 56 +++++++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 17 -
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 4
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 9
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 12 +
north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java | 8
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 6
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 6
north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml | 56 +++++++
north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue | 10 -
19 files changed, 230 insertions(+), 164 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
index f18bce5..93d46f5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -48,16 +48,6 @@
return count.toFixed(2)
}
-//棣栨鍔犺浇
-request.post(`/maintenance/selectMaintenance`).then((res) => {
- if (res.code === 200) {
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
-})
//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index ab7fd0a..de7e907 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -171,7 +171,7 @@
{type: 'checkbox', fixed: "left", title: t('basicData.check')},
{
field: 'orderNumber',
- title: t('basicData.check'),
+ title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -288,7 +288,7 @@
},
{
field: 'landingSequence',
- title: t('processCard.technologyNumber'),
+ title: '钀芥灦椤哄簭',
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
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 38e8fa5..3c8ba1d 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
@@ -113,10 +113,10 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�3澶╁墠
const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
.toISOString()
.replace('T', ' ')
@@ -129,7 +129,7 @@
addListener(xGrid.value,gridOptions)
})
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+//绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
@@ -546,7 +546,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
case 'copyAll' :{
@@ -560,7 +559,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
case 'clearChecked' :{
@@ -573,7 +571,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 3e96af6..dab4cd4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -138,6 +138,8 @@
{field: 'order_number', title: '璁㈠崟搴忓彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
{field: 'technology_number', title: '灏忕墖椤哄簭' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
{field: 'quantity', title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
+ {field: 'child_width', title: '瀹�', },
+ {field: 'child_height', title: '楂�', },
{field: 'area', title: '闈㈢Н' ,showOverflow:"ellipsis"},
{field: 'product_name', title: '浜у搧鍚嶇О', },
{field: 'glass_child', title: '鍗曠墖鍚嶇О', },
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
index cbd78d3..7be61b3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
@@ -3,31 +3,21 @@
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElDatePicker, ElMessage} from "element-plus"
-import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
-import {Search} from "@element-plus/icons-vue"
-import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
-import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
-import {VXETable} from "vxe-table";
-import { useI18n } from 'vue-i18n'
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
//璇█鑾峰彇
-const { t } = useI18n()
-let router=useRouter()
-const getTableRow = (row,type) =>{
+const {t} = useI18n()
+let router = useRouter()
+const getTableRow = (row, type) => {
switch (type) {
- case 'edit' :{
+ case 'edit' : {
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/processCard/AddProcessCard', query: { orderId: row.orderId,productionId:row.orderGlassDetail.productionId }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
+ router.push({
+ path: '/main/processCard/AddProcessCard',
+ query: {orderId: row.orderId, productionId: row.orderGlassDetail.productionId}
+ })
break
}
}
@@ -50,10 +40,10 @@
orderGlassDetail: {
productionId: '',
},
- orderDetail:{
- orderId:'',
- productId:'',
- productName:'',
+ orderDetail: {
+ orderId: '',
+ productId: '',
+ productName: '',
}
@@ -66,17 +56,16 @@
let pageNum = $ref(1)
let pageState = null
-const { currentRoute } = useRouter()
+const {currentRoute} = useRouter()
const route = currentRoute.value
-let id=route.query.orderId
+let id = route.query.orderId
+// 绗竴娆″姞杞芥煡璇�
request.post(`/processCard/detailsSelect/${id}`, filterData.value).then((res) => {
if (res.code == 200) {
- pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
- console.log('produceList', produceList)
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -94,45 +83,12 @@
}
-/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
-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(`/processCard/detailsSelect/${id}`, filterData.value).then((res) => {
- if (res.code == 200) {
- pageTotal.value = res.data.total
- produceList = deepClone(res.data.data)
-
- xGrid.value.loadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
const hasDecimal = (value) => {
const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
return regex.test(value); // 杩斿洖true/false
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
const gridOptions = reactive({
loading: true,
@@ -140,7 +96,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'demo_1',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -154,7 +110,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -164,17 +120,42 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
- {field: 'orderId', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
- {field: 'orderGlassDetail.productionId', title: t('workOrder.productionId'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productId', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'orderDetail.quantity', title: t('order.quantity'),showOverflow:"ellipsis"},
- {field: 'orderDetail.computeGrossArea', title: t('order.area'), },
- {field: 'orderDetail.perimeter', title: t('workOrder.perimeter'),},
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: t('basicData.operate'), width: 80, slots: {default: 'button_slot'}, fixed: "left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {
+ field: 'order_id',
+ title: t('order.orderId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'production_id',
+ title: t('workOrder.productionId'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'product_id',
+ title: t('order.productId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'product_name',
+ title: t('order.product'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'quantity', title: t('order.quantity'), showOverflow: "ellipsis"},
+ {field: 'compute_gross_area', title: t('order.area'),},
+ {field: 'perimeter', title: t('workOrder.perimeter'),},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -189,9 +170,9 @@
},
data: null,//琛ㄦ牸鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['data.orderDetail.quantity','data.orderDetail.computeGrossArea']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['data.orderDetail.quantity', 'data.orderDetail.computeGrossArea']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
@@ -207,18 +188,17 @@
})
-
</script>
<template>
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
- height="600px"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ height="600px"
+ max-height="100%"
v-bind="gridOptions"
+
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -236,14 +216,17 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}
+ </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 type="text"
+ v-model="option.data"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -254,7 +237,7 @@
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
index a44f8c2..96c9a64 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
@@ -74,6 +74,11 @@
return count.toFixed(2)
}
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
//棣栨鍔犺浇
request.post(`/basicDataProduce/selectBasic`).then((res) => {
if (res.code == 200) {
@@ -119,10 +124,10 @@
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- {field: 'id', width: 60, title: 'id',filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'basic_type',width: 370, title: '绫诲瀷', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'basic_name', width: 330,title: '鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'd_basic_name',width: 330, title: '绫诲埆',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'id', width: 60, title: 'id',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged,},
+ {field: 'basic_type',width: 370, title: '绫诲瀷', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'basic_name', width: 330,title: '鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'd_basic_name',width: 330, title: '绫诲埆'},
],
//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -179,7 +184,6 @@
<div class="main-div-customer">
<vxe-grid
max-height="100%"
- @filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
@@ -207,7 +211,7 @@
<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 type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 66dbf68..2b482a9 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -20,6 +20,7 @@
const route = useRoute()
const xGrid = ref()
let cellArea = ref()
+const shapeList = ref(['鏅舰','寮傚舰'])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
@@ -120,7 +121,11 @@
{field: 'grossArea',width:160, title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'computeArea',width:180, title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'computeGrossArea',width:200, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'shape',width:120, title: t('order.shape'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'shape',width:120,
+ title: t('order.shape'),
+ editRender: { name: 'input'},
+ filters:[{ data: '' }],
+ slots: { filter: 'num1_filter',edit:'shape_edit' }, sortable: true,filterMethod:filterChanged},
{field: 'bendRadius',width:160, title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -801,6 +806,11 @@
<vxe-button @click="importTemplate">{{$t('order.template')}}</vxe-button>
<vxe-button @click="importEvent">{{$t('order.import')}}</vxe-button>
</template>
+ <template #shape_edit="{ row }">
+ <vxe-select v-model="row.shape" transfer>
+ <vxe-option v-for="item in shapeList" :key="item" :value="item" :label="item" />
+ </vxe-select>
+ </template>
</vxe-grid>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
index 73b4227..cfb1107 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
@@ -1,5 +1,15 @@
<script setup>
import BasicTable from "@/components/BasicTable.vue"
+import request from "@/utils/request"
+import {ref} from "vue"
+const selectData = ref(["",""])
+let data = ref({})
+request.post(`/order/getOrderReport/1/100/${selectData.value}`,data.value).then(res => {
+ if(res.code === '200'){
+ console.log(res.data)
+ }
+})
+
</script>
<template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index ebe6735..702efcb 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -3,7 +3,7 @@
import {useRouter} from "vue-router"
import {computed, reactive, ref} from "vue"
import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'
- import request from "@/utils/request";
+ import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElMessage} from "element-plus"
import {VXETable} from "vxe-table"
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 1efab6e..0adef47 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -26,7 +26,7 @@
List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
//鍒嗘灦鏄庣粏鏌ヨ
- List<FlowCard> detailsSelectMp(String orderId, FlowCard flowCard);
+ List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
//鍒犻櫎娴佺▼鍗�
Boolean deleteFlowCardMp(String orderId, String processId);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
index f0c1284..75c9eb4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
@@ -26,10 +26,10 @@
//鏈帓浜ф煡璇�
public Map<String, Object> selectSchedulingSv(String selectTime1, String selectTime2, String orderId,String processes, Integer state, ProductionScheduling productionScheduling ) {
Map<String, Object> map = new HashMap<>();
- if(orderId.equals("null")){
+ if("null".equals(orderId)){
orderId="";
}
- if (processes.equals("null")){
+ if ("null".equals(processes)){
processes="";
}
@@ -49,10 +49,10 @@
//棣栨鏌ヨ鎺掍骇鏁版嵁
public Map<String, Object> selectLastScheduling(String selectTime1, String selectTime2,String processes,String orderId,ProductionScheduling productionScheduling ) {
Map<String, Object> map = new HashMap<>();
- if(orderId.equals("null")){
+ if("null".equals(orderId)){
orderId="";
}
- if (processes.equals("null")){
+ if ("null".equals(processes)){
processes="";
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 3eeeeeb..0e02dec 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -404,7 +404,7 @@
//鎶ュ伐绠＄悊鏌ヨ
public Map<String, Object> selectReportingWorkSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, String orderId, ReportingWork reportingWork) {
Integer offset = (pageNum - 1) * pageSize;
- if (orderId.equals("null")) {
+ if ("null".equals(orderId)) {
orderId = "";
}
Map<String, Object> map = new HashMap<>();
@@ -479,7 +479,7 @@
//鏌ヨ璐ㄦ瀹℃牳
public Map<String, Object> selectQualityTestingSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, Integer state, String processId, ReportingWork reportingWork) {
Integer offset = (pageNum - 1) * pageSize;
- if (processId.equals("null")) {
+ if ("null".equals(processId)) {
processId = "";
}
Map<String, Object> map = new HashMap<>();
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index 73c8648..3b90001 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -90,13 +90,13 @@
if (!orderId.isEmpty() && !productName.isEmpty()) {
//鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿
workOrderMapper.deleteOrderWorkMp(orderId, productName);
- Integer state = 0;
- Integer states = 1;
+ int state = 0;
+ int states = 1;
//鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
//鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
- if (noWorkCount == yesWorkCount) {
+ if (noWorkCount.equals(yesWorkCount)) {
workOrderMapper.updateWorkType(orderId, state);
} else {
workOrderMapper.updateWorkType(orderId, states);
diff --git a/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java b/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
index 31546df..9e02bbb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
+++ b/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
@@ -33,7 +33,7 @@
String uri = request.uri();
Map paramMap=getUrlParams(uri);
- System.out.println("鎺ユ敹鍒扮殑鍙傛暟鏄細"+paramMap);
+ //System.out.println("鎺ユ敹鍒扮殑鍙傛暟鏄細"+paramMap);
//濡傛灉url鍖呭惈鍙傛暟锛岄渶瑕佸鐞�
if(uri.contains("?")){
String newUri=uri.substring(0,uri.indexOf("?"));
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 3d6aeab..a5e2346 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -167,7 +167,7 @@
</select>
<!-- 鍒嗘灦鏄庣粏鏌ヨ-->
- <select id="detailsSelectMp" resultMap="flowCardMap">
+ <select id="detailsSelectMp">
select od.order_id,
ogd.production_id,
od.product_id,
@@ -180,18 +180,7 @@
GROUP BY order_id,order_number
) as ogd on od.order_id=ogd.order_id and od.order_number=ogd.order_number
where od.order_id = #{orderId} and ogd.splitting_status=0
- <if test="flowCard.orderId != null and flowCard.orderId != ''">
- and od.order_id regexp #{flowCard.orderId}
- </if>
- <if test="flowCard.orderGlassDetail.productionId != null and flowCard.orderGlassDetail.productionId != ''">
- and ogd.production_id regexp #{flowCard.orderGlassDetail.productionId}
- </if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
- and od.product_id regexp #{flowCard.orderDetail.productId}
- </if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
- and od.product_name regexp #{flowCard.orderDetail.productName}
- </if>
+
group by od.order_id, ogd.production_id
order by od.id desc
</select>
@@ -392,6 +381,8 @@
fc.order_number,
fc.technology_number,
fc.quantity,
+ ogd.child_width,
+ ogd.child_height,
round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
od.product_name,
ogd.glass_child,
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 70dfae6..3778507 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -63,7 +63,7 @@
e.reportWorkQuantityCount,
e.broken_num,
round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
-
+
from
flow_card as c
left join
@@ -96,8 +96,8 @@
) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
-
+
where a.order_id = #{orderId}
-
+
</select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
index a896f16..03429e3 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
@@ -67,12 +67,56 @@
</foreach>
</update>
-
-<!-- <select id="getOrderReport">-->
-<!-- SELECT-->
-<!-- from order_detail as a-->
-<!-- left join sd.`order` o on o.id = a.order_id-->
-<!-- </select>-->
+ <resultMap id="orderMap" type="com.example.erp.entity.sd.OrderDetail">
+ <result column="order_number" property="orderNumber"/>
+
+ <result column="order_number" property="productId"/>
+ <result column="order_number" property="productName"/>
+ <result column="order_number" property="width"/>
+ <result column="order_number" property="height"/>
+ <result column="order_number" property="quantity"/>
+ <result column="order_number" property="bendRadius"/>
+ <result column="order_number" property="grossArea"/>
+ <result column="order_number" property="computeGrossArea"/>
+ <result column="order_number" property="shape"/>
+ <result column="order_number" property="edgingType"/>
+ <result column="order_number" property="processingNote"/>
+ <result column="order_number" property="remarks"/>
+ <result column="order_number" property="perimeter"/>
+ <result column="order_number" property="grossAmount"/>
+
+ <association property="order" javaType="com.example.erp.entity.sd.Order">
+ <result column="order_type" property="orderType"/>
+
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="batch" property="batch"/>
+ <result column="processing_note" property="processingNote"/>
+ <result column="icon" property="icon"/>
+ <result column="packType" property="packType"/>
+ <result column="salesman" property="salesman"/>
+ <result column="delivery_address" property="deliveryAddress"/>
+ <result column="creator" property="creator"/>
+ <result column="verifier" property="verifier"/>
+ <result column="customer_batch" property="customerBatch"/>
+
+
+ </association>
+
+ </resultMap>
+
+
+ <select id="getOrderReport" resultMap="orderMap">
+ SELECT
+ *
+ from order_detail as a
+ left join sd.`order` as b
+ on b.order_id = a.order_id
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ limit #{offset},#{pageSize}
+
+ </select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
index 3d6aeab..a5e2346 100644
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
@@ -167,7 +167,7 @@
</select>
<!-- 鍒嗘灦鏄庣粏鏌ヨ-->
- <select id="detailsSelectMp" resultMap="flowCardMap">
+ <select id="detailsSelectMp">
select od.order_id,
ogd.production_id,
od.product_id,
@@ -180,18 +180,7 @@
GROUP BY order_id,order_number
) as ogd on od.order_id=ogd.order_id and od.order_number=ogd.order_number
where od.order_id = #{orderId} and ogd.splitting_status=0
- <if test="flowCard.orderId != null and flowCard.orderId != ''">
- and od.order_id regexp #{flowCard.orderId}
- </if>
- <if test="flowCard.orderGlassDetail.productionId != null and flowCard.orderGlassDetail.productionId != ''">
- and ogd.production_id regexp #{flowCard.orderGlassDetail.productionId}
- </if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
- and od.product_id regexp #{flowCard.orderDetail.productId}
- </if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
- and od.product_name regexp #{flowCard.orderDetail.productName}
- </if>
+
group by od.order_id, ogd.production_id
order by od.id desc
</select>
@@ -392,6 +381,8 @@
fc.order_number,
fc.technology_number,
fc.quantity,
+ ogd.child_width,
+ ogd.child_height,
round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
od.product_name,
ogd.glass_child,
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml b/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
index a896f16..03429e3 100644
--- a/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
+++ b/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
@@ -67,12 +67,56 @@
</foreach>
</update>
-
-<!-- <select id="getOrderReport">-->
-<!-- SELECT-->
-<!-- from order_detail as a-->
-<!-- left join sd.`order` o on o.id = a.order_id-->
-<!-- </select>-->
+ <resultMap id="orderMap" type="com.example.erp.entity.sd.OrderDetail">
+ <result column="order_number" property="orderNumber"/>
+
+ <result column="order_number" property="productId"/>
+ <result column="order_number" property="productName"/>
+ <result column="order_number" property="width"/>
+ <result column="order_number" property="height"/>
+ <result column="order_number" property="quantity"/>
+ <result column="order_number" property="bendRadius"/>
+ <result column="order_number" property="grossArea"/>
+ <result column="order_number" property="computeGrossArea"/>
+ <result column="order_number" property="shape"/>
+ <result column="order_number" property="edgingType"/>
+ <result column="order_number" property="processingNote"/>
+ <result column="order_number" property="remarks"/>
+ <result column="order_number" property="perimeter"/>
+ <result column="order_number" property="grossAmount"/>
+
+ <association property="order" javaType="com.example.erp.entity.sd.Order">
+ <result column="order_type" property="orderType"/>
+
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="batch" property="batch"/>
+ <result column="processing_note" property="processingNote"/>
+ <result column="icon" property="icon"/>
+ <result column="packType" property="packType"/>
+ <result column="salesman" property="salesman"/>
+ <result column="delivery_address" property="deliveryAddress"/>
+ <result column="creator" property="creator"/>
+ <result column="verifier" property="verifier"/>
+ <result column="customer_batch" property="customerBatch"/>
+
+
+ </association>
+
+ </resultMap>
+
+
+ <select id="getOrderReport" resultMap="orderMap">
+ SELECT
+ *
+ from order_detail as a
+ left join sd.`order` as b
+ on b.order_id = a.order_id
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ limit #{offset},#{pageSize}
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0