From ba6b8c6be389e1c76f15f85e43f2d55ff5d34caf Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 07 四月 2025 10:33:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 19
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 1
north-glass-erp/northglass-erp/src/lang/en.js | 23 +
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 12
north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue | 3
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue | 15
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 3
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 11
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 3
north-glass-erp/northglass-erp/src/lang/zh.js | 32 +
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 14
north-glass-erp/northglass-erp/src/components/BasicTable.vue | 2
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 153 --------
north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java | 2
north-glass-erp/northglass-erp/src/lang/ar.js | 21 +
north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue | 3
north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js | 2
north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js | 2
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java | 4
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 5
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java | 2
north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue | 2
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 91 +++-
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/OrderNumberReportTransfer.vue | 57 +++
north-glass-erp/northglass-erp/src/stores/sd/companySet/金华天成.js | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 11
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue | 2
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java | 3
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue | 27 +
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 37 +
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue | 8
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 3
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue | 2
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 165 +++++++-
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 60 ++
north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java | 2
north-glass-erp/northglass-erp/src/lang/ru.js | 21 +
north-glass-erp/src/main/resources/application.yml | 3
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue | 18
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 1
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue | 8
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 4
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue | 4
north-glass-erp/northglass-erp/src/stores/sd/companySet/天津北玻.js | 2
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 13
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 100 +++--
47 files changed, 630 insertions(+), 350 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index 1744a32..8244a59 100644
--- a/north-glass-erp/northglass-erp/src/components/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -139,8 +139,6 @@
gridOptions.columns = props.childrenData.columns
getReportData()
addListener(xGrid.value,gridOptions)
-
-
})
function filterChanged(column){
//gridOptions.loading=true
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index 03ae342..930f9f4 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -317,151 +317,7 @@
</table>
- <!-- <table border="1" >
- <thead>
- <tr class="title-s">
- <th colspan="13">
- <h1>
- {{company.companyName}}
- </h1>
- </th>
- </tr>
- <tr class="title-s">
- <th colspan="2"></th>
- <th colspan="5">
- <h3>閿�鍞彂璐у崟</h3>
- </th>
- <th colspan="2" style="text-align: left;">鍙戣揣鍗曞彿锛�<span>{{delivery.deliveryId}}</span></th>
- </tr>
- <tr>
- <th style="text-align: left;border:none;" colspan="4">瀹㈡埛鍚嶇О锛�<span>{{delivery.customerName}}</span></th>
- <th style="text-align: left;border:none;" colspan="3">椤圭洰鍚嶇О锛�<span>{{delivery.project}}</span></th>
- <th style="text-align: left;border:none;" colspan="2">鑱旂郴浜猴細<span>{{delivery.contacts}}</span></th>
- </tr>
- <tr>
- <th style="text-align: left;border:none;" colspan="7">閫佽揣鍦板潃锛�<span>{{delivery.deliveryAddress}}</span></th>
- <th style="text-align: left;border:none;" colspan="2">鑱旂郴鐢佃瘽锛�<span>{{delivery.contactNumber}}</span></th>
- </tr>
- <tr>
- <th style="width: 6%;">搴忓彿</th>
- <th style="width: 20%;">妤煎眰缂栧彿</th>
- <th style="width: 20%;" colspan="2">瀹絏楂�</th>
- <th style="width: 10%;">鏁伴噺</th>
- <th style="width: 10%;">闈㈢Н</th>
- <th style="width: 10%;">鍗曚环</th>
- <th style="width: 12%;">閲戦</th>
- <th style="width: 12%;" colspan="2">鍔犲伐瑕佹眰</th>
- </tr>
- </thead>
- <template v-for="(item, index) in produceList" :key="index" >
- <tr>
- <td style="font-size: 15px;text-align: left" colspan="4">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
- <td style="font-size: 15px;text-align: left" colspan="3">瀵规柟鍗曞彿:</td>
- <td style="font-size: 15px;text-align: left" colspan="3">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
- </tr>
-
- <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
- <td>{{items.order_number}}</td>
- <td>{{items.buildingNumber}}</td>
- <td colspan="2" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td>
- <td>{{items.quantity}}</td>
- <td>{{items.area}}</td>
- <td>{{items.price}}</td>
- <td>{{items.money}}</td>
- <td colspan="2">{{items.processingNote}}</td>
- </tr>
- <tr class="day-in" >
- <td style="font-size: 15px;" colspan="4">灏忚:</td>
- <td>{{item.DeliveryDetail.quantity}}</td>
- <td>{{item.DeliveryDetail.area}}</td>
- <td></td>
- <td>{{item.DeliveryDetail.money}}</td>
- <td></td>
- </tr>
-
- </template>
- <tr class="day-in">
- <td style="font-size: 15px;" colspan="4">鍚堣:</td>
- <td>{{delivery.quantity}}</td>
- <td>{{delivery.area}}</td>
- <td></td>
- <td>{{delivery.money-otherMoneys-delivery.freight}}</td>
- <td></td>
- </tr>
- <tr class="day-in">
- <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="4">
- <div style="display: flex;font-size: 10px;text-align: center;">
- <div style="width: 25%">鍔犲伐璐圭敤</div>
- <div style="width: 25%">鍗曚环</div>
- <div style="width: 25%">鏁伴噺</div>
- <div style="width: 25%">閲戦</div>
- </div>
- </td>
- <td style="text-align: left;border:none;font-size: 15px;" colspan="5">鎬婚噾棰�: {{delivery.money}}</td>
- </tr>
- <tr class="day-in">
- <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
- <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney" :key="index2">
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.monery}}</div>
- </div>
- <div style="display: flex;font-size: 10px;text-align: center" v-if="delivery.freight>0">
- <div style="width: 25%">杩愯垂</div>
- <div style="width: 25%">{{delivery.freightPrice}}</div>
- <div style="width: 25%">{{delivery.freightQuantity}}</div>
- <div style="width: 25%">{{delivery.freight}}</div>
- </div>
- </td>
- <td style="text-align: left;border:none;font-size: 15px;" colspan="5">澶у啓閲戦: {{money}}</td>
- </tr>
-
-
- <tfoot style="border: 0">
- <!– <el-row :gutter="24">
- <el-col :span="4"><div style="font-size: 12px" class="bottom">鍒跺崟鍛橈細{{data.order.creator}}<span style="font-size: 10px"></span></div></el-col>
- <el-col :span="6"><div style="font-size: 12px" class="bottom">鍒跺崟鏃ユ湡锛歿{data.order.createTime}}<span style="font-size: 10px"></span></div></el-col>
- <el-col :span="4"><div style="font-size: 12px" class="bottom">瀹℃牳鍛橈細{{data.order.verifier}}</div></el-col>
- <el-col :span="6"><div style="font-size: 12px" class="bottom">瀹℃牳鏃ユ湡锛歿{data.order.updateTime}}</div></el-col>
- <el-col :span="4"><div style="font-size: 12px" class="bottom">鎵撳嵃浜猴細{{username}}</div></el-col>
-
- </el-row>–>
- <tr class="day-in" style="border: 0;">
- <td colspan="9" style="border: 0;">
- <div style="display:flex;">
- <div style="width: 15%">鍒跺崟鍛橈細{{ delivery.creator }}</div>
- <div style="width: 25%">鍒跺崟鏃ユ湡锛歿{ delivery.createTime }}</div>
- <div style="width: 10%">鍙戣揣鍛橈細</div>
- <div style="width: 10%">鍙告満锛�</div>
- <div style="width: 15%">瀹㈡埛绛惧瓧锛�</div>
- <div style="width: 15%">绛炬敹鏃ユ湡锛�</div>
- </div>
-
-
- </td>
- </tr>
- <tr>
- <td colspan="9" style="border: 0;">
- <div style="display:flex;" class="bottom">鏋跺瓙 鍙�</div>
- <div style="display:flex;" class="bottom">
- {{takeCare}}
- </div>
-
- </td>
- </tr>
- <tr>
- <td colspan="9" style="border: 0;">
- <div style="display:flex;" class="bottom">
- {{remark}}
- </div>
-
- </td>
- </tr>
- </tfoot>
-
- </table>-->
</div>
@@ -474,11 +330,18 @@
<style scoped>
@media print {
@page {
- margin: 8mm 16mm 20mm 16mm !important;
+ margin: 12mm 10mm 20mm 10mm !important;
}
.pages {
page-break-after: always;
}
+
+ @page {
+ @top-right {
+ margin-top: 50px;
+ content: "绗� " counter(page) " 椤�"; /* 浣跨敤counter娣诲姞椤电爜 */
+ }
+ }
}
h1,h3{
left:0;
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
index 9c178ea..da9cfee 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -253,11 +253,17 @@
<style scoped>
@media print {
@page {
- margin: 8mm 16mm 20mm 16mm !important;
+ margin: 12mm 10mm 20mm 10mm !important;
}
.pages {
page-break-after: always;
}
+ @page {
+ @top-right {
+ margin-top: 50px;
+ content: "绗� " counter(page) " 椤�"; /* 浣跨敤counter娣诲姞椤电爜 */
+ }
+ }
}
h1,h3{
left:0;
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderNumberReportTransfer.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderNumberReportTransfer.vue
new file mode 100644
index 0000000..8298338
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderNumberReportTransfer.vue
@@ -0,0 +1,57 @@
+<script setup>
+import {ref} from "vue";
+import request from "@/utils/request";
+import {ElMessage} from "element-plus";
+import {useI18n} from "vue-i18n"
+const { t } = useI18n()
+const props = defineProps({
+ transferData:{}
+})
+const emits = defineEmits(['orderNumberTransfer'])
+/*request.post()*/
+const orderNumberTransferSubmit = () => {
+ request.post('/reportingWork/reportingWorkTransfer',props.transferData).then(res => {
+ if(res.code === '200' && res.data.data===true){
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ emits('orderNumberTransfer')
+ }else{
+ ElMessage.warning(res.data.msg)
+ }
+
+ }).catch(err => {
+ ElMessage.error(t('order.transferPage.errorToMes'))
+ })
+/*emits('orderNumberTransfer')*/
+}
+</script>
+
+<template>
+ <el-form :model="props.transferData">
+ <el-form-item :label="$t('order.transferPage.oldOrderId')+'锛�'" label-width="140px">
+ <el-text>{{props.transferData.oldOrderId}}</el-text>
+ </el-form-item>
+ <el-form-item :label="$t('order.transferPage.oldOrderNumber')+'锛�'" label-width="140px">
+ <el-text>{{props.transferData.oldOrderNumber}}</el-text>
+ </el-form-item>
+ <el-form-item :label="$t('order.transferPage.newOrderId')+'锛�'" label-width="140px">
+ <el-input v-model="props.transferData.newOrderId" autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('order.transferPage.newOrderNumber')+'锛�'" label-width="140px">
+ <el-input v-model="props.transferData.newOrderNumber" type="number" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label-width="140px">
+ <el-popconfirm :title="$t('order.transferPage.confirmTitle')"
+ @confirm="orderNumberTransferSubmit()">
+ <template #reference>
+ <el-button
+ type="primary"
+ style="margin-left: 268px">{{$t('craft.sure')}}</el-button>
+ </template>
+ </el-popconfirm>
+ </el-form-item>
+ </el-form>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index bef4ae0..6483eab 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -1,6 +1,7 @@
<script setup>
-import {onMounted, reactive, ref, watch} from "vue";
+import {computed, onMounted, reactive, ref, watch} from "vue";
import {changeFilterEvent, filterChanged} from "@/hook"
+import footSum from "@/hook/footSum"
import {useI18n} from "vue-i18n"
import request from "@/utils/request"
import {ElMessage} from "element-plus"
@@ -13,6 +14,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
showOverflow:true,
+ showFooter: true,//鏄剧ず鑴�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
virtualScroll: true, // 寮�鍚櫄鎷熸粴鍔ㄥ姛鑳�
id: 'Order_Process',
@@ -48,9 +50,21 @@
}
return null
},
-
-
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return t('basicData.total')
+ }
+ if (list.value.includes(column.field)) {
+ return footSum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
})
+const list = ref([])
let props = defineProps({
orderId:null
@@ -62,9 +76,9 @@
{field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'order_type', width: 120,title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'process_id',width: 110, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-
{field: 'technology_number', width: 90,title: t('processCard.technologyNumber'),showOverflow:"ellipsis"},
{field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'gross_area', width: 90,title: t('order.area')},
{field: 'shippedQuantity',width: 120, title: t('delivery.deliveryQuantity')},
{field: 'inventory',width: 120, title: t('productStock.inventoryQuantity')},
{field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
@@ -81,16 +95,23 @@
getWorkOrder()
})
+
+
const getWorkOrder = () => {
- request.post(`/report/processCardProgress/${props.orderId}`,column).then((res) => {
+ request.post(`/report/processCardProgress/${props.orderId}`,column).then(async (res) => {
if (res.code == 200) {
gridOptions.columns = JSON.parse(JSON.stringify(columns))
gridOptions.columns.forEach(item =>{
item.filterMethod = filterChanged
})
- res.data.title.forEach(item =>{
- let column = {slots: { default: 'quantitySum' }, width: 90,title: item.process}
+ list.value = ['quantity']
+ res.data.title.forEach((item,index) =>{
+ list.value.push('reportWorkQuantity.'+item.process)
+ let column = {slots: { default: 'quantitySum'},
+ width: 90,
+ title: item.process,
+ field:'reportWorkQuantity.'+item.process}
gridOptions.columns.push(column)
})
res.data.data.forEach(item => {
@@ -98,7 +119,7 @@
item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
})
//gridOptions.mergeCells= res.data.mergeCells
- xGrid.value.loadData(res.data.data)
+ await xGrid.value.loadData(res.data.data)
} else {
ElMessage.warning(res.msg)
}
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
index c86dc49..5ab16e1 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
@@ -177,6 +177,7 @@
<template>
<div id="sheet" @dblclick="handleDoubleClick">
<table border="1" >
+ <thead>
<tr class="title-s">
<th colspan="9">
<h1>
@@ -213,6 +214,7 @@
<th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">鍔犲伐瑕佹眰</th>
<th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">澶囨敞</th>
</tr>
+ </thead>
<template v-for="(item, index) in produceList" :key="index" >
<tr>
<td style="font-size: 15px;font-weight: bold;text-align: left" colspan="4">浜у搧鍚嶇О:
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
index e01a992..ceea8be 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -32,7 +32,8 @@
const grossNum = ref({
quantity: 0,
grossArea: 0,
- perimeter: 0
+ perimeter: 0,
+ weight:0
})
const getData = () => {
request.get(`/order/printOrderProductDetail/${props.orderId}/${selectedValues.value}`).then(res => {
@@ -43,12 +44,14 @@
grossNum.value.quantity += getQuantity(item.productDetail)
grossNum.value.grossArea += getArea(item.productDetail)
grossNum.value.perimeter += getPerimeter(item.productDetail)
+ grossNum.value.weight += getWeight(item.productDetail)
stringToJson(item.productDetail)
})
grossNum.value.quantity = parseFloat(grossNum.value.quantity.toFixed(2))
grossNum.value.grossArea = parseFloat(grossNum.value.grossArea.toFixed(2))
grossNum.value.perimeter = parseFloat(grossNum.value.perimeter.toFixed(2))
+ grossNum.value.weight = parseFloat(grossNum.value.weight.toFixed(2))
})
}
@@ -59,17 +62,20 @@
grossNum.value.quantity=0
grossNum.value.grossArea=0
grossNum.value.perimeter=0
+ grossNum.value.weight=0
data.value= res.data
data.value.orderProductDetail.forEach(item => {
grossNum.value.quantity += getQuantity(item.productDetail)
grossNum.value.grossArea += getArea(item.productDetail)
grossNum.value.perimeter += getPerimeter(item.productDetail)
+ grossNum.value.weight += getWeight(item.productDetail)
stringToJson(item.productDetail)
})
grossNum.value.quantity = parseFloat(grossNum.value.quantity.toFixed(2))
grossNum.value.grossArea = parseFloat(grossNum.value.grossArea.toFixed(2))
grossNum.value.perimeter = parseFloat(grossNum.value.perimeter.toFixed(2))
+ grossNum.value.weight = parseFloat(grossNum.value.weight.toFixed(2))
})
@@ -115,6 +121,14 @@
return parseFloat(perimeter.toFixed(2))
}
+const getWeight = (productList) => {
+ let weight = 0
+ productList.forEach(item => {
+ weight += item.weight
+ })
+ return parseFloat(weight.toFixed(2))
+}
+
const printSheet = () => {
}
@@ -141,7 +155,7 @@
</tr>
<tr class="title-s">
- <th colspan="2" style="width: 30%"></th>
+ <th colspan="2" style="width: 30%;text-align: left;"><span>鎬婚噸閲�:{{ grossNum.weight }}</span></th>
<th colspan="5" style="width: 40%;">
<h3 >鐢熶骇浠诲姟鍗�(鎴愬搧)</h3>
</th>
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index fa8c0c4..bc23913 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -68,6 +68,7 @@
selected:'閫変腑',
partiallySelected:'閮ㄥ垎閫変腑',
unchecked :'鏈�変腑',
+ copy:'澶嶅埗',
msg:{
max255:'兀丿禺賱 255 丨乇賮賸丕 賰丨丿 兀賯氐賶',
range99999Dec2:
@@ -249,6 +250,7 @@
quantityMount:'鏁伴噺閲戦',
allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
+ orderTransfer:'璁㈠崟鎶ュ伐杞Щ',
msg:{
productCheck:'丕賱乇噩丕亍 丕禺鬲賷丕乇 賲賳鬲噩',
@@ -275,7 +277,13 @@
pleaseCancelTheFilteringFirst:'賷乇噩賶 廿賱睾丕亍 丕賱丕禺鬲賷丕乇 兀賵賱丕賸',
grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
- differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵'
+ differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵',
+ updateOrderIdErrorGtMaxId:'杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿',
+ updateOrderIdErrorIsExist:'杈撳叆璁㈠崟鍙峰凡瀛樺湪',
+ updateOrderIdErrorIsSame:'杈撳叆璁㈠崟鍙风浉鍚�',
+ updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
+ updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
+ updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
}
},
@@ -301,7 +309,12 @@
copyTitle:'賳爻禺 丕賱毓賳賵丕賳',
msgList:{
checkOrder:'賱賲 賷鬲賲 丕賱毓孬賵乇 毓賱賶 賲毓賱賵賲丕鬲 丕賱胤賱亘貙 賷乇噩賷 鬲丨丿賷丿 丕賱胤賱亘 丕賵賱丕賸',
- }
+ isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
+ isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
+ isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
+ },
+ updateOrderId:"淇敼璁㈠崟鍙�",
+ reportingTransfer:'鎶ュ伐杞Щ'
},
craft:{
glassAddress:'賵囟毓 毓賱丕賲丞 丕賱夭噩丕噩',
@@ -713,6 +726,9 @@
customerAbbreviation:'丕禺鬲氐丕乇 丕賱毓賲賷賱',
pleaseEnterTheCustomerAbbreviation:'丕賱乇噩丕亍 丕丿禺丕賱 丕禺鬲氐丕乇 丕賱毓賲賷賱',
+ msgList:{
+ notCustomerInfo:'鏈煡璇㈠埌瀹㈡埛淇℃伅',
+ }
},
delivery:{
page:{
@@ -986,6 +1002,7 @@
patchNum :'毓丿丿 賲噩賲賵毓丕鬲 丕賱鬲爻賱賷賲',
finished :'賲毓丿賱 丕賱賲賳鬲噩丕鬲 丕賱賳賴丕卅賷丞',
finishedProductReport :'鬲賯乇賷乇 丕賱賲賳鬲噩丕鬲 丕賱賳賴丕卅賷丞',
+ workProcessName:'鍦ㄥ埗鍝佸悕绉�',
},
productionBasicData:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 76d0f79..ffa28f8 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -68,6 +68,7 @@
selected:'selected',
partiallySelected:'partially selected',
unchecked :'unchecked',
+ copy:'Copy',
msg:{
max255:"The value contains a maximum of 255 characters",
range99999Dec2:
@@ -249,6 +250,7 @@
quantityMount:'Quantity and Amount',
allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
+ orderTransfer:'璁㈠崟鎶ュ伐杞Щ',
msg:{
productCheck:'Please select a product',
@@ -275,7 +277,13 @@
pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
grossAreaIsNot0:'There is an actual total area equal to0',
- differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵'
+ differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵',
+ updateOrderIdErrorGtMaxId:'杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿',
+ updateOrderIdErrorIsExist:'杈撳叆璁㈠崟鍙峰凡瀛樺湪',
+ updateOrderIdErrorIsSame:'杈撳叆璁㈠崟鍙风浉鍚�',
+ updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
+ updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
+ updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
}
},
@@ -300,8 +308,13 @@
copy:'Copy',
copyTitle:'Copy Title',
msgList:{
- checkOrder:'No order information is found. Please click Order first'
- }
+ checkOrder:'No order information is found. Please click Order first',
+ isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
+ isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
+ isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
+ },
+ updateOrderId:"淇敼璁㈠崟鍙�",
+ reportingTransfer:'鎶ュ伐杞Щ'
},
craft:{
glassAddress:'Glass Address',
@@ -713,6 +726,9 @@
customerAbbreviation:'Customer abbreviation',
pleaseEnterTheCustomerAbbreviation:'Please enter the customers abbreviation',
+ msgList:{
+ notCustomerInfo:'鏈煡璇㈠埌瀹㈡埛淇℃伅',
+ }
},
delivery:{
page:{
@@ -986,6 +1002,7 @@
patchNum :'Patch number',
finished :'Rate of finished product',
finishedProductReport :'Finished product report',
+ workProcessName:'鍦ㄥ埗鍝佸悕绉�',
},
productionBasicData:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 5236d26..a8eab33 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -68,6 +68,7 @@
selected:'閫変腑',
partiallySelected:'閮ㄥ垎閫変腑',
unchecked :'鏈�変腑',
+ copy:'澶嶅埗',
msg:{
max255:"袙胁械写懈褌械 255 褋懈屑胁芯谢芯胁.",
range99999Dec2:
@@ -249,6 +250,7 @@
quantityMount:'鏁伴噺閲戦',
allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
+ orderTransfer:'璁㈠崟鎶ュ伐杞Щ',
msg:{
productCheck:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯写褍泻褌',
@@ -275,7 +277,13 @@
pleaseCancelTheFilteringFirst:'璇峰厛鍙栨秷绛涢��',
grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
- differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵'
+ differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵',
+ updateOrderIdErrorGtMaxId:'杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿',
+ updateOrderIdErrorIsExist:'杈撳叆璁㈠崟鍙峰凡瀛樺湪',
+ updateOrderIdErrorIsSame:'杈撳叆璁㈠崟鍙风浉鍚�',
+ updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
+ updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
+ updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
}
},
@@ -301,7 +309,12 @@
copyTitle:'袣芯锌懈褉芯胁邪褌褜 蟹邪谐芯谢芯胁芯泻',
msgList:{
checkOrder:'袝褋谢懈 懈薪褎芯褉屑邪褑懈褟 芯 蟹邪泻邪蟹械 薪械 锌芯谢褍褔械薪邪, 薪邪卸屑懈褌械 薪邪 蟹邪泻邪蟹.',
- }
+ isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
+ isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
+ isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
+ },
+ updateOrderId:"淇敼璁㈠崟鍙�",
+ reportingTransfer:'鎶ュ伐杞Щ'
},
craft:{
glassAddress:'袦邪褉泻懈褉芯胁泻邪',
@@ -712,6 +725,9 @@
customerAbbreviation:'袣谢懈械薪褌褘 小芯泻褉邪褖械薪懈褟',
pleaseEnterTheCustomerAbbreviation:'袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 褋芯泻褉邪褖械薪懈械 泻谢懈械薪褌邪.',
+ msgList:{
+ notCustomerInfo:'鏈煡璇㈠埌瀹㈡埛淇℃伅',
+ }
},
delivery:{
page:{
@@ -985,6 +1001,7 @@
patchNum :'袣芯谢懈褔械褋褌胁芯 褋褌械泻谢褟薪薪褘褏 锌谢邪褋褌懈薪',
finished :'袣芯褝褎褎懈褑懈械薪褌 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
finishedProductReport :'袨褌褔械褌 芯 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
+ workProcessName:'鍦ㄥ埗鍝佸悕绉�',
},
productionBasicData:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 1a12b0a..13c0e91 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -68,6 +68,7 @@
selected:'閫変腑',
partiallySelected:'閮ㄥ垎閫変腑',
unchecked :'鏈�変腑',
+ copy:'澶嶅埗',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
range99999Dec2:
@@ -249,6 +250,16 @@
quantityMount:'鏁伴噺閲戦',
allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
+ orderTransfer:'璁㈠崟鎶ュ伐杞Щ',
+ transferPage:{
+ oldOrderId:'鍘熻鍗曞彿',
+ newOrderId:'鏂拌鍗曞彿',
+ oldOrderNumber:'鍘熻鍗曞簭鍙�',
+ newOrderNumber:'鏂拌鍗曞簭鍙�',
+ confirmTitle:'纭疄杞Щ姝ゅ簭鍙风殑娴佺▼鍗℃姤宸ユ暟鎹�?',
+ errorToMes:'涓巑es閫氳寮傚父'
+
+ },
msg:{
productCheck:'璇烽�夋嫨浜у搧',
@@ -275,7 +286,13 @@
pleaseCancelTheFilteringFirst:'璇峰厛鍙栨秷绛涢��',
grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
- differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵'
+ differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵',
+ updateOrderIdErrorGtMaxId:'杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿',
+ updateOrderIdErrorIsExist:'杈撳叆璁㈠崟鍙峰凡瀛樺湪',
+ updateOrderIdErrorIsSame:'杈撳叆璁㈠崟鍙风浉鍚�',
+ updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
+ updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
+ updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
}
},
@@ -300,8 +317,13 @@
copy:'澶嶅埗璁㈠崟',
copyTitle:'澶嶅埗琛ㄥご',
msgList:{
- checkOrder:'鏈煡璇㈠埌璁㈠崟淇℃伅锛岃鍏堝崟鍑昏鍗�'
- }
+ checkOrder:'鏈煡璇㈠埌璁㈠崟淇℃伅锛岃鍏堝崟鍑昏鍗�',
+ isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
+ isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
+ isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
+ },
+ updateOrderId:"淇敼璁㈠崟鍙�",
+ reportingTransfer:'鎶ュ伐杞Щ'
},
craft:{
glassAddress:'鏍囪',
@@ -713,6 +735,9 @@
customerAbbreviation:'瀹㈡埛绠�绉�',
pleaseEnterTheCustomerAbbreviation:'璇疯緭鍏ュ鎴风畝绉�',
+ msgList:{
+ notCustomerInfo:'鏈煡璇㈠埌瀹㈡埛淇℃伅',
+ }
},
delivery:{
page:{
@@ -987,6 +1012,7 @@
patchNum :'琛ョ墖鏁伴噺',
finished :'鎴愬搧鐜�',
finishedProductReport :'鎴愬搧鎶ヨ〃',
+ workProcessName:'鍦ㄥ埗鍝佸悕绉�',
},
productionBasicData:{
page:{
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
index 90f2943..d9a5f4d 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
@@ -3,6 +3,8 @@
export default defineStore('companyInfo', {
state: () => ({
+ timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
+ connectMes:false,//甯稿窞true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
companyName: '澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�',
address:'澶╂触瀹濆澔鍖鸿妭鑳界幆淇濆伐涓氬尯澶╁叴璺タ渚у疂涓亾鍗椾晶',
telephone:'022-59280088',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
index d4b3d47..db0462c 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
@@ -3,6 +3,8 @@
export default defineStore('companyInfo', {
state: () => ({
+ timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
+ connectMes:true,//甯稿窞true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
companyName: '甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�',
address:'甯稿窞甯傚ぉ瀹佸尯閮戦檰闀囧ぇ鏄庡崡璺�8鍙�',
telephone:'022-59280088',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
index cd49263..bcf29c1 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
@@ -3,6 +3,8 @@
export default defineStore('companyInfo', {
state: () => ({
+ timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
+ connectMes:false,//甯稿窞true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
companyName: '鏂扮枂鎭掗懌鐜荤拑绉戞妧鏈夐檺鍏徃',
address:'鏂扮枂浜斿娓犲伐涓氬洯鍏靛洟鏂板瀷寤烘潗宸ヤ笟鍥尯宸ヤ竴璺�11鍙烽檮1鍙�',
telephone:'13419168999',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
index 39d4872..5ceb709 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
@@ -3,6 +3,8 @@
export default defineStore('companyInfo', {
state: () => ({
+ timeOut:true,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
+ connectMes:false,//甯稿窞true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
companyName: '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃',
address:'娴欐睙鐪侀噾鍗庡競閲戜笢鍖烘浌瀹呴晣宸ヤ笟鍔熻兘鍖洪工宀╄28鍙�2鍙�',
telephone:'153 8178 1915 绂忓枩澶╂垚',
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue
index c7af0c4..e2d57ec 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue
@@ -32,7 +32,7 @@
<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' }">{{$t('ingredientsStock.returnToStorage')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(6)" :class="indexFlag===6?'indexTag':''" :to="{ path: '/main/ingredientsStock/selectSurplusMaterials' }">{{$t('ingredientsStock.surplusMaterialManagement')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(7)" :class="indexFlag===7?'indexTag':''" :to="{ path: '/main/ingredientsStock/materialAdditionRecord' }">{{$t('鐗╂枡鏂板')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(7)" :class="indexFlag===7?'indexTag':''" :to="{ path: '/main/ingredientsStock/materialAdditionRecord' }">{{$t('ingredients.materialAddition')}}</el-breadcrumb-item>
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('ingredientsStock.returnToStorage')}}</el-breadcrumb-item>
</el-breadcrumb>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
index 5964f67..3fc3b15 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
@@ -646,17 +646,28 @@
ElMessage.error("璇疯緭鍏ュ簱瀛樺尯鍩�")
return
}*/
+ let flowData
+ if(selectRecords.height===undefined){
+ flowData = ref({
+ title: titleUploadData.value,
+ materialCode: selectRecords.id,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId
- let flowData = ref({
- totalArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2))*titleUploadData.value.inventoryQuantity,
- singlePieceArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2)),
- title: titleUploadData.value,
- materialCode: selectRecords.id,
- userName:userStore.user.userName,
- userId:userStore.user.userId
+ })
+ }else{
+ flowData = ref({
+ totalArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2))*titleUploadData.value.inventoryQuantity,
+ singlePieceArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2)),
+ title: titleUploadData.value,
+ materialCode: selectRecords.id,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId
- })
+ })
+ }
+
console.log(flowData.value)
request.post("/materialInventory/saveMaterialInventory", flowData.value).then((res) => {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index a0d3ae1..a6e3674 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -153,15 +153,7 @@
<template v-for="(item,id) in labelList">
<div id="entirety" >
- <div class="row1" v-if="item.heat_layout_id!=null">
- <span>{{ item.customer_name }}</span>
- <span>{{ item.order_id }}</span>
- <span v-if="item.process.includes('澶硅兌')||item.process.includes('澶瑰眰')">鑳剁墖</span>
- <span v-else-if="item.process.includes('涓┖')">涓┖</span>
- <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
- <span v-else></span>
- </div>
- <div class="row6" v-else>
+ <div class="row1" v-if="item.customer_name!==undefined">
<span>{{ item.customer_name }}</span>
<span>{{ item.order_id }}</span>
<span v-if="item.process.includes('澶硅兌')||item.process.includes('澶瑰眰')">鑳剁墖</span>
@@ -171,7 +163,8 @@
</div>
- <div class="row2">
+
+ <div class="row2" v-if="item.customer_name!==undefined">
<span>{{item.project}}</span>
<span>{{ item.building_number }}</span>
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
@@ -195,7 +188,7 @@
</span>
{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
</div>
- <div class="row5">
+ <div class="row5" v-if="item.customer_name!==undefined">
<span>{{item.glass_child}}</span>
<span>{{item.processing_note}}</span>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 2ae9c9d..24d4451 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -46,6 +46,7 @@
request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
if (res.code == 200) {
labelList.value = deepClone(res.data.data)
+ console.log(res.data.data)
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -162,7 +163,7 @@
<!-- 鍗婃垚鍝佹爣绛�-->
<template v-for="(item,id) in labelList">
<div v-if="type!=='3'" id="entirety" >
- <div class="row1" >
+ <div v-if="item.customer_name!==undefined" class="row1" >
<!--閽㈠寲鐗堝浘搴忓彿锛岄挗鍖栫増鍥鹃噷鐨勯『搴�-->
<!-- <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
<span>{{ item.customer_name }}</span>
@@ -186,7 +187,7 @@
{{JSON.parse(item.other_columns).S02}}={{item.quantity}}
</div>
<div class="row3" v-else>
- <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator" style="font-size: 7pt;">
+ <span v-if="item.heat_layout_sort!==undefined && company.showDeliveryCreator" style="font-size: 7pt;">
({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
</span>
<span v-if="item.stock_id!==undefined && !company.showDeliveryCreator" style="font-size: 7pt">
@@ -194,12 +195,12 @@
</span>
{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
</div>
- <div class="row5">
+ <div v-if="item.customer_name!==undefined" class="row5">
<span>{{item.project}}</span>
<span>{{item.building_number?item.building_number.replace(/\r|\n|\s/g,''):''}}</span>
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
</div>
- <div class="row6">
+ <div v-if="item.customer_name!==undefined" class="row6">
<span>{{item.glass_child}}</span>
<span v-if="company.showDeliveryCreator" style="font-size: 10pt" >{{item.processing_note}}</span>
<span v-else style="font-size: 6pt">{{item.processing_note}}</span>
@@ -224,7 +225,7 @@
<span style="font-size: 8pt">{{ item.customer_name }}</span>
</div>
- <div class="row2" v-else>
+ <div class="row1" v-else>
<span style="font-size: 8pt">{{ item.customer_name }}</span>
</div>
<div class="row2" style="font-size: 8pt" >{{item.order_id}}
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
index 6583a68..71b210d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -198,6 +198,7 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
{field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'gross_area', width: 90,title: t('order.area')},
{field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
// {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
{field: 'inventory',width: 120, title: t('report.inventoryNum')},
@@ -223,7 +224,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity", "broken_num", "inventory", "inventoryArea"]; // 闈欐�佸垪鐨勬眰鍜�
+ const List = ["quantity", "broken_num", "inventory", "inventoryArea","gross_area"]; // 闈欐�佸垪鐨勬眰鍜�
if (List.includes(column.field)) {
return footSum(data, column.field)
}
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 3982079..1018de3 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
@@ -266,15 +266,16 @@
field: 'processId', width: 140, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
},
{field: 'orderNumber', width: 90, title: t('order.OrderNum')},
- {field: 'code', width: 60, title: t('reportingWorks.glassNumber')},
- {field: 'width', width: 100, title: t('order.width')},
- {field: 'height', width: 100, title: t('order.height')},
+ {field: 'code', width: 100, title: t('reportingWorks.glassNumber')},
+ {field: 'width', width: 90, title: t('order.width')},
+ {field: 'height', width: 90, title: t('order.height')},
+ {field: 'workProcessName', width: 120, title: t('report.workProcessName')},
{field: 'edgingType', width: 110, title: t('order.edgingType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'completedQuantity', width: 90, title: t('reportingWorks.completedQuantity')},
{field: 'area', width: 100, title: t('reportingWorks.completedArea')},
- {field: 'reviewed', title: t('processCard.reviewed')},
- {field: 'examineTime', title: t('ingredientsStock.reviewedTime')},
- {field: 'productName', title: t('order.product')},
+ {field: 'reviewed',width: 80, title: t('processCard.reviewed')},
+ {field: 'examineTime',width: 80, title: t('ingredientsStock.reviewedTime')},
+ {field: 'productName',width: 150, title: t('order.product')},
],//琛ㄥご鎸夐挳
toolbarConfig: {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index b5a0586..7eb9d2e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -23,6 +23,8 @@
const user=userInfo()
//瀹氫箟琛ㄥご鏁版嵁
const titleUploadData = ref({
+ //鏄惁鍚堢墖宸ュ簭
+ laminating:'',
reportingWorkId: null,
//娴佺▼鍗″彿
processId: null,
@@ -90,9 +92,19 @@
let inputDisabled = ref(false)
-onMounted(() =>{
+onMounted(async () =>{
+ await initTiltle()
if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
titleUploadData.value.processId = route.query.processId
+ //褰撹川妫�瀹℃牳鍚庡姞杞芥槑缁嗕俊鎭�
+ if(route.query.reviewStatus === '1'){
+ if(titleUploadData.value.thisProcess !== undefined
+ && titleUploadData.value.thisProcess!==''
+ && titleUploadData.value.thisProcess!=null){
+ getWork()
+ getQuantity()
+ }
+ }
}
//route.query.reportingWorkId = 'BG2403150004'
//鍒ゆ柇鏄惁浼犲叆鎶ュ伐缂栧彿
@@ -339,6 +351,13 @@
},
{field: 'completed', width: 90, title:t('reportingWorks.completed'),},
{field: 'onceBroken', width: 90, title: t('reportingWorks.onceBroken'),},
+ {
+ field: 'reviewed_state',
+ title: t('processCard.reviewedState'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
],
//琛ㄥ崟楠岃瘉
@@ -779,11 +798,11 @@
})
const maxQuantity = Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
equalByOrderNum.forEach((row) =>{
- if (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�'){
+ if (laminating == 'laminating'){
row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
}
-
})
@@ -795,23 +814,26 @@
//绗竴娆″姞杞芥暟鎹�
let groupChangeProcess = ref(false)//鐢ㄤ簬鏈彮缁勬樉绀洪棶棰�
-request.post(`/reportingWork/selectProcess/${user.user.userId}`).then((res) => {
- if (res.code == 200) {
- titleSelectJson.value.processType = res.data.process
- if(user.user.address!==null && user.user.address!==''){
- titleUploadData.value.thisProcess = user.user.address
- titleUploadData.value.teamsGroupsName = user.user.userName
- groupChangeProcess.value = true
- if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
- groupChangeProcess.value = false
+const initTiltle = async () => {
+ await request.post(`/reportingWork/selectProcess/${user.user.userId}`).then((res) => {
+ if (res.code == 200) {
+ titleSelectJson.value.processType = res.data.process
+ if(user.user.address!==null && user.user.address!==''){
+ titleUploadData.value.thisProcess = user.user.address
+ titleUploadData.value.teamsGroupsName = user.user.userName
+ groupChangeProcess.value = true
+ if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+ groupChangeProcess.value = false
+ }
+ gridOptions.toolbarConfig.buttons[1].visible=false
}
- gridOptions.toolbarConfig.buttons[1].visible=false
- }
- } else {
- ElMessage.warning(res.msg)
- }
-})
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
function checkSameNumForId(data, targetId) {
// 鍒濆鍖栦竴涓璞℃潵瀛樺偍閬囧埌鐨刬d鍙婂叾瀵瑰簲鐨刵um鍊�
@@ -1031,6 +1053,7 @@
router.push({path:'/main/reportingWorks/AddReportingWork',
query:{
processId:titleUploadData.value.processId,
+ reviewStatus:1,
random:Math.random()
}
})
@@ -1096,6 +1119,7 @@
titleUploadData.value = res.data.data
titleUploadData.value.processId = processId
titleUploadData.value.teamsGroupsName = user.user.userName
+ titleUploadData.value.laminating = res.data.laminating
//璁惧涓嬫媺妗�
titleSelectJson.value.deviceType = res.data.device
//鐝粍涓嬫媺妗�
@@ -1150,7 +1174,20 @@
//缁戝畾涓嬫柟琛ㄦ牸
detail.value = res.data.Detail
- xGrid.value.reloadData(detail.value)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = detail.value.map(item => {
+ if (item.reviewed_state === 1) {
+ return { ...item, reviewed_state: "宸插鏍�" };
+ }
+ else if (item.reviewed_state === 0) {
+ return { ...item, reviewed_state: "鏈鏍�" };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.reloadData(modifiedCollection)
} else {
ElMessage.warning(res.msg)
}
@@ -1203,9 +1240,10 @@
const editClosedEvent = ({ row, column }) => {
let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
if (column.property==='completedQuantity') {
xGrid.value.getTableData().fullData.forEach((item, index) =>{
- if(item.order_number===row.order_number && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
+ if(item.order_number===row.order_number && laminating == 'laminating'){
item.completedQuantity=row.completedQuantity
}
})
@@ -1215,12 +1253,15 @@
const getQuantity = () => {
titleUploadData.value.thisCompletedQuantity = 0
titleUploadData.value.thisWornQuantity = 0
+ let laminating = titleUploadData.value.laminating
const arr = xGrid.value.getTableData().fullData
- const returnArr = arr.filter((obj, index, self) =>
- self.findIndex((t) => t.order_number === obj.order_number) === index
- )
-
-
+ //鏍规嵁鏄惁鍚堢墖宸ュ簭杩囨护
+ const returnArr =
+ laminating === "laminating"
+ ? arr.filter((obj, index, self) =>
+ self.findIndex((t) => t.order_number === obj.order_number) === index
+ )
+ : arr;
let sumBreak = 0
let sumQuantity = 0
returnArr.forEach((item)=>{
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 5c0b6c4..1b806bb 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
@@ -192,7 +192,7 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
-
+ gridOptions.loading = true
let startTime = form.date1[0]
let endTime = form.date1[1]
let inputVal = form.orderId
@@ -274,6 +274,7 @@
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
+ total.value = res.data.footSum
produceList = deepClone(res.data.data)
// 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
let modifiedCollection = produceList.map(item => {
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
index 6921c96..da7d7fa 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
@@ -302,7 +302,7 @@
</el-col>
</template>
<template #add>
- <el-button @click="add" type="primary" style="margin-right: 3px">鏂板</el-button>
+ <el-button @click="add" type="primary" style="margin-right: 3px">{{$t('basicData.insert')}}</el-button>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
index 4763dc1..df97c1d 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -201,8 +201,8 @@
body: {
options: [
[
- { code: 'sheet1', name: '璁㈠崟', prefixIcon: 'vxe-icon-file-txt', visible: true},
- { code: 'sheet2', name: '鍙戣揣', prefixIcon: 'vxe-icon-file-txt', visible: true},
+ { code: 'sheet1', name: t('orderBasicData.order'), prefixIcon: 'vxe-icon-file-txt', visible: true},
+ { code: 'sheet2', name: t('searchOrder.delivery'), prefixIcon: 'vxe-icon-file-txt', visible: true},
]
]
}
@@ -260,7 +260,7 @@
switch (menu.code) {
case 'sheet1': {
if(rowClickIndex.value===null){
- ElMessage.warning("鏈煡璇㈠埌瀹㈡埛淇℃伅")
+ ElMessage.warning(t('customer.msgList.notCustomerInfo'))//"鏈煡璇㈠埌瀹㈡埛淇℃伅"
return
}
router.push({path: '/main/customer/selectCustomerOrder', query: { id: row.id,type:1 }})
@@ -269,7 +269,7 @@
}
case 'sheet2': {
if(rowClickIndex.value===null){
- ElMessage.warning("鏈煡璇㈠埌瀹㈡埛淇℃伅")
+ ElMessage.warning(t('customer.msgList.notCustomerInfo'))
return
}
router.push({path: '/main/customer/selectCustomerOrder', query: { id: row.id,type:2 }})
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
index 8d5ce1f..49a73bf 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
@@ -265,7 +265,7 @@
const blob = new Blob([res])
if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
const elink = document.createElement('a')
- elink.download = `瀹㈡埛璁㈠崟.xlsx`
+ elink.download = `customerOrder.xlsx`
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
@@ -281,7 +281,7 @@
const blob = new Blob([res])
if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
const elink = document.createElement('a')
- elink.download = `瀹㈡埛鍙戣揣.xlsx`
+ elink.download = `customerDelivery.xlsx`
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
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 84a16ce..636316f 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
@@ -186,9 +186,14 @@
pageNum=1
produceList = deepClone(res.data.data)
+
+
+ const orderDetails = res.data.data
+ orderDetails.forEach(item => {
+ item.otherColumns = JSON.parse(item.otherColumns)
+ })
+ xGrid.value.reloadData(orderDetails)
xGrid.value.loadData(produceList)
-
-
//绂佺敤鎸夐挳
gridOptions.toolbarConfig.buttons[1].disabled = true
gridOptions.toolbarConfig.buttons[2].disabled = true
@@ -230,7 +235,7 @@
pageNum=1
produceList = deepClone(res.data.data)
-
+ console.log(res.data.data)
const orderDetails = res.data.data
orderDetails.forEach(item => {
item.otherColumns = JSON.parse(item.otherColumns)
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 635a91b..8ff5bae 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
@@ -18,6 +18,7 @@
import footSum from "@/hook/footSum"
import {useI18n} from "vue-i18n"
import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
+import OrderNumberReportTransfer from "@/components/sd/order/OrderNumberReportTransfer.vue";
const { t } = useI18n()
let dialogTableVisible = ref(false)
@@ -25,6 +26,13 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
+let dialogTransferVisible = ref(false)
+const transferData = ref({
+ oldOrderId:null,
+ newOrderNumber:null,
+ newOrderId:null,
+ oldOrderNumber:null,
+})
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
const userStore = useUserInfoStore()
@@ -117,7 +125,8 @@
{ code: 'errorArea', name: t('basicData.errorSettlementArea'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
{ code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
- { code: 'updateOrderId', name: '淇敼璁㈠崟鍙�', prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
+ { code: 'updateOrderId', name: t('searchOrder.updateOrderId'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
+ { code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true }
]
]
}
@@ -749,12 +758,20 @@
})
}
-
-
-
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled = false
+ break
+ }
+ case "reportingTransfer":{
+ const row = xGrid.value.getCurrentRecord()
+ if(row===null){
+ ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
+ return
+ }
+ transferData.value.oldOrderNumber = row.orderNumber
+ transferData.value.oldOrderId = titleUploadData.value.orderId
+ dialogTransferVisible.value = true
break
}
}
@@ -880,9 +897,10 @@
gridOptions.toolbarConfig.buttons[2].disabled = true
gridOptions.toolbarConfig.buttons[3].disabled = true
gridOptions.toolbarConfig.buttons[4].disabled = true
-
-
}
+ }
+ if(res.data.order.processingCard>0 && company.connectMes){
+ gridOptions.menuConfig.body.options[0][12].disabled = false
}
if(res.data.order.productionOrder !==0 ){
@@ -1089,17 +1107,17 @@
orderId:newOrderId.value,
random:Math.random()}})
}else if(res.data==="false1"){
- ElMessage.warning("杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorGtMaxId'))
}else if(res.data==="false2"){
- ElMessage.warning("杈撳叆璁㈠崟鍙峰凡瀛樺湪")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorIsExist'))
}else if(res.data==="false3"){
- ElMessage.warning("杈撳叆璁㈠崟鍙风浉鍚�")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorIsSame'))
}else if(res.data==="false4"){
- ElMessage.warning("杈撳叆璁㈠崟鍙烽暱搴︿笉绗�")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorDiscrepancyInLength'))
}else if(res.data==="false5"){
- ElMessage.warning("璇疯緭鍏ユ暟瀛�")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorInputNumber'))
}else if(res.data==="false6"){
- ElMessage.warning("涓嶈兘淇敼绗竴涓崟瀛�")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorNotNo1'))
}
})
}
@@ -1142,8 +1160,7 @@
await ElMessageBox.confirm(
t('order.msg.differentSize'),
t('order.msg.warning'),
- {
- confirmButtonText: t('basicData.confirmButtonText'),
+ {confirmButtonText: t('basicData.confirmButtonText'),
cancelButtonText: t('basicData.cancelButtonText'),
type: 'warning',
}
@@ -1579,6 +1596,13 @@
await initOrder(1)
createCustomerVisible.value = false
}
+const orderNumberTransfer = () => {
+ router.push({
+ path:'/main/order/createOrder',
+ query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
+}
</script>
@@ -1852,6 +1876,14 @@
<create-customer :getOrderPage="'order'" @getOrderFunction="createCustomerSuccess" />
</el-dialog>
+<!-- 璁㈠崟鎶ュ伐杞Щ-->
+ <el-dialog v-model="dialogTransferVisible"
+ :close-on-click-modal="false"
+ :title="$t('order.orderTransfer')"
+ destroy-on-close width="500">
+ <order-number-report-transfer :transferData="transferData" @orderNumberTransfer="orderNumberTransfer"/>
+ </el-dialog>
+
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue b/north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue
index b137b93..146fc57 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue
@@ -33,6 +33,7 @@
{field: 'order.packType',width:120, title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
// {field: 'prodID',width:120, title: '宸ヨ壓娴佺▼',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'perimeter',width:120, title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'weight',width:120, title: t('processCard.weight'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'price',width:120, title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'grossAmount',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'order.otherMoney',width:120, title: t('basicData.otherAmounts'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -51,7 +52,7 @@
url :'/order/getOrderProductSummary',
exportUrl :'/order/exportOrderProductSummary',
exportName:t('order.orderDetailsSummaryReport'),
- footList:['quantity','grossArea','computeGrossArea','perimeter','price','grossAmount']
+ footList:['quantity','grossArea','computeGrossArea','perimeter','price','grossAmount','weight']
})
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 f990bee..59b2f33 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
@@ -33,6 +33,7 @@
{field: 'order.packType',width:120, title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
// {field: 'prodID',width:120, title: '宸ヨ壓娴佺▼',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'perimeter',width:120, title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'weight',width:120, title: t('processCard.weight'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'price',width:120, title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'grossAmount',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'order.otherMoney',width:120, title: t('basicData.otherAmounts'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -51,7 +52,7 @@
url :'/order/getOrderReport',
exportUrl :'/order/exportOrderReport',
exportName:t('order.orderDetailsReport'),
- footList:['quantity','grossArea','computeGrossArea','perimeter','price','grossAmount']
+ footList:['quantity','grossArea','computeGrossArea','perimeter','price','grossAmount','weight']
})
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 b99f723..6034cbf 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
@@ -390,11 +390,11 @@
ElMessage.success(t('product.msg.operateSuccess')+'!')
selectOrderList()
}else if(res.data==='false1'){
- ElMessage.warning('姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�')
+ ElMessage.warning(t('searchOrder.msgList.isOptimize'))
}else if(res.data==='false2'){
- ElMessage.warning('姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�')
+ ElMessage.warning(t('searchOrder.msgList.isReportingWork'))
}else if(res.data==='false3'){
- ElMessage.warning('姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�')
+ ElMessage.warning(t('searchOrder.msgList.isStorage'))
}
})
})
@@ -598,6 +598,12 @@
}
}
+//璁㈠崟璺濈灏忎簬涓夊ぉ鍒欐敼鍙榗heckbox class 鏀瑰彉棰滆壊
+const timeOutChangeColor =(row)=>{
+ if(company.timeOut){
+ return row.timeOut
+ }
+}
</script>
@@ -643,12 +649,14 @@
<template #state="{ row,column}">
<el-checkbox
+ :class="timeOutChangeColor(row)"
v-if="row[column.field] === 2"
@click.native.prevent
:indeterminate="row[column.field]===1"
:checked="true"/>
<el-checkbox
v-else
+ :class="timeOutChangeColor(row)"
@click.native.prevent
:indeterminate="row[column.field]===1"
:checked="false"/>
@@ -794,7 +802,10 @@
height: 100%;
}
-
+:deep(.timeOut.is-checked .el-checkbox__inner) {
+ background-color: orangered;
+ border-color: orangered;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue b/north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
index 4481166..e124ad7 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
@@ -816,7 +816,7 @@
margin-left: 0.5rem;"
size="large"
type="primary"
- round>{{"澶嶅埗"}}</el-button>
+ round>{{$t('basicData.copy')}}</el-button>
<el-button
:disabled="productTotal.state===1"
@click="saveProduct(null)"
diff --git a/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java b/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
index de38cd4..1e5386d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
+++ b/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
@@ -11,8 +11,6 @@
/**
* 鑷畾涔夋潈闄愯璇佹帴鍙ｆ墿灞曪紝Sa-Token 灏嗕粠姝ゅ疄鐜扮被鑾峰彇姣忎釜璐﹀彿鎷ユ湁鐨勬潈闄愮爜
*
- * @author kong
- * @since 2022-10-13
*/
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
index b764fe8..7c01ca0 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
@@ -43,4 +43,6 @@
private String reviewed;
@ExcelProperty("瀹℃牳鏃堕棿")
private String examineTime;
+ @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+ private String workProcessName;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
index b0857bc..a326716 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -101,6 +101,8 @@
private LocalDate updateTime;
@TableField(select = false,exist = false)
private Integer goodsQuantity;
+ @TableField(select = false,exist = false)
+ private String timeOut;
@TableField(value = "customer_id")
private Customer customer;
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
index 6d92307..14b0df8 100644
--- 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
@@ -1,5 +1,6 @@
package com.example.erp.mapper.pp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.dto.pp.ReworkDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.pp.FlowCard;
@@ -12,7 +13,7 @@
import java.util.Map;
@Mapper
-public interface ReworkMapper {
+public interface ReworkMapper extends BaseMapper<Rework> {
List<ReworkDTO> SelectRework(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,
String startDate, String endDate,@Param("rework") ReworkDTO rework);
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
index 9073b81..1e75c89 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
@@ -35,7 +35,9 @@
Map<String, Object> getSelectotherMoney(@Param("orderId") String orderId,@Param("deliveryId") String deliveryId,
@Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") Double value);
- Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value);
+ Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value,@Param("quantity") Integer quantity);
+
+ Map<String, Object> getSelectOrderotherMoneys(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value);
List <Map<String, Object>> getSelectOrderDetailPrinting(@Param("productId") Integer productId,@Param("orderId") String orderId);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 1be42c5..59a3aa2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -1030,6 +1030,7 @@
Log log = new Log();
log.setOperatorId(object.get("userId").toString());
log.setOperator(object.get("userName").toString());
+ log.setFunction("cancelMaterialAdditionRecord鐗╂枡鏂板鎾ら攢");
log.setContent(object.toString());
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<MaterialLog> materialLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("materialAdd")), MaterialLog.class);
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 4d1ad8c..1eb8bb5 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
@@ -67,6 +67,8 @@
private final SysErrorService sysErrorService;
private final FinishedOperateLogMapper finishedOperateLogMapper;
private final RestTemplate restTemplate;
+ private final PatchLogMapper patchLogMapper;
+ private final ReworkMapper reworkMapper;
/*public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper, SysErrorService sysErrorService, OrderDetailMapper orderDetailMapper, FinishedOperateLogMapper finishedOperateLogMapper, ReportingWorkTransferMapper reportingWorkTransferMapper) {
@@ -153,7 +155,7 @@
if (retrievedData!=null){
Integer reviewedState = retrievedData.getReviewedState();
//鏍规嵁瀹℃牳鐘舵�佹煡璇㈡湭瀹℃牳鏁版嵁
- if (reviewedState==1){//宸插鏍�
+ // if (reviewedState==1){//宸插鏍�
//涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating);
if(process.equals("涓┖")){
@@ -171,24 +173,24 @@
});
}
map.put("Detail",details );
- }else {
- //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
- List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
- if(process.equals("涓┖")){
- String orderId = reportingWorkMapper.selectOrderid(processIdStr);
- details.forEach( detail -> {
- Integer glassId = orderGlassDetailMapper.
- getMinIdByGroup(orderId,
- String.valueOf(detail.get("order_number")),
- String.valueOf(detail.get("group")));
- int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
- if(listGlassId !=glassId){
- detail.put("rowClass","latter");
- }
- });
- }
- map.put("Detail",details );
- }
+// }else {
+// //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
+// List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
+// if(process.equals("涓┖")){
+// String orderId = reportingWorkMapper.selectOrderid(processIdStr);
+// details.forEach( detail -> {
+// Integer glassId = orderGlassDetailMapper.
+// getMinIdByGroup(orderId,
+// String.valueOf(detail.get("order_number")),
+// String.valueOf(detail.get("group")));
+// int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
+// if(listGlassId !=glassId){
+// detail.put("rowClass","latter");
+// }
+// });
+// }
+// map.put("Detail",details );
+// }
}
}
@@ -204,6 +206,8 @@
map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
//鍘嗗彶宸ュ簭
map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
+ //鏄惁鍚堢墖宸ュ簭
+ map.put("laminating", laminating);
}
return map;
}
@@ -842,12 +846,24 @@
@Transactional(rollbackFor = Exception.class)
public Object reportingWorkTransferSv(Map<String, String> reportingWork) {
+ Map<String, Object> result = new HashMap<>();
+
Order oldOrder = orderMapper.selectOrderId(reportingWork.get("oldOrderId"));
OrderDetail oldOrderDetail = orderDetailMapper.selectOne(
new QueryWrapper<OrderDetail>()
.eq("order_id", reportingWork.get("oldOrderId"))
.eq("order_number", reportingWork.get("oldOrderNumber"))
);
+ if(oldOrder == null){
+ result.put("msg","鏃ц鍗曚笉瀛樺湪");
+ result.put("data",false);
+ return result;
+ }
+ if(oldOrderDetail == null){
+ result.put("msg","鏃ц鍗曟搴忓彿涓嶅瓨鍦�");
+ result.put("data",false);
+ return result;
+ }
Order newOrder = orderMapper.selectOrderId(reportingWork.get("newOrderId"));
OrderDetail newOrderDetail = orderDetailMapper.selectOne(
@@ -855,15 +871,37 @@
.eq("order_id", reportingWork.get("newOrderId"))
.eq("order_number", reportingWork.get("newOrderNumber"))
);
+ if (newOrder == null){
+ result.put("msg","鏂拌鍗曚笉瀛樺湪");
+ result.put("data",false);
+ return result;
+ }
+ if(newOrderDetail == null){
+ result.put("msg","鏂拌鍗曟搴忓彿涓嶅瓨鍦�");
+ result.put("data",false);
+ return result;
+ }
+ if(Objects.equals(oldOrder.getOrderId(), newOrder.getOrderId())){
+ result.put("msg","鏂版棫璁㈠崟鍙蜂竴鑷�");
+ result.put("data",false);
+ return result;
+ }
+
if(!Objects.equals(oldOrder.getCustomerId(), newOrder.getCustomerId())){
- return "鏂版棫璁㈠崟瀹㈡埛涓嶄竴鑷�";
+ result.put("msg","鏂版棫璁㈠崟瀹㈡埛涓嶄竴鑷�");
+ result.put("data",false);
+ return result;
}
if(!Objects.equals(oldOrderDetail.getProductId(), newOrderDetail.getProductId())){
- return "鏂版棫璁㈠崟浜у搧涓嶄竴鑷�";
+ result.put("msg","鏂版棫璁㈠崟浜у搧涓嶄竴鑷�");
+ result.put("data",false);
+ return result;
}
if (!Objects.equals(oldOrderDetail.getWidth(), newOrderDetail.getWidth())
|| !Objects.equals(oldOrderDetail.getHeight(), newOrderDetail.getHeight())){
- return "鏂版棫璁㈠崟灏哄涓嶄竴鑷�";
+ result.put("msg","鏂版棫璁㈠崟灏哄涓嶄竴鑷�");
+ result.put("data",false);
+ return result;
}
@@ -874,7 +912,9 @@
.eq("order_number", reportingWork.get("oldOrderNumber"))
);
if(oldOrderProcessDetailList.isEmpty()){
- return "鏃ц鍗曟湭鍒嗘祦绋嬪崱";
+ result.put("msg","鏃ц鍗曟湭鍒嗘祦绋嬪崱");
+ result.put("data",false);
+ return result;
}
//鑾峰彇鏂拌鍗曟槸鍚︽祦绋嬪崱鏄惁瀛樺湪
List<OrderProcessDetail> newOrderProcessDetailList = orderProcessDetailMapper
@@ -883,7 +923,9 @@
.eq("order_number", reportingWork.get("newOrderNumber"))
);
if(newOrderProcessDetailList.isEmpty()){
- return "鏂拌鍗曟湭鍒嗘祦绋嬪崱";
+ result.put("msg","鏂拌鍗曟湭鍒嗘祦绋嬪崱");
+ result.put("data",false);
+ return result;
}
//鏂拌鍗曟槸鍚﹀瓨鍦ㄥ凡缁忔帓鐗堝簭鍙�
List<FlowCard> newFlowCardLayoutStatus = flowCardMapper.selectList(new QueryWrapper<FlowCard>()
@@ -892,8 +934,21 @@
.gt("layout_status",0)
);
if(!newFlowCardLayoutStatus.isEmpty()){
- return "鏂拌鍗曟搴忓彿瀛樺湪鎺掔増";
+ result.put("msg","鏂拌鍗曟搴忓彿瀛樺湪鎺掔増");
+ result.put("data",false);
+ return result;
}
+ List<ReportingWorkTransfer> reportingWorkTransferList = reportingWorkTransferMapper
+ .selectList(new QueryWrapper<ReportingWorkTransfer>()
+ .eq("old_order", reportingWork.get("newOrderId"))
+ .eq("old_order_number", reportingWork.get("newOrderNumber"))
+ );
+ if(!reportingWorkTransferList.isEmpty()){
+ result.put("msg","鏂拌鍗曞簭鍙蜂箣鍓嶅凡杞嚭鎶ュ伐鏁版嵁锛屾棤娉曡繘琛岃浆鍏�");
+ result.put("data",false);
+ return result;
+ }
+
//鑾峰彇鏃ц鍗曟姤宸ユ暟鎹眹鎬�
List<OrderProcessDetail> oldOrderProcessDetailForReport = orderProcessDetailMapper
.selectList(new QueryWrapper<OrderProcessDetail>()
@@ -901,6 +956,51 @@
.eq("order_number", reportingWork.get("oldOrderNumber"))
.gt("reporting_work_num",0)
);
+
+ if (oldOrderProcessDetailForReport.isEmpty()){
+ result.put("msg","鏃ц鍗曟病鏈夊彲杞嚭鐨勬姤宸ユ暟鎹�");
+ result.put("data",false);
+ return result;
+ }
+ List<String> oldOrderProcessIdList = new ArrayList<>();
+ oldOrderProcessDetailList.forEach(oldOrderProcessDetail -> oldOrderProcessIdList.add(oldOrderProcessDetail.getProcessId()));
+
+ //鑾峰彇鏃ф暟鎹牬鎹熻〃鏄惁瀛樺湪鐮存崯
+ List<DamageDetails> damageDetails = damageDetailsMapper.selectList(
+ new QueryWrapper<DamageDetails>()
+ .in("process_id",oldOrderProcessIdList)
+ .eq("order_number", reportingWork.get("oldOrderNumber"))
+ .eq("quantity",0)
+ );
+ if(!damageDetails.isEmpty()){
+ result.put("msg","鏃ц鍗曞瓨鍦ㄦ姤宸ユ湭澶勭悊鐮存崯鏁版嵁");
+ result.put("data",false);
+ return result;
+ }
+ //鑾峰彇琛ョ墖琛ㄦ槸鍚﹀瓨鍦ㄨˉ鐗囨湭瀹℃牳鐘舵��
+ List<PatchLog> patchLogs = patchLogMapper.selectList(
+ new QueryWrapper<PatchLog>()
+ .eq("order_id", reportingWork.get("oldOrderId"))
+ .eq("order_sort", reportingWork.get("oldOrderNumber"))
+ .eq("review_status",0)
+ );
+ if (patchLogs.isEmpty()){
+ result.put("msg","鏃ц鍗曞瓨鍦ㄨˉ鐗囨湭瀹℃牳鏁版嵁");
+ result.put("data",false);
+ return result;
+ }
+ List<Rework> reworks = reworkMapper.selectList(
+ new QueryWrapper<Rework>()
+ .eq("order_id", reportingWork.get("oldOrderId"))
+ .eq("order_sort", reportingWork.get("oldOrderNumber"))
+ .eq("review_status",0)
+ );
+ if (patchLogs.isEmpty()){
+ result.put("msg","鏃ц鍗曞瓨鍦ㄨ繑宸ユ湭瀹℃牳鏁版嵁锛岃鍏堝鏍告姤宸ュ悗鍐嶈繘琛岃浆鍑�");
+ result.put("data",false);
+ return result;
+ }
+
Map<String,Object> log = new HashMap<>();
log.put("oldOrderBeforeChange",oldOrderProcessDetailForReport);
@@ -916,6 +1016,7 @@
reportingWorkMapper.update(null,new UpdateWrapper<ReportingWork>()
.set("reviewed_state",3)
.eq("process_id",oldOrderProcessDetail.getProcessId())
+ .gt("reviewed_state",0)
);
@@ -993,7 +1094,6 @@
orderNumberTransferList.add(orderNumberTransfer);
}
-
}
}
});
@@ -1021,17 +1121,20 @@
//restTemplate.postForObject("http://localhost:8086/order/test",orderNumberTransferList,String.class);
//鍚憁es鍙戦�乭ttp璇锋眰
- ResponseEntity<String> response =restTemplate.exchange(
+ ResponseEntity<OrderNumberTransferDTO> response =restTemplate.exchange(
"http://localhost:88/api/loadGlass/order/order/orderChange",
HttpMethod.POST,
new HttpEntity<>(orderNumberTransferList),
- String.class);
+ OrderNumberTransferDTO.class);
if(response.getStatusCode() == HttpStatus.OK){
- return true;
+ OrderNumberTransferDTO responseBody = response.getBody();
+ result.put("data",true);
}else{
- return "杩炴帴mes鍝嶅簲瓒呮椂";
+ result.put("msg","杩炴帴mes鍝嶅簲瓒呮椂");
+ result.put("data",false);
}
-
+ return result;
+
}
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 8898736..404611c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -328,7 +328,7 @@
if(isnull) {
Map<String, Object> moneryItemmap = new HashMap<>();
Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(),
- key, Double.valueOf(jsonObject.get(key).toString()));
+ key, Double.valueOf(jsonObject.get(key).toString()),orderDetail.getDeliveryDetail().getQuantity());
if(deliveryDetailOtherMoney.get("monery")!=null){
otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
@@ -611,7 +611,7 @@
boolean isnull = key.contains("M");
if(isnull){
Map<String, Object> moneryItemmap = new HashMap<>();
- Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString())
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoneys(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString())
,key,Double.valueOf(jsonObject.get(key).toString()));
grossAmount=grossAmount.add(BigDecimal.valueOf(Double.parseDouble(deliveryDetailOtherMoney.get("monery").toString())));
moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index fce62a7..fa7851d 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -5,6 +5,9 @@
ip: localhost
port: 3306
+#sa-token:
+# timeout: 86400
+
spring:
datasource:
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 dc508ae..d324b3d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -853,18 +853,18 @@
o.project,
od.building_number,
od.processing_note,
- ogd.child_width as width,
- ogd.child_height as height,
+ opd.o_width as width,
+ opd.o_height as height,
ogd.glass_child,
ogd.process,
e.type_name,
opd.stock_id,
opd.polys_id,
- od.quantity,
+ IFNULL(od.quantity,1) as quantity,
od.other_columns,
od.bend_radius,
- od.order_number as heat_layout_id,
- a.id as heat_layout_sort,
+ ifnull(od.order_number,0) as heat_layout_id,
+ ifnull(a.id,0) as heat_layout_sort,
od.product_name
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
@@ -912,7 +912,7 @@
left join sd.product p on od.product_id = p.id
left join sd.basic_glass_type e on e.type_id = p.type_id
left join sd.customer c on c.id = o.customer_id
- where opd.project_no = #{projectNo}
+ where opd.project_no = #{projectNo} and o.order_id is not null
order by opd.heat_layout_id, opd.heat_layout_sort desc
</select>
@@ -2790,7 +2790,7 @@
left join
(select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
on a.process_id=opd.process_id
- where opd.project_no = #{projectNo}
+ where opd.project_no = #{projectNo} and o.order_id is not null
group by order_id,od.order_number
order by ogd.child_width desc,ogd.child_height desc
</select>
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 c41dc89..e24d899 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -123,6 +123,7 @@
<result column="code" property="code"/>
<result column="reviewed" property="reviewed"/>
<result column="examine_time" property="examineTime"/>
+ <result column="workProcessName" property="workProcessName"/>
</resultMap>
<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -170,6 +171,7 @@
e.reportWorkQuantityCount,
e.reportWorkTime,
e.broken_num,
+ c.quantity*a.area as gross_area,
ifnull(f.inventory, 0) as inventory,
round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
ifnull(dd.quantity, 0) as shippedQuantity,
@@ -1330,7 +1332,8 @@
od.product_name,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
rw.reviewed,
- rw.examine_time
+ rw.examine_time,
+ GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
FROM
reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index a25e7bb..47e25ea 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -189,56 +189,55 @@
<!-- 闈炵涓�閬撳伐搴忔姤宸ユ槑缁嗘煡璇�-->
<select id="SelectReworlDetailMp">
SELECT
- fc.order_number,
- ogd.glass_child,
- ogd.technology_number,
- ogd.glass_address,
- fc.quantity AS quantity_card,
- ogd.child_width,
- ogd.child_height,
+ fc.order_number,
+ ogd.glass_child,
+ ogd.technology_number,
+ ogd.glass_address,
+ fc.quantity AS quantity_card,
+ ogd.child_width,
+ ogd.child_height,
if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
- 0,
+ if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
+ 0,
odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
- if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
- 0,
+ if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
+ 0,
odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as completedQuantity,
- odpd.reporting_work_num as completed,
- odpd.broken_num as onceBroken,
- ogd.`group`,
- if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- od.other_columns,
- ogd.id as 'glassId'
+ odpd.reporting_work_num as completed,
+ odpd.broken_num as onceBroken,
+ ogd.`group`,
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+ od.other_columns,
+ ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state
FROM
- sd.order_detail AS od
+ 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
- <if test="process == '澶硅兌'">
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')" >
AND ogd.`group` = (select `group`
- from sd.order_glass_detail
- where order_id = ogd.order_id
- and order_number = ogd.order_number
- and POSITION(technology_number in #{technologyStr})
- limit 1)
+ from sd.order_glass_detail
+ where order_id = ogd.order_id
+ and order_number = ogd.order_number
+ and POSITION(technology_number in #{technologyStr})
+ limit 1)
</if>
-
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
+ 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
+ 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
+ ON odpds.id = odpd.id-1
left join
- (SELECT
+ (SELECT
sum(rw.rework_num) as 'patchNumSum',
rw.process_id,rw.order_sort,rw.technology_number,
rwk.this_process
@@ -248,19 +247,30 @@
reporting_work as rwk
on rw.reporting_work_id =rwk.reporting_work_id
where rwk.this_process=#{process}
- and rw.review_status=1
+ and rw.review_status>=0
and rw.process_id = #{processIdStr}
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
-
- WHERE
- fc.process_id = #{processIdStr}
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join (select reviewed_state as reviewed_state ,
+ process_id,a.reporting_work_id,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
+ where this_process=#{previousProcess} and process_id= #{processIdStr} and a.reviewed_state>=0
<if test="laminating != 'laminating'">
- AND POSITION(fc.technology_number in #{technologyStr})
+ AND POSITION(b.technology_number in #{technologyStr})
</if>
+ GROUP BY b.order_number,b.technology_number
+ ) as rws
+ on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
+ WHERE
+ fc.process_id = #{processIdStr}
+
AND odpd.process = #{process}
+ <if test="laminating != 'laminating'">
+ AND POSITION(fc.technology_number in #{technologyStr})
+ </if>
order by fc.order_number
</select>
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 2c72047..eb2ec38 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -192,7 +192,7 @@
od.area,
od.gross_area,
od.compute_area,
- dd.area as compute_gross_area,
+ od.compute_gross_area,
od.processing_note,
od.edging_type,
od.perimeter,
@@ -1029,13 +1029,21 @@
</select>
<select id="getSelectOrderotherMoney" >
- select bom.alias,ifnull(oom.price,0) as price,#{value}*od.quantity as count,ifnull(oom.price,0)*#{value}*od.quantity as monery
+ select bom.alias,ifnull(oom.price,0) as price,#{value}*#{quantity} as count,ifnull(oom.price,0)*#{value}*#{quantity} as monery
from order_detail od
left join order_other_money oom on oom.order_id=od.order_id and oom.column=#{key}
left join basic_other_money bom on bom.`column`=oom.`column`
where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
</select>
+ <select id="getSelectOrderotherMoneys" >
+ select bom.alias,ifnull(oom.price,0) as price,#{value}*od.quantity as count,ifnull(oom.price,0)*#{value}*od.quantity as monery
+ from order_detail od
+ left join order_other_money oom on oom.order_id=od.order_id and oom.column=#{key}
+ left join basic_other_money bom on bom.`column`=oom.`column`
+ where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
+ </select>
+
<select id="getSelectOrderDetailPrinting" >
select od.order_id,
od.order_number,
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 5a7f36e..9525ef1 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -587,6 +587,7 @@
a.edging_type,
b.pack_type,
round(sum(a.perimeter),2) as perimeter,
+ round(sum(a.weight),2) as weight,
a.price,
sum(a.gross_amount ) as gross_amount,
b.al_type,
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index fc2ba1c..27d6d8c 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -104,7 +104,8 @@
<select id="getOrderList">
select * from (select
o.*,
- ifnull(sum(fgi.quantity_available),0) as goodsQuantity
+ ifnull(sum(fgi.quantity_available),0) as goodsQuantity,
+ if(DATEDIFF(o.delivery_date, CURDATE()) < 3 and o.delivery < 2, 'timeOut','' ) as timeOut
from
sd.`order` as o
left join mm.finished_goods_inventory as fgi
--
Gitblit v1.8.0