From caf567becb6378f848b3b930821a4b38cb7564a5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 10 九月 2024 12:43:20 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 1
north-glass-erp/northglass-erp/src/lang/ru.js | 1
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 7 +
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 50 ++++++++++++++--
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 9 +++
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 6 +-
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue | 1
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 46 +++++++++++++++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 3
10 files changed, 113 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
index 494244d..fba7a6f 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
@@ -134,6 +134,7 @@
<!-- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2">{{ item1[item.name] }}</div>-->
</div>
<div v-html="company.printLabel.customSemi(item1)"></div>
+ <div v-if="(id + 1) % 2 === 0" class="pagebreak"></div>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
index 75030d8..697ba0b 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -229,7 +229,7 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="29">
- <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
+ <div style="float: left;">琛ョ墖鍗曞彿锛歿{itemFlow.patch_id}}</div>
<div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 867090c..a0d10f3 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -87,6 +87,7 @@
deleteSuccess:'Deletion success',
deleteFail:'Deletion failure',
cancelReviewFail:'Review failure',
+ cancelReviewFailWork:'Counter-audit failed please check whether to report',
reviewFail:'Audit failure',
noProductDataInTheTable:'There is no product data in the table',
tableDataExceedsMaximumLimit:'The table data exceeds the maximum limit',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 073c2ed..de6a7b9 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -83,6 +83,7 @@
deleteSuccess:'校写邪谢懈褌褜 褍褋锌械褕薪芯',
deleteFail:'袨褕懈斜泻邪 褍写邪谢械薪懈褟',
cancelReviewFail:'袨褌屑械薪懈褌褜 锌褉芯胁械褉泻褍 芯褕懈斜泻邪',
+ cancelReviewFailWork:'袣芯薪褌褉褋褍写械斜薪芯械 褉邪蟹斜懈褉邪褌械谢褜褋褌胁芯 薪械 褍写邪谢芯褋褜',
reviewFail:'袨褕懈斜泻邪 邪褍写懈褌邪',
noProductDataInTheTable:'袛邪薪薪褘械 芯 锌褉芯写褍泻褌邪褏 芯褌褋褍褌褋褌胁褍褞褌 胁 褌邪斜谢懈褑械',
tableDataExceedsMaximumLimit:'袛邪薪薪褘械 褌邪斜谢懈褑褘 锌褉械胁褘褕邪褞褌 屑邪泻褋懈屑邪谢褜薪褘泄 谢懈屑懈褌',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 57c47ad..f3bc749 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -257,7 +257,7 @@
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
- {title: t('basicData.operate'), width: 100, slots: {default: 'button_slot'}, fixed: "left"},
+ {title: t('basicData.operate'), width: 90, slots: {default: 'button_slot'}, fixed: "left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
{field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
@@ -294,6 +294,7 @@
toolbarConfig: {
buttons: [
{code: 'update', name: t('processCard.composing'), status: 'primary'},
+ {code: 'delete', name: t('basicData.delete'), status: 'primary'},
],
import: false,
// export: true,
@@ -356,6 +357,43 @@
} else {
ElMessage.warning(t('basicData.msg.saveFail'))
+
+ }
+ })
+
+ }
+ return;
+
+ }
+ case 'delete': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length == 0) {
+ ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
+ return;
+ }
+ //绠�鍖栧嬀閫夌殑鍊�
+ const extractedData = selectRecords.map(item => ({
+ orderId: item.orderId,
+ processId: item.processId
+ }));
+ let composingData = ref({
+ composing: extractedData,
+ userId: user.user.userId,
+ userName:user.user.userName
+ })
+ //澶氶�夊垹闄ゆ祦绋嬪崱
+ request.post("/processCard/checkboxDelete", composingData.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.deleteSuccess'))
+ router.push({
+ path: '/main/processCard/SelectProcessCard',
+ query: {random: Math.random()}
+ })
+ } else {
+
+ ElMessage.warning(t('basicData.msg.deleteFail'))
}
})
@@ -447,11 +485,11 @@
<!-- <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>-->
<!-- <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>-->
<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
- <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
- <template #reference>
- <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>
- </template>
- </el-popconfirm>
+<!-- <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">-->
+<!-- <template #reference>-->
+<!-- <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>-->
+<!-- </template>-->
+<!-- </el-popconfirm>-->
</template>
<template #num1_filter="{ column, $panel }">
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 97fd8ee..cd54af1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -343,5 +343,14 @@
return Result.seccess(flowCardService.getProcessCard(processCards));
}
+ @ApiOperation("澶嶉�夋鍒犻櫎娴佺▼鍗�")
+ @SaCheckPermission("SelectProcessCard.delete")
+ @PostMapping("/checkboxDelete")
+ public Result checkboxDelete(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.checkboxDeleteSv(object));
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index 6ba715d..8cf2442 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -150,8 +150,11 @@
}else{
throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
}
-
-
+ }
+ @ApiOperation("mes鎶ュ伐娆＄牬鏂板")
+ @PostMapping ("/mesSaveReportingWorkWorn")
+ public Result mesSaveReportingWorkWorn(@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
}
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index eae59b5..96f2970 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -716,6 +716,52 @@
return flowCardList;
}
+ public Boolean checkboxDeleteSv(Map<String, Object> object) {
+ String userName = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ String userId = "";
+ if (object.get("userId") != null) {
+ userId = object.get("userId").toString();
+ }
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
+ for (FlowCard flowCard : flowCardList) {
+ Integer count = flowCardMapper.reportingWorkCount(flowCard.getProcessId());
+ if (count == 0) {
+ //淇敼鍒嗘灦鐘舵��
+ flowCardMapper.updateDeleteState(flowCard.getOrderId(), flowCard.getProcessId());
+ //鍒犻櫎鎶ュ伐娴佺▼鏄庣粏琛ㄦ暟鎹�
+ flowCardMapper.deleteReportingWork(flowCard.getProcessId());
+ //鍒犻櫎鍒嗘灦鏄庣粏
+ flowCardMapper.deleteFlowCardMp(flowCard.getOrderId(), flowCard.getProcessId());
+ //鍒犻櫎鎺掑簭琛ㄦ暟鎹�
+ flowCardMapper.deleteflowCardSort(flowCard.getOrderId(), flowCard.getProcessId());
+ //鍒ゆ柇璇ヨ鍗曟祦绋嬪崱鏄惁鍏ㄩ儴鍒犻櫎
+ Integer flowNumber = flowCardMapper.selectFlowCardCount(flowCard.getOrderId());
+ if (flowNumber == 0) {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负0,鍏ㄩ儴鍒犻櫎
+ flowCardMapper.updateProcessingCard(flowCard.getOrderId(), 0);
+ } else {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鍒犻櫎閮ㄥ垎
+ flowCardMapper.updateProcessingCard(flowCard.getOrderId(), 1);
+ }
+
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(flowCard.getOrderId()+flowCard.getProcessId());
+ log.setFunction("checkboxDeleteSv娴佺▼鍗″垹闄�");
+ log.setOperatorId(userId);
+ log.setOperator(userName);
+ logService.saveLog(log);
+ } else {
+ return false;
+ }
+ }
+ return true;
+
+
+ }
}
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 6dab8b2..04e5891 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1271,7 +1271,8 @@
dd.responsible_team,
concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
dd.responsible_personnel,
- #{mergeTechnologyNumber} as mergeTechnologyNumber
+ #{mergeTechnologyNumber} as mergeTechnologyNumber,
+ pl.patch_id
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
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 71f2ea7..5f5d326 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -135,8 +135,8 @@
ogd.child_width,
ogd.child_height,
if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as quantity,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as completedQuantity,
+ fc.quantity + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as quantity,
+ fc.quantity + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as completedQuantity,
odpd.reporting_work_num as completed,
odpd.broken_num as onceBroken,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
@@ -380,7 +380,7 @@
</select>
<select id="selectFlowCardNum" resultType="java.lang.Integer">
select
- a.quantity-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ a.quantity +ifnull(c.patchNumSum,0)-b.reporting_work_num-b.broken_num
from flow_card as a
left join sd.order_process_detail as b
on
--
Gitblit v1.8.0