From 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 12 十一月 2024 15:52:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 7
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 4
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue | 1
north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue | 12 +
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 18 ++
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue | 308 ++++++++++++++++++++++++++++++++++++++
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 18 ++
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue | 37 ++++
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 16 +
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue | 41 ++--
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 12 +
11 files changed, 442 insertions(+), 32 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
index 3d7aa8a..3607a4c 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
@@ -68,7 +68,6 @@
}
}
}
- console.log(props.lastList)
} else {
ElMessage.warning(res.msg)
}
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue
new file mode 100644
index 0000000..38d0abc
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue
@@ -0,0 +1,308 @@
+<script setup>
+import request from "@/utils/request"
+import {ElDatePicker, ElMessage} from "element-plus"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+import {useRouter} from 'vue-router'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import {useI18n} from 'vue-i18n'
+import deepClone from "@/utils/deepClone";
+import companyInfo from "@/stores/sd/companyInfo"
+
+const company = companyInfo()
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+let produceList = ref([])
+let labelList = ref([])
+let titleList = ref([])
+let dataList = ref([])
+let list = ref([])
+let lastList = ref([])
+
+let filterData = ref({})
+
+const data = ref({
+ printList: []
+})
+
+let props = defineProps({
+ list:null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation:null,//鍐呭闈�
+ type:null,//鏍囩妯℃澘
+ lableType:null//鏍囩绫诲瀷
+})
+
+const {currentRoute} = useRouter()
+const route = currentRoute.value
+let type = props.type
+let faceOrientation = props.faceOrientation
+if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄鍐呴潰"){
+ faceOrientation='INSIDE'
+}
+else if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄澶栭潰"){
+ faceOrientation='OUTSIDE'
+}
+let lableType = props.lableType
+data.value.printList = JSON.parse(props.list)
+onMounted(() => {
+ request.post(`/processCard/getPrintCustomDataProjectNoDetail/${type}`, data.value).then((res) => {
+ if (res.code == 200) {
+ console.log(res.data.data)
+ produceList.value = deepClone(res.data.title)
+ list.value = deepClone(res.data.data)
+ const data = produceList.value[0].value
+ dataList = JSON.parse(`[${data}]`);
+ labelList = dataList[0]
+ for (let i = 0; i < list.value.length; i++) {
+ let count = list.value[i].data.length
+ for (let j = 0; j < count; j++) {
+ lastList.value.push(list.value[i].data[j])
+
+ }
+ }
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+
+ }
+)
+
+
+
+
+
+//淇敼鐩稿悓浜у搧鍚嶇О鏍囩
+const updateProductName = (event, index,id) => {
+ // 鍒涘缓鏄犲皠瀵硅薄
+ const propertyMapping = {};
+ labelList.forEach(item => {
+ propertyMapping[item.name] = item.title;
+ });
+ // 杈撳叆鐨勫��
+ const newValue = event.target.innerText;
+ const parts = newValue.split('锛�');
+ const result = parts[1]; // 鑾峰彇鍐掑彿鍚庣殑閮ㄥ垎
+
+ // 鑾峰彇鏄犲皠涓墍鏈夌殑閿�
+ const keys = Object.keys(propertyMapping);
+
+ // 鏍规嵁 index 鑾峰彇瀵瑰簲鐨勫睘鎬у悕
+ const propertyName = keys[index];
+
+ // 濡傛灉鏄犲皠涓病鏈夎 index锛岀洿鎺ヨ繑鍥�
+ if (!propertyName) {
+ console.warn('Unsupported index:', index);
+ return;
+ }
+
+ // 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
+ lastList.value.forEach(obj => {
+ // 鑾峰彇鍓嶇紑鍜� orderId
+ const prefix = lastList.value[id].processId.substring(0, 11);
+ const orderId = obj.orderId;
+ const glassNumber=lastList.value[id].glassNumber
+ const customerName = obj.customerName
+ // 鏍规嵁 propertyName 鏇存柊灞炴��
+ if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) {
+ obj.productAbbreviation = result;
+ }
+
+ if (propertyName === 'project' && orderId === obj.orderId) {
+ obj.project = result;
+ }
+ if (propertyName === 'productName' && prefix === obj.processId.substring(0, 11)){
+ obj.productName = result;
+ }
+ if (propertyName === 'customerName' && orderId === obj.orderId){
+ obj.customerName = result;
+ }
+ });
+}
+
+
+
+</script>
+
+<template>
+ <div id="print" :class="company.printLabel.className.custom.printFlowCardName()">
+ <div v-for="(item1,index) in lastList" :class="company.printLabel.className.custom.entiretyName()">
+ <div class="row4">{{ faceOrientation }}</div>
+ <div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
+ <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" contenteditable="true" @input="updateProductName($event, id,index)" v-text="item.title+'锛�'+item1[item.name]"></div>
+<!-- <div class="row2" style="width: 100%;"><input class="contentRow2" v-model="item1[item.name]" @keyup="updataProductName()" style="border: none;"/></div>-->
+<!-- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2" style="width: 100%;" contenteditable="true" @input="updateProductName($event, id)" v-text="item1[item.name]"></div>-->
+ </div>
+ <div v-html="company.printLabel.custom(item1)"></div>
+ </div>
+ </div>
+
+
+
+
+</template>
+
+<style scoped>
+* {
+ margin: 0;
+ padding: 0;
+}
+
+textarea {
+ border: none; /* 鍙栨秷榛樿杈规 */
+ padding: 0; /* 鍙栨秷榛樿鍐呰竟璺� */
+ margin: 0; /* 鍙栨秷榛樿澶栬竟璺� */
+ resize: none; /* 绂佺敤璋冩暣澶у皬鍔熻兘 */
+ font-family: Arial; /* 璁剧疆鑷畾涔夊瓧浣� */
+ font-size: 12px; /* 璁剧疆鑷畾涔夊瓧浣撳ぇ灏� */
+ line-height: 1; /* 璁剧疆琛岄珮 */
+ width: 100%; /* 璁剧疆瀹藉害涓�100% */
+ height: auto; /* 楂樺害鏍规嵁鍐呭鑷姩璋冩暣 */
+ box-sizing: border-box; /* 浣垮楂樺寘鎷唴杈硅窛鍜岃竟妗� */
+ overflow-y: hidden;
+}
+
+
+body {
+ overflow: hidden;
+ font-family: Arial;
+ font-size: 7px;
+}
+
+#printButton {
+ margin-top: -20px;
+ width: 100px;
+}
+
+.print{
+ width: 100%;
+ height: 100%;
+}
+
+/*鎴�*/
+.printFlowCard_finished {
+ /*
+ font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
+ */
+ flex-wrap: nowrap;
+ display: flex;
+ flex-direction: column;
+}
+
+
+/*鎴�*/
+.entirety_finished {
+ display: flex;
+ text-align: center;
+ flex-direction: column;
+ margin-left: 10px;
+ width: 100%;
+ height: 100%;
+
+}
+
+/*div{
+ font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
+}*/
+
+.row3 {
+ text-align: center;
+ /*display: flex;
+ justify-content:space-evenly;*/
+}
+
+.row3 label {
+ margin-top: 28px;
+}
+
+.contentRow {
+ font-weight: bolder;
+ display: flex;
+ text-align: center;
+ width: 100%;
+}
+
+label {
+ /*font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;*/
+}
+
+.contentRow .row1 {
+ width: 100%;
+}
+
+.entirety_finished .row4 {
+ font-weight: bolder;
+ text-align: right;
+ margin-right: 20px;
+}
+
+.contentRow .row1, .contentRow .row2 {
+ text-align: left;
+}
+
+input{
+ width: 100%;
+ border: none;
+}
+
+
+@page {
+ size: auto; /* auto is the initial value */
+ margin: 13mm 5mm 0mm 7mm; /* this affects the margin in the printer settings */
+}
+
+@media print {
+ div {
+ page-break-inside: avoid;
+ }
+
+ .entirety_finished {
+ page-break-before: always;
+ }
+
+}
+
+.printFlowCard_finished1 {
+ flex-wrap: wrap;
+ display: flex;
+ flex-direction: column;
+}
+
+
+/*鎴�*/
+.entirety_finished1 {
+ display: flex;
+ text-align: center;
+ flex-direction: column;
+ margin-left: 10px;
+ width: 337px;
+ height: 120px;
+
+}
+
+.contentRow1 {
+ font-weight: bolder;
+ display: flex;
+ text-align: center;
+ width: 100%;
+}
+
+.contentRow1 .row1 {
+ width: 30%;
+ font-weight: bolder;
+}
+
+.entirety_finished1 .row4 {
+ font-weight: bolder;
+ text-align: right;
+ margin-right: 10px;
+}
+
+.contentRow1 .row1, .contentRow1 .row2 {
+ text-align: left;
+ font-weight: bolder;
+}
+
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index ed72248..44dccf8 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -41,6 +41,7 @@
if (like == '') {
like = null
}
+let name=company.companyName
data.value.printList = JSON.parse(props.printList)
let flowCardCount = ''
onMounted(() => {
@@ -278,7 +279,8 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
<td>{{ itemDatile.mapNumber }}</td>
- <td>{{ itemDatile.s01Value }}</td>
+ <td v-if="name='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">{{ itemDatile.building_number }}</td>
+ <td v-else>{{ itemDatile.s01Value }}</td>
<td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
<td class="item" style="width: 5%;height: 100%;">
diff --git a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
index 70d3f9d..2e19bbd 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
@@ -278,6 +278,18 @@
}
},
{
+ tid: 'quantity', title: '璁㈠崟鏁伴噺', data: '', type: 'text',
+ options: {
+ field: 'quantity',
+ testData: '',
+ width:270,
+ height: 16,
+ fontSize: 11.25,
+ textAlign: "left",
+ textContentVerticalAlign: "middle"
+ }
+ },
+ {
tid: 'orderNumber', title: '璁㈠崟搴忓彿', data: '', type: 'text',
options: {
field: 'orderNumber',
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue
index 1fc4def..2b6df5c 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue
@@ -103,25 +103,27 @@
//椤甸潰绗竴娆″姞杞�
-request.get(`/BasicWarehouse/BasicWarehouseTypes/`+t('ingredientsStock.materialOutboundType')).then((res) => {
+const initOrder = async ()=> {
+ await request.get(`/BasicWarehouse/BasicWarehouseTypes/` + t('ingredientsStock.materialOutboundType')).then((res) => {
- if(res.code==200){
+ if (res.code == 200) {
- titleSelectJson.value=deepClone(res.data)
- const today = new Date
- today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
- titleUploadData.value.materialRequisitionDate = today.getFullYear() +
- '-' + ("0" + (today.getMonth() + 1)).slice(-2)
- + '-' + ("0" + today.getDate()).slice(-2)
- getWork()
- }else{
- ElMessage.warning(res.msg)
- }
-})
-
+ titleSelectJson.value = deepClone(res.data)
+ console.log("a"+titleSelectJson.value)
+ const today = new Date
+ today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
+ titleUploadData.value.materialRequisitionDate = today.getFullYear() +
+ '-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ + '-' + ("0" + today.getDate()).slice(-2)
+ getWork()
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
//鍒楁煡璇�
-const getWork = () => {
- request.get(`/BasicWarehouse/BasicWarehouseType/`+t('ingredients.originalFilm')+'|'+t('ingredients.accessories')).then((res) => {
+const getWork = async ()=> {
+ await request.get(`/BasicWarehouse/BasicWarehouseType/`+t('ingredients.originalFilm')+'|'+t('ingredients.accessories')).then((res) => {
if(res.code==200){
gridOptions.columns=[]
BasicData.value = res.data
@@ -149,7 +151,10 @@
const number = ref();
-onMounted(()=>{
+onMounted(async()=>{
+ await initOrder()
+
+
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions,cellArea.value)
//鍑哄簱鏂板
@@ -163,7 +168,7 @@
request.post("/materialInventory/getSelectMaterialInventory/1/100",filterData.value).then((res) => {
if(res.code==200){
-
+ console.log("b"+titleSelectJson.value)
titleUploadData.value.warehouseManager=userStore.user.userName
titleUploadData.value.outboundType = titleSelectJson.value.outboundType[0].operateTypeName
materialStore.value=[]
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
index a061e62..e641129 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
@@ -15,6 +15,7 @@
import PrintCustomLabelSemi from '@/components/pp/PrintCustomLabelSemi.vue'
import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelTwo.vue'
import PrintCustomLabelXJTwo from '@/components/pp/PrintCustomLabelXJTwo.vue'
+import PrintCustomLabelProject from '@/components/pp/PrintCustomLabelProject.vue'
import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
import footSum from "@/hook/footSum"
import companyInfo from "@/stores/sd/companyInfo"
@@ -32,6 +33,7 @@
const dialogTableVisibleCustomLabel = ref(false)
const dialogTableVisibleLabelXJ = ref(false)
const dialogTableVisibleLabelXJTwo = ref(false)
+const dialogTableVisibleLabelProject = ref(false)
const printVisible = ref(false)
let selectRecords = ref(null)
let titleStyleVisible = ref(false)
@@ -546,10 +548,21 @@
}
}
+ let name=company.companyName
labelRow.value.list = JSON.stringify(selectRecords)
- labelRow.value.type = '鎭掗懌甯︽暟閲�'
- labelRow.value.dataType=3
- dialogTableVisibleLabelXJTwo.value = true
+ if (name == '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'){
+ labelRow.value.type = '鎴愬搧鏍囩'
+ labelRow.value.dataType=3
+ labelRow.value.lableType = lableTypes
+ dialogTableVisibleLabelProject.value = true
+ }
+ else {
+ labelRow.value.type = '鎭掗懌甯︽暟閲�'
+ labelRow.value.dataType=3
+ dialogTableVisibleLabelXJTwo.value = true
+ }
+
+
break
@@ -763,6 +776,24 @@
:dataType="labelRow.dataType"
style="width: 100%;height: 100%"/>
</el-dialog>
+
+ <!-- 鎴愬搧鏍囩宸ョ▼鎵撳嵃-->
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabelProject"
+ :title="$t('processCard.printLabel')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContentLabel" :icon="Printer" circle/>
+ </template>
+ <print-custom-label-project id="childLabel"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index fb05fc3..edbd291 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -112,7 +112,12 @@
const button = {'code': 'printLabel',
status: 'primary',
'name': t('processCard.finishedProductPrinting2')}
- gridOptions.toolbarConfig.buttons.push(button)
+ let name=company.companyName
+ if (name != '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃') {
+ gridOptions.toolbarConfig.buttons.push(button)
+ }
+
+
const button2 = {'code': 'detailPrinting',
status: 'primary',
@@ -276,7 +281,16 @@
id: 'childLabel',
})
-
+const hideButton = () => {
+ let name=company.companyName
+ // 鏍规嵁鏉′欢鍊� hidePrintLabels 杩囨护鎸夐挳鏁扮粍
+ gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
+ // 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
+ if (name == '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃') {
+ return button.code !== 'printLabel';
+ }
+ })
+}
</script>
<template>
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 41cb646..383554e 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
@@ -327,6 +327,15 @@
materialOutboundId = object.get("materialOutboundId").toString();
}
if(materialOutboundId!=null){
+ List<MaterialOutboundDetail> materialOutboundDetailLists = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
+ if (!materialOutboundDetailLists.isEmpty()) {
+ for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailLists) {
+ //杩樺師鐗╂枡搴撳瓨鏁�
+ materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
+
+ }
+ }
+
materialInventoryMapper.deleteMaterialOutboundDetail(materialOutboundId);
materialInventoryMapper.deleteMaterialOutbound(materialOutboundId);
materialInventoryMapper.deleteMaterialLog(materialOutboundId);
@@ -363,6 +372,15 @@
returningId = object.get("returningId").toString();
}
if(returningId!=null){
+
+ List<ReturningWarehouseDetail> returningWarehouseDetailLists = materialInventoryMapper.getIsNotReturningWarehouseDetail(returningId);
+ if (!returningWarehouseDetailLists.isEmpty()) {
+ for (ReturningWarehouseDetail returningWarehouseDetail : returningWarehouseDetailLists) {
+ //杩樺師鐗╂枡搴撳瓨鏁�
+ materialInventoryMapper.updateMaterialInventoryAvailableOut(returningWarehouseDetail.getInventoryId(), returningWarehouseDetail.getReturnQuantity());
+ }
+ }
+
materialInventoryMapper.deleteReturningWarehouseDetail(returningId);
materialInventoryMapper.deleteReturningWarehouse(returningId);
materialInventoryMapper.deleteMaterialLog(returningId);
diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index 1eef82d..adcb287 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -562,11 +562,23 @@
</delete>
<select id="getMaximum" >
- select count(*) from mm.material_outbound where date(create_time)=CURDATE()
+ select
+ ifnull(SUBSTR(max(right(material_outbound_id,8)) from 7),0)
+ from
+ mm.material_outbound as a
+ where
+ date(a.create_time) = curdate()
+
</select>
<select id="getMaximums" >
- select count(*) from mm.returning_warehouse where date(create_time)=CURDATE()
+ select
+ ifnull(SUBSTR(max(right(returning_id,8)) from 7),0)
+ from
+ mm.returning_warehouse as a
+ where
+ date(a.create_time) = curdate()
+
</select>
<select id="getMaterialOutboundCount" >
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 b413693..d9e7de2 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -667,7 +667,8 @@
round(ogd.child_height) as height,
pd.separation,
fc.technology_number,
- IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber
+ IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
+ od.building_number
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -1217,7 +1218,8 @@
round(ogd.child_height) as height,
pd.separation,
fc.technology_number,
- IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber
+ IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
+ od.building_number
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -2187,7 +2189,8 @@
'鏂囨湰' as custom2,
'鏂囨湰' as custom3,
'鏂囨湰' as custom4,
- '鏂囨湰' as custom5
+ '鏂囨湰' as custom5,
+ od.quantity
from optimize_detail as opt
left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
left join sd.order as o on o.order_id=fc.order_id
@@ -2334,7 +2337,8 @@
'鏂囨湰' as custom2,
'鏂囨湰' as custom3,
'鏂囨湰' as custom4,
- '鏂囨湰' as custom5
+ '鏂囨湰' as custom5,
+ od.quantity
from optimize_detail as opt
left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
left join sd.order as o on o.order_id=fc.order_id
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
index 3ca6c8c..0c70752 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -42,7 +42,12 @@
<select id="getmaximum" >
- select count(*) from sd.delivery where date(create_time)=CURDATE()
+ select
+ ifnull(SUBSTR(max(right(delivery_id,8)) from 7),0)
+ from
+ sd.delivery as a
+ where
+ date(a.create_time) = curdate()
</select>
<select id="getmaximumMonth">
--
Gitblit v1.8.0