From b68757294e11c7c63166800b0ff34d0e31613dab Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 六月 2024 08:49:43 +0800
Subject: [PATCH] 修改分架界面，修改补片新增查询
---
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/pp/PatchLogMapper.xml | 2
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 +++++++++++++++++++++++++++
6 files changed, 71 insertions(+), 33 deletions(-)
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/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>
--
Gitblit v1.8.0