From 1e92ed925b1015a5f9b573c661161f9518061419 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 27 六月 2024 11:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue | 26 +++---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue | 2
north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 21 +++-
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 3
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 2
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 58 +++++++++++++-
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 13 ---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java | 11 --
north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue | 55 +++++++++++++
10 files changed, 141 insertions(+), 52 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 285aaeb..2f87cf6 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
@@ -135,7 +135,7 @@
</tr>
<tr>
<th>纾ㄨ竟</th>
- <th colspan="2"></th>
+ <th colspan="2">{{data.order.otherRemarks}}</th>
<th>瀹屽伐鏃ユ湡</th>
<th colspan="2">{{data.order.deliveryDate}}</th>
<th>鍟嗘爣</th>
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 fe6402e..71f6e18 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
@@ -81,7 +81,7 @@
<div id="sheet">
<table border="1">
<tr class="title-s">
- <th colspan="16">
+ <th colspan="17">
<img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">
<h1>
{{company.companyName}}
@@ -90,14 +90,14 @@
</tr>
<tr class="title-s">
- <th colspan="6">鍦板潃:{{company.address}}</th>
+ <th colspan="7">鍦板潃:{{company.address}}</th>
<th colspan="5">鐢佃瘽:{{ company.telephone }}</th>
<th colspan="5">浼犵湡:{{ company.fax }}</th>
</tr>
<tr class="title-s" >
- <th colspan="16">
+ <th colspan="17">
<h3>鐜荤拑鍔犲伐鍗�</h3>
</th>
</tr>
@@ -105,7 +105,7 @@
<th class="title-1">瀹㈡埛鍚嶇О</th>
<th colspan="7">{{data.order.customerName}}</th>
<th class="title-1">宸ョ▼鍚嶇О</th>
- <th colspan="7">{{data.order.project}}</th>
+ <th colspan="8">{{data.order.project}}</th>
</tr>
<tr>
<th class="title-1">鐢熶骇鍗曞彿</th>
@@ -113,17 +113,17 @@
<th class="title-1">涓嬪崟鏃ユ湡</th>
<th colspan="3">{{data.order.createTime}}</th>
<th class="title-1">璁㈠崟绫诲瀷</th>
- <th colspan="3">{{data.order.orderType}}</th>
+ <th colspan="4">{{data.order.orderType}}</th>
<th class="title-1">璺熷崟鍛�</th>
<th colspan="3">{{data.order.creator}}</th>
</tr>
<tr>
<th>纾ㄨ竟</th>
- <th colspan="3"></th>
+ <th colspan="3">{{data.order.otherRemarks}}</th>
<th>瀹屽伐鏃ユ湡</th>
<th colspan="3">{{data.order.deliveryDate}}</th>
<th>鍟嗘爣</th>
- <th colspan="3">{{data.order.icon}}</th>
+ <th colspan="4">{{data.order.icon}}</th>
<th>鍖呰</th>
<th colspan="3">{{data.order.packType}}</th>
</tr>
@@ -138,6 +138,7 @@
<th>鐗囨暟</th>
<th>闈㈢Н</th>
<th>寤剁背</th>
+ <th>鍗婂緞</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
<th>澶囨敞</th>
@@ -150,7 +151,7 @@
<tbody v-for="(item,index) in data.orderDetail" :key="index">
<tr>
<td colspan="2" class="no-change-row">浜у搧鍚嶇О</td>
- <td colspan="9">{{item.productName}}</td>
+ <td colspan="10">{{item.productName}}</td>
<td class="no-change-row">浜у搧鎻忚堪</td>
<td colspan="4"></td>
</tr>
@@ -164,6 +165,7 @@
<td>{{item1.quantity}}</td>
<td>{{item1.grossArea}}</td>
<td>{{item1.perimeter}}</td>
+ <td>{{item1.bendRadius}}</td>
<td>{{item1.buildingNumber}}</td>
<td>{{item1.processingNote}}</td>
<td>{{item1.remarks}}</td>
@@ -189,7 +191,7 @@
<td>涓嬫枡-楂�</td>
<td>鎷遍珮</td>
- <td colspan="6"></td>
+ <td colspan="7"></td>
</tr>
<tr v-if="item1.differentSize" v-for="(item2,index2) in item1.orderGlassDetails" :key="index2" >
@@ -200,7 +202,7 @@
<td>{{item2.arc}}</td>
<td>{{item2.childHeight}}</td>
<td>{{item1.archRise}}</td>
- <td colspan="6"></td>
+ <td colspan="7"></td>
</tr>
</template>
@@ -210,7 +212,7 @@
<td>{{getQuantity(item.productDetail)}}</td>
<td>{{getArea(item.productDetail)}}</td>
<td>{{getPerimeter(item.productDetail)}}</td>
- <td colspan="8"></td>
+ <td colspan="9"></td>
</tr>
@@ -223,7 +225,7 @@
<td colspan=""></td>
</tr>
<tr>
- <td colspan="16" style="white-space: pre-wrap;text-align:left ">
+ <td colspan="17" style="white-space: pre-wrap;text-align:left ">
<template v-for="(item,index) in data.order.processingNote.split('\n')">
{{item}}
<br>
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 95c8ae0..cc7a5b7 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
@@ -13,6 +13,7 @@
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
import footSum from "@/hook/footSum"
+import {Search} from "@element-plus/icons-vue";
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
@@ -112,6 +113,23 @@
dataType: [],
})
+//瀹氫箟鍙橀噺
+const form = reactive({
+ date1: '',
+})
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+ return [start, end]
+}
+
const {currentRoute} = useRouter()
const route = currentRoute.value
@@ -130,6 +148,24 @@
}
})
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total * 1
+ total.pageTotal = res.data.total.pageTotal
+ pageTotal.value = res.data.total
+ xGrid.value.loadData(res.data.data)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -491,6 +527,25 @@
<template>
<div class="main-div-customer">
+ <el-date-picker
+ v-model="form.date1"
+ :default-time="defaultTime"
+ :end-placeholder="$t('basicData.endDate')"
+ :start-placeholder="$t('basicData.startDate')"
+ format="YYYY/MM/DD"
+ type="daterange"
+ value-format="YYYY-MM-DD"
+
+ />
+
+ <el-button
+ id="select"
+ :icon="Search"
+ type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
+
+ </el-button>
+
+
<el-input clearable placeholder="鍚堝苟鎵撳嵃" v-model="printMerge" style="width: 90px"></el-input>
<label>{{$t('processCard.labelStyle')}}锛�</label>
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 6501971..0777ee4 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/SelectPrintRepairFlowCard' }">{{$t('replenish.printPatches')}}</el-breadcrumb-item>-->
+<!-- <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/Replenish/PrintRepairFlowCard' }">{{$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/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 6a06007..dc0bece 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -430,8 +430,12 @@
//瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
checkedList.forEach((item) => {
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.quantity < checkedNum.value) throw new Error(t('processCard.schedulingQuantity'));
- //宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
+ console.log(item.quantity , checkedNum.value)
+ // if (item.quantity < checkedNum.value*1) throw new Error(t('processCard.schedulingQuantity'));
+ if (item.quantity < checkedNum.value*1){
+ ElMessage.warning(t('processCard.schedulingQuantity'))
+ }
+ //宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
item.quantity = item.quantity - checkedNum.value
//鍙宠竟琛ㄦ牸鏁版嵁
let rightData = $grid.getTableData().fullData
@@ -482,8 +486,8 @@
} else {
- item.baiscQuantity = item.baiscQuantity * 1 + leftData[leftfilterIndex].quantity * 1
- item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
+ // item.baiscQuantity = item.baiscQuantity * 1 + leftData[leftfilterIndex].quantity * 1
+ // item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
//item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
// for (let i = 0; i <checkedList.length ; i++) {
//
@@ -585,21 +589,24 @@
if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId === item.processId) {
leftData[i].quantity = leftData[i].quantity * 1 + checkedNum.value * 1
leftData[i].computeGrossArea=(leftData[i].computeGrossArea-leftData[i].width*leftData[i].height*leftData[i].baiscQuantity/1000000).toFixed(2)
-
break
} else if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId !== item.processId) {
-
delete item._X_ROW_KEY
$gridLeft.insert(item)
item._X_ROW_KEY = key
break
} else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId !== item.processId) {
-
+ delete item._X_ROW_KEY
+ $gridLeft.insert(item)
+ item._X_ROW_KEY = key
+ break
+ }else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId == item.processId) {
delete item._X_ROW_KEY
$gridLeft.insert(item)
item._X_ROW_KEY = key
break
}
+
}
}
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 8517983..d066014 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
@@ -1,5 +1,5 @@
<script setup>
-import {computed, nextTick, onMounted, reactive, ref, toRefs} from "vue";
+import {computed, nextTick, onMounted, onUnmounted, reactive, ref, toRefs} from "vue";
import {useRouter,useRoute} from 'vue-router'
import request from "@/utils/request";
import {ElMessage} from "element-plus";
@@ -82,10 +82,7 @@
})
-/*onMounted(() => {
- //鍚敤琛ㄦ牸鎷栧姩閫変腑
- addListener(xGrid.value, gridOptions)
-})*/
+
let inputDisabled = ref(false)
onMounted(() =>{
@@ -1050,6 +1047,57 @@
const $grid = xGrid.value
this.$grid.commitProxy('data', yourData)
}
+onMounted(() => {
+ window.addEventListener('keypress', qrcodeScanner);
+})
+
+// 鍦ㄧ粍浠跺嵏杞芥椂绉婚櫎閿洏浜嬩欢鐩戝惉
+onUnmounted(() => {
+ window.removeEventListener('keypress', qrcodeScanner);
+})
+
+let code = '';
+let codeArr = [];
+let lastTime,nextTime = ''
+let lastCode,nextCode = ''
+const qrcodeScanner = (e) =>{
+
+ nextCode = e.key;
+
+
+ // 褰撳墠瑙﹀彂鏃堕棿
+ nextTime = new Date().getTime();
+ // 绗竴娆¤幏鍙�
+ if(!lastTime && !lastCode && e.key !== 'Enter'){
+ codeArr = []
+ codeArr.push(e.key)
+ }
+
+ if(lastCode && lastTime && (nextTime - lastTime > 50)){
+ // 鐩搁殧鏃堕棿澶т簬30 璇存槑涓嶆槸鎵爜鏋壂鎻忕殑 娓呯┖閲嶆柊
+ codeArr = []
+ // 褰撴壂鐮佸墠鏈塳eypress浜嬩欢鏃�,闃叉棣栧瓧缂哄け
+ } else if(lastCode && lastTime && e.key !== 'Enter'){
+ codeArr.push(e.key)
+ }
+ lastCode = nextCode
+ lastTime = nextTime
+ // 鎵弿缁撴潫
+ if(e.keyCode === 13){
+ // 鍙繘琛屼笅涓�姝ユ搷浣�
+ /* 涓嬩竴姝ユ搷浣� */
+ if(codeArr.length!==0){
+ titleUploadData.value.processId = codeArr.join('')
+ }
+
+ codeArr=[]
+ lastTime = ''
+ nextTime = ''
+ lastCode = ''
+ nextCode = ''
+ }
+
+}
</script>
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 1338259..55dcf8d 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
@@ -57,15 +57,4 @@
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/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 8b07e46..1c5e613 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
@@ -164,18 +164,5 @@
String oddNumbers = alias+formattedDate+formattedNumber;
return oddNumbers;
}
-
-
- 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/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index 9b140eb..1fb8366 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -149,7 +149,7 @@
left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
- where dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1))
+ where dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and rw.reviewed_state!=-1
order by dd.id desc
</select>
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 3423e03..7d57445 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -48,7 +48,8 @@
o.quantity = od.b,
o.area = od.c,
o.perimeter= od.aa,
- o.other_money = ifnull(c.money,0)
+ o.other_money = ifnull(c.money,0),
+ o.other_remarks = (select group_concat( distinct edging_type) from order_detail where order_id = #{orderId} and edging_type is not null)
where
o.order_id = #{orderId}
--
Gitblit v1.8.0