From 2d199dc0243c58f4b8fc80e0470b5f4e53890fb6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 25 二月 2025 16:16:30 +0800
Subject: [PATCH] 标签打印查询界面添加尺寸字段，自定义界面添加自由编辑标题，流程卡查询界面添加撤销可排版状态按钮，补充新增的语言
---
north-glass-erp/northglass-erp/src/lang/en.js | 2
north-glass-erp/northglass-erp/src/lang/ar.js | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue | 14 ++++
north-glass-erp/northglass-erp/src/lang/ru.js | 2
north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue | 14 ++--
north-glass-erp/northglass-erp/src/lang/zh.js | 2
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 4 +
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 38 ++++++++++++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 9 +++
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 19 ++++++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 21 ++++++
11 files changed, 118 insertions(+), 9 deletions(-)
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 ee7dac7..4f7bf43 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
@@ -148,7 +148,7 @@
{
tid: '姝ら潰涓哄鍐呴潰', title: '姝ら潰涓哄鍐呴潰', data: '', type: 'text',
options: {
- field: 'inner',
+ field: '',
testData: '',
width:100,
height: 16,
@@ -160,7 +160,7 @@
{
tid: '姝ら潰涓哄澶栭潰', title: '姝ら潰涓哄澶栭潰', data: '', type: 'text',
options: {
- field: 'outside',
+ field: '',
testData: '',
width:100,
height: 16,
@@ -597,7 +597,7 @@
{
tid: 'custom1', title: '鑷畾涔�1', data: '', type: 'text',
options: {
- field: 'custom1',
+ field: '',
testData: '',
width:270,
height: 16,
@@ -609,7 +609,7 @@
{
tid: 'custom2', title: '鑷畾涔�2', data: '', type: 'text',
options: {
- field: 'custom2',
+ field: '',
testData: '',
width:270,
height: 16,
@@ -621,7 +621,7 @@
{
tid: 'custom3', title: '鑷畾涔�3', data: '', type: 'text',
options: {
- field: 'custom3',
+ field: '',
testData: '',
width:270,
height: 16,
@@ -633,7 +633,7 @@
{
tid: 'custom4', title: '鑷畾涔�4', data: '', type: 'text',
options: {
- field: 'custom4',
+ field: '',
testData: '',
width:270,
height: 16,
@@ -645,7 +645,7 @@
{
tid: 'custom5', title: '鑷畾涔�5', data: '', type: 'text',
options: {
- field: 'custom5',
+ field: '',
testData: '',
width:270,
height: 16,
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 86f35c4..3c34b6e 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -414,6 +414,7 @@
composingOk:'賷賲賰賳 丕丿乇丕噩賴丕 ',
composingNo:'賱丕 賷賲賰賳 丕丿乇丕噩賴丕',
typesetter:'丕賱賲丿禺賱',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'賵賯鬲 丕賱亘丿亍 丕賱噩丿賵賱丞',
planEndTime:'賵賯鬲 丕賳鬲賴丕亍 丕賱噩丿賵賱丞',
customerId:'乇賲夭 丕賱毓賲賷賱',
@@ -435,6 +436,7 @@
deleteNo:'賮卮賱 丕賱丨匕賮貙 鬲丨賯賯 賲賲丕 廿匕丕 賰丕賳 賯丿 鬲賲 丕賱廿亘賱丕睾 毓賳 亘胤丕賯丞 丕賱毓賲賱賷丞 賱賱毓賲賱 (賲賱丕丨馗丕鬲)',
deleteNoProcedure:'賮卮賱 丕賱丨匕賮貙 鬲丨賯賯 賲賲丕 廿匕丕 賰丕賳 賯丿 鬲賲 丕賱廿亘賱丕睾 毓賳 丕賱毓賲賱賷丞 丕賱鬲丕賱賷丞 賱賱毓賲賱',
pleaseCheckTheRequiredData:'亘乇噩丕亍 丕賱鬲兀賰丿 賲賳 丕賱亘賷丕賳丕鬲 丕賱賲胤賱賵亘丞',
+ notSelectTheOptionData:'璇峰嬁鍕鹃�夊凡鎺掔増鏁版嵁',
landingSequence:'钀芥灦椤哄簭',
labelStyle:'賳賲胤 丕賱賲賱氐賯',
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 2c24a0b..5d45e2b 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -413,6 +413,7 @@
composingOk:'Can Be Typesetter',
composingNo:'Non Typesetting',
typesetter:'typesetter',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'Scheduled Start Time',
planEndTime:'Plan End Time',
customerId:'Customer Id',
@@ -434,6 +435,7 @@
deleteNo:'Failed to delete Check whether the flow card has been reported (feedback)',
deleteNoProcedure:'Delete failed Check whether the next operation has been reported',
pleaseCheckTheRequiredData:'Please check the required data',
+ notSelectTheOptionData:'璇峰嬁鍕鹃�夊凡鎺掔増鏁版嵁',
landingSequence:'Landing sequence',
labelStyle:'Label Style',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index a35aae4..477e456 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -414,6 +414,7 @@
composingOk:'孝懈锌芯谐褉邪屑屑邪OK',
composingNo:'孝懈锌芯谐褉邪屑屑邪NO',
typesetter:'袧邪斜芯褉褖懈泻',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'袩谢邪薪懈褉褍械屑芯械 胁褉械屑褟 薪邪褔邪谢邪',
planEndTime:'袩谢邪薪懈褉褍械屑芯械 胁褉械屑褟 芯泻芯薪褔邪薪懈褟',
customerId:'袣芯写 泻谢懈械薪褌邪',
@@ -435,6 +436,7 @@
deleteNo:'袨褕懈斜泻邪 褍写邪谢械薪懈褟, 锌褉芯胁械褉褜褌械 芯斜褉邪褌薪褍褞 褋胁褟蟹褜 泻邪褉褌褘 锌褉芯褑械褋褋邪',
deleteNoProcedure:'袨褕懈斜泻邪 褍写邪谢械薪懈褟, 锌褉芯胁械褉褜褌械 芯斜褉邪褌薪褍褞 褋胁褟蟹褜 芯锌械褉邪褑懈懈',
pleaseCheckTheRequiredData:'袙褘斜械褉懈褌械 薪械芯斜褏芯写懈屑褘械 写邪薪薪褘械.',
+ notSelectTheOptionData:'璇峰嬁鍕鹃�夊凡鎺掔増鏁版嵁',
landingSequence:'Landing sequence',
labelStyle:'小褌懈谢褜 屑械褌泻懈',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index fae2438..196339a 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -414,6 +414,7 @@
composingOk:'鍙帓鐗�',
composingNo:'涓嶅彲鎺掔増',
typesetter:'宸叉帓鐗�',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'璁″垝寮�濮嬫椂闂�',
planEndTime:'璁″垝缁撴潫鏃堕棿',
customerId:'瀹㈡埛缂栫爜',
@@ -435,6 +436,7 @@
deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ祦绋嬪崱鏄惁宸叉姤宸�',
deleteNoProcedure:'鍒犻櫎澶辫触锛岃妫�鏌ヤ笅宸ュ簭鏄惁宸叉姤宸ユ垨鑰呭凡琛ョ墖杩斿伐',
pleaseCheckTheRequiredData:'璇峰嬀閫夐渶瑕佺殑鏁版嵁',
+ notSelectTheOptionData:'璇峰嬁鍕鹃�夊凡鎺掔増鏁版嵁',
landingSequence:'钀芥灦椤哄簭',
labelStyle:'鏍囩鏍峰紡',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
index ed5aeec..6b4eeb9 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -335,6 +335,20 @@
filterMethod: filterChanged, width: 100
},
{
+ field: 'width',
+ title: t('order.width'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 100
+ },
+ {
+ field: 'height',
+ title: t('order.height'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 100
+ },
+ {
field: 'glassNumber',
title: t('reportingWorks.glassNumber'),
filters: [{data: ''}],
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 a56d4f2..f559196 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
@@ -312,6 +312,7 @@
toolbarConfig: {
buttons: [
{code: 'update', name: t('processCard.composing'), status: 'primary'},
+ {code: 'revoke', name: t('processCard.revoke'), status: 'primary'},
{code: 'delete', name: t('basicData.delete'), status: 'primary'},
{code: 'rack', name: t('鍚堟灦'), status: 'primary'},
],
@@ -384,6 +385,43 @@
return;
}
+ case 'revoke': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length == 0) {
+ ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
+ return;
+ }
+
+ let composingData = ref({
+ composing: selectRecords,
+ })
+ selectRecords.forEach(item => {
+ if (item.layoutStatus == "宸叉帓鐗�"){
+ ElMessage.warning(t('processCard.notSelectTheOptionData'))
+ return;
+ }
+ });
+ //鎾ら攢鍙帓鐗堢姸鎬�
+ request.post("/processCard/revokeComposing", composingData.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({
+ path: '/main/processCard/SelectProcessCard',
+ query: {random: Math.random()}
+ })
+ } else {
+
+ ElMessage.warning("鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�")
+
+ }
+ })
+
+ }
+ return;
+
+ }
case 'delete': {
const $table = xGrid.value
if ($table) {
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 4e30f01..eb29361 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
@@ -243,6 +243,15 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
+ @ApiOperation("澶嶉�夋鎾ら攢鍙帓鐗堢姸鎬�")
+ @SaCheckPermission("selectProcessCard.review")
+ @PostMapping("/revokeComposing")
+ public Result revokeComposing(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.revokeComposingSv(object));
+ }
@ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
public Result printFlowCardDetails(@PathVariable String processId,
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index c7d0c18..5e3be8c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -231,4 +231,8 @@
Map<String,Object> getGlassThicknessByProdutionId(String orderId,String productionId);
List<OrderDetail> getOrderDetailByProductionId(String orderId, String productionId);
+
+ Boolean revokeComposing(String processId);
+
+ Integer selectProjectNo(String processId);
}
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 c41cd09..9c64754 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
@@ -1163,6 +1163,25 @@
}
+ public Boolean revokeComposingSv(Map<String, Object> object) {
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ //鑾峰彇娌℃湁宸ョ▼鍙风殑鏉℃暟锛屽凡鐢熸垚宸ョ▼鍙蜂笉鑳芥挙鍥�
+ Integer count = flowCardMapper.selectProjectNo(flowCard.getProcessId());
+ if (count == 0){
+ flowCardMapper.revokeComposing(flowCard.getProcessId());
+ } else {
+ return false;
+ }
+
+ }
+ return true;
+ } else {
+ return false;
+
+ }
+ }
}
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 a221506..0d8725d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2317,7 +2317,9 @@
fc.print_status,
ogd.process,
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
- od.order_number
+ od.order_number,
+ od.width,
+ od.height
from flow_card as fc
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -2348,7 +2350,9 @@
fc.print_status,
ogd.process,
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
- od.order_number
+ od.order_number,
+ ogd.child_width as width,
+ ogd.child_height as height
from flow_card as fc
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -2902,4 +2906,17 @@
group by a.order_number) as c
order by c.`long` desc
</select>
+
+ <!-- 澶嶉�夋淇敼鎺掔増鐘舵��-->
+ <update id="revokeComposing">
+ update flow_card as fc
+ set fc.layout_status=0
+ where fc.process_id = #{processId}
+ </update>
+
+ <select id="selectProjectNo">
+ SELECT COUNT(*)
+ FROM flow_card
+ WHERE process_id= #{processId} and project_no IS not NULL;
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0