From c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 20 ++++
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue | 8
north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 8 +
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 44 ++++++--
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectPrintRepairFlowCard.vue | 4
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 14 ++
north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue | 108 ++++++++++++---------
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue | 4
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 2
north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue | 6
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 2
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java | 2
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java | 13 ++
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 2
north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue | 15 ++-
17 files changed, 172 insertions(+), 84 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
index 8186af5..285aaeb 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
@@ -148,6 +148,7 @@
<tr>
+ <th>搴忓彿</th>
<th class="title-1">{{company.columnName}}</th>
<th>褰╅噳鍥惧彿</th>
<th>缂栧彿</th>
@@ -157,8 +158,7 @@
<th>寤剁背</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
- <th>浜よ揣鏃ユ湡</th>
- <th>搴忓彿</th>
+ <th>澶囨敞</th>
<th>澶囨敞1</th>
<th>澶囨敞2</th>
<th>澶囨敞3</th>
@@ -172,6 +172,7 @@
<td colspan="3"></td>
</tr>
<tr v-for="(item1,index1) in item.productDetail" :key="index1">
+ <td>{{item1.orderNumber}}</td>
<td>{{ item1.otherColumns?.S02}}</td>
<td>{{ item1.otherColumns?.S03}}</td>
<td>{{ item1.otherColumns?.S01}}</td>
@@ -181,8 +182,7 @@
<td>{{item1.perimeter}}</td>
<td>{{item1.buildingNumber}}</td>
<td>{{item1.processingNote}}</td>
- <td></td>
- <td>{{item1.orderNumber}}</td>
+ <td>{{item1.remarks}}</td>
<td>
{{ ((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
index 5addf71..fe6402e 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -140,7 +140,7 @@
<th>寤剁背</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
- <th>浜よ揣鏃ユ湡</th>
+ <th>澶囨敞</th>
<th>搴忓彿</th>
<th>澶囨敞1</th>
<th>澶囨敞2</th>
@@ -166,7 +166,7 @@
<td>{{item1.perimeter}}</td>
<td>{{item1.buildingNumber}}</td>
<td>{{item1.processingNote}}</td>
- <td>{{}}</td>
+ <td>{{item1.remarks}}</td>
<td></td>
<td>{{((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}</td>
<td>{{((item1.otherColumns?.S05)?item1.otherColumns.S05:'')}}</td>
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 12d7461..3f6ea44 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -461,6 +461,26 @@
component: () => import('../views/pp/Replenish/SelectReplenish.vue'),
},
{
+ path: 'selectPrintRepairFlowCard',
+ name: 'selectPrintRepairFlowCard',
+ component: () => import('../views/pp/Replenish/SelectPrintRepairFlowCard.vue'),
+ },
+ {
+ path: 'printRepairFlowCard',
+ name: 'printRepairFlowCard',
+ component: () => import('../views/pp/Replenish/PrintRepairFlowCard.vue'),
+ },
+ {
+ path: 'printRepairProcess',
+ name: 'printRepairProcess',
+ component: () => import('../views/pp/Replenish/PrintRepairProcess.vue'),
+ },
+ {
+ path: 'printReplenishFlowCard',
+ name: 'printReplenishFlowCard',
+ component: () => import('../views/pp/Replenish/PrintReplenishFlowCard.vue'),
+ },
+ {
path: '',
redirect:'/main/Replenish/SelectReplenish'
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue
index 4dfb984..95c8ae0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue
@@ -99,6 +99,10 @@
},
]
+//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
+const printMerge = ref('')
+const printMergeOptions=[{}]
+
//鎵撳嵃绫诲瀷
const printType = ref()
@@ -163,7 +167,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -220,7 +224,6 @@
toolbarConfig: {
buttons: [
{code: 'print', name: t('processCard.print'), status: 'primary'},
- {code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
{code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
],
@@ -271,7 +274,7 @@
id += selectRecords[i].id + "|"
}
}
- router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}})
+ router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMerge.value}})
break
}
@@ -373,7 +376,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -488,6 +491,8 @@
<template>
<div class="main-div-customer">
+ <el-input clearable placeholder="鍚堝苟鎵撳嵃" v-model="printMerge" style="width: 90px"></el-input>
+
<label>{{$t('processCard.labelStyle')}}锛�</label>
<el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
<el-option
@@ -539,7 +544,7 @@
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
-<!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
+ <!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
<template #button_slot="{ row }">
<el-button @click="getTableRow(row,'edit')"
link
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
index 78e0d09..4a746e1 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
@@ -22,6 +22,7 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
+const printMerge = route.query.printMerge
data.value.printList = JSON.parse(route.query.printList)
let flowCardCount = data.value.printList.length
onMounted(() => {
@@ -33,7 +34,12 @@
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
- console.log(produceList.value)
+ if (printMerge!==null && printMerge!==undefined && printMerge!==""){
+
+ produceList.value.forEach(item => {
+ item.detail[0].technologyNumber = printMerge;
+ });
+ }
handleGetQRCode()
} else {
ElMessage.warning(res.msg)
@@ -48,12 +54,21 @@
const handleGetQRCode = async () => {
for (let i = 0; i < produceList.value.length; i++) {
- list= produceList.value[i].detail[0].processIdNumber;
- const url = `${list}`;
- // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鍙橀噺涓�
- const qrcode = ref('');
- qrcode.value = await QRCode.toDataURL(url);
- produceList.value[i].detail[0]["qrcode"]=qrcode.value
+ const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
+
+ for (let j = 0; j < technologyNumber.length; j++) {
+ const processId = produceList.value[i].detail[0].process_id;
+ const url = `${processId}/${technologyNumber[j]}`;
+
+ // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ const qrcodeData = await QRCode.toDataURL(url);
+ produceList.value[i].detail[0]["qrcodeList"].push({
+ qrcode: qrcodeData,
+ technologyNumber: technologyNumber[j]
+ });
+
+ }
}
};
@@ -61,41 +76,41 @@
// 鎵撳嵃鏂规硶
- const printFlowCard = () => {
- // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
- let el = document.getElementById("printFlowCard");
- let doc = document;
- let body = doc.body || doc.getElementsByTagName("body")[0];
- let printId = "print-" + Date.now();
+const printFlowCard = () => {
+ // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
+ let el = document.getElementById("printFlowCard");
+ let doc = document;
+ let body = doc.body || doc.getElementsByTagName("body")[0];
+ let printId = "print-" + Date.now();
- // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
- let content = doc.createElement("div");
- content.id = printId;
+ // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
+ let content = doc.createElement("div");
+ content.id = printId;
- // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
- let style = doc.createElement("style");
- style.innerHTML =
- "body>#" +
- printId +
- "{display:none}@media print{body>:not(#" +
- printId +
- "){display:none !important}body>#" +
- printId +
- "{display:block;padding-top:1px}}";
- //
- content.innerHTML = el.outerHTML;
- // // console.log("el.outerHTML", el.outerHTML);
- body.appendChild(style);
+ // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
+ let style = doc.createElement("style");
+ style.innerHTML =
+ "body>#" +
+ printId +
+ "{display:none}@media print{body>:not(#" +
+ printId +
+ "){display:none !important}body>#" +
+ printId +
+ "{display:block;padding-top:1px}}";
+ //
+ content.innerHTML = el.outerHTML;
+ // // console.log("el.outerHTML", el.outerHTML);
+ body.appendChild(style);
- // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
- // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
- body.appendChild(content);
- setTimeout(() => {
- window.print();
- body.removeChild(content);
- body.removeChild(style);
- }, 20);
- }
+ // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
+ // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
+ body.appendChild(content);
+ setTimeout(() => {
+ window.print();
+ body.removeChild(content);
+ body.removeChild(style);
+ }, 20);
+}
</script>
<template>
@@ -267,14 +282,15 @@
<td></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td rowspan="2">
- <div class='qrCode' style="width: 80px;height: 80px;">
- <img :src= qrCodeItem.qrcode>
+ <td colspan="19" >
+ <span style="display: flex;">
+ <span style="display: flex;width: 25%" v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index">
+ <div class='qrCode' style="width: 80px;height: 80px;">
+ <img :src= qrCodeItems.qrcode>
</div>
-
- </td>
- <td colspan="16">
- <span style="float: left;font-weight: bolder">{{ qrCodeItem.processIdNumber }}</span>
+ <span style="float: left;font-weight: bolder">{{ qrCodeItem.process_id+"/"+qrCodeItems.technologyNumber }}</span>
+ </span>
+ </span>
</td>
</tr>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue
index be817fe..d8a39f6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue
@@ -7,7 +7,7 @@
switch (type) {
case 'edit' :{
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/processCard/PrintFlowCard', query: { id: row.id }})
+ router.push({path: '/main/processCard/PrintRepairFlowCard', query: { id: row.id }})
break
}
case 'delete':{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue
index ff8f321..6501971 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue
@@ -26,7 +26,7 @@
<el-breadcrumb :separator-icon="ArrowRight">
<el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/Replenish/SelectReplenish' }">{{$t('replenish.patchManagement')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/Replenish/AddReplenish' }">{{$t('replenish.addPatches')}}</el-breadcrumb-item>
-<!-- <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/Replenish/PrintReplenishFlowCard' }">{{$t('replenish.printPatches')}}</el-breadcrumb-item>-->
+<!-- <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/Replenish/SelectPrintRepairFlowCard' }">{{$t('replenish.printPatches')}}</el-breadcrumb-item>-->
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
</el-breadcrumb>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectPrintRepairFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectPrintRepairFlowCard.vue
index 7b5a29b..e39bff8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectPrintRepairFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectPrintRepairFlowCard.vue
@@ -29,7 +29,7 @@
const getTableRow = (row, type) => {
switch (type) {
case 'edit' :{
- router.push({path: '/main/processCard/PrintFlowCard', query: { orderId: row.order_id }})
+ router.push({path: '/main/processCard/PrintRepairFlowCard', query: { orderId: row.order_id }})
break
}
}
@@ -82,7 +82,7 @@
}
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
+request.post(`/Replenish/selectReplenishPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 602ec63..8bc4983 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -99,6 +99,10 @@
},
]
+//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
+const printMerge = ref('')
+const printMergeOptions=[{}]
+
//鎵撳嵃绫诲瀷
const printType = ref()
@@ -270,7 +274,7 @@
id += selectRecords[i].id + "|"
}
}
- router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}})
+ router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMerge.value}})
break
}
@@ -487,6 +491,8 @@
<template>
<div class="main-div-customer">
+ <el-input clearable placeholder="鍚堝苟鎵撳嵃" v-model="printMerge" style="width: 90px"></el-input>
+
<label>{{$t('processCard.labelStyle')}}锛�</label>
<el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
<el-option
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
index 78e0d09..cb2f448 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
@@ -22,6 +22,7 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
+const printMerge = route.query.printMerge
data.value.printList = JSON.parse(route.query.printList)
let flowCardCount = data.value.printList.length
onMounted(() => {
@@ -33,7 +34,12 @@
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
- console.log(produceList.value)
+ if (printMerge!==null && printMerge!==undefined && printMerge!==""){
+
+ produceList.value.forEach(item => {
+ item.detail[0].technologyNumber = printMerge;
+ });
+ }
handleGetQRCode()
} else {
ElMessage.warning(res.msg)
@@ -48,12 +54,21 @@
const handleGetQRCode = async () => {
for (let i = 0; i < produceList.value.length; i++) {
- list= produceList.value[i].detail[0].processIdNumber;
- const url = `${list}`;
- // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鍙橀噺涓�
- const qrcode = ref('');
- qrcode.value = await QRCode.toDataURL(url);
- produceList.value[i].detail[0]["qrcode"]=qrcode.value
+ const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
+
+ for (let j = 0; j < technologyNumber.length; j++) {
+ const processId = produceList.value[i].detail[0].process_id;
+ const url = `${processId}/${technologyNumber[j]}`;
+
+ // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ const qrcodeData = await QRCode.toDataURL(url);
+ produceList.value[i].detail[0]["qrcodeList"].push({
+ qrcode: qrcodeData,
+ technologyNumber: technologyNumber[j]
+ });
+
+ }
}
};
@@ -267,14 +282,15 @@
<td></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td rowspan="2">
- <div class='qrCode' style="width: 80px;height: 80px;">
- <img :src= qrCodeItem.qrcode>
+ <td colspan="19" >
+ <span style="display: flex;">
+ <span style="display: flex;width: 25%" v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index">
+ <div class='qrCode' style="width: 80px;height: 80px;">
+ <img :src= qrCodeItems.qrcode>
</div>
-
- </td>
- <td colspan="16">
- <span style="float: left;font-weight: bolder">{{ qrCodeItem.processIdNumber }}</span>
+ <span style="float: left;font-weight: bolder">{{ qrCodeItem.process_id+"/"+qrCodeItems.technologyNumber }}</span>
+ </span>
+ </span>
</td>
</tr>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
index edd95e8..d8a37ef 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
@@ -214,12 +214,12 @@
filterMethod: filterChanged
},
{
- field: 'material_name', width: 120, title: t('mainIngredient.materialName'), filters: [{data: ''}],
+ field: 'material_name', width: 120, title: t('mainIngredientStock.materialName'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
- field: 'producer',title: t('mainIngredient.producer'), filters: [{data: ''}],
+ field: 'producer',title: t('mainIngredientStock.producer'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
@@ -232,7 +232,7 @@
{field: 'height', title: t('order.height'), showOverflow: "ellipsis"},
{field: 'quantity', title: t('report.quantityClaimed')},
{field: 'area', title: t('report.areaClaimed')},
- {field: 'date_of_manufacture', title: t('mainIngredient.dateOfManufacture')},
+ {field: 'date_of_manufacture', title: t('mainIngredientStock.dateOfManufacture')},
{field: 'date', title: t('report.dateClaimed')},
],//琛ㄥご鎸夐挳
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 67c06e7..819bcd3 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
@@ -1213,6 +1213,8 @@
v-model="titleUploadData.deliveryDate"
type="date"
placeholder=""
+ format="YYYY/MM/DD"
+ value-format="YYYY-MM-DD"
/>
</el-col>
<el-col :span="2"><el-text>{{$t('order.batch')}}锛�</el-text></el-col>
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index 069e4db..1338259 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.Rework;
import com.example.erp.exception.ServiceException;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.sql.Date;
import java.util.List;
import java.util.Map;
@@ -55,4 +57,15 @@
public Result updateReplenish( @RequestBody Map<String,Object> object){
return Result.seccess(replenishService.updateReplenish(object));
}
+
+ @ApiOperation("娴佺▼鍗¤ˉ鐗囨墦鍗版煡璇㈡帴鍙�")
+ @PostMapping("/selectReplenishPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ public Result selectReplenishPrintFlowCard(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String project,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(replenishService.selectReplenishPrintFlowCardSv(selectTime1, selectTime2, orderId, project, flowCard));
+ }
}
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 d8663cc..c483c63 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
@@ -26,7 +26,7 @@
private String orderClassify;
private String icon;
private String packType;
- private String deliveryDate;
+ private LocalDate deliveryDate;
private String batch;
private Integer calculateType;
private Integer salesmanId;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index b78390d..8b07e46 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.userInfo.SysError;
@@ -165,7 +166,16 @@
}
-
-
+ public Object selectReplenishPrintFlowCardSv(java.sql.Date selectTime1, java.sql.Date selectTime2, String orderId, String project, FlowCard flowCard) {
+ if ("null".equals(orderId)) {
+ orderId = "";
+ }
+ if ("null".equals(project)) {
+ project = "";
+ }
+ Map<String, Object> map = new HashMap<>();
+ // map.put("data", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2, orderId, project, flowCard));
+ return map;
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 110b790..69fe059 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -165,7 +165,7 @@
for (int i = 0; i < OrderDetails.size(); i++) {
OrderDetails.get(i).setOrderNumber(i+1);
OrderDetails.get(i).setOrderId(orderId);
- OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2/1000);
+ OrderDetails.get(i).setPerimeter((OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000);
OrderDetails.get(i).setWeight(1.0);
if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
//鑾峰彇寮挗寮у害
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 0c4b357..5809d93 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -614,7 +614,7 @@
<select id="productionScheduleMp">
select
a.order_number,
- if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
+ if(a.shape=1,'鏅舰',if(a.shape=2,'寮傚舰','')) as shape,
a.product_name,
b.child_width,
b.child_height,
--
Gitblit v1.8.0