From 1b63cf22b4f488bb78135bd25669105cc64d4712 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 19 十二月 2024 17:01:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 2 +-
north-glass-erp/northglass-erp/src/lang/en.js | 2 ++
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 7 +++++--
north-glass-erp/northglass-erp/src/lang/ar.js | 2 ++
north-glass-erp/northglass-erp/src/lang/ru.js | 2 ++
north-glass-erp/northglass-erp/src/lang/zh.js | 2 ++
north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue | 6 +++++-
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 6 ++++--
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 8 ++++++--
9 files changed, 29 insertions(+), 8 deletions(-)
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 e18573c..9a5d3c8 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -253,7 +253,7 @@
<div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
- <div>鐢熶骇娴佺▼鍗�<span v-if="printProject!=null">({{ printProject }})</span></div>
+ <div>鐢熶骇娴佺▼鍗�<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span></div>
<div style="font-weight: bolder;display: flex;justify-content:space-between">
<div>
鎵撳嵃浜猴細{{user.user.userName}}
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index b1ae5dd..41f3924 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -873,6 +873,8 @@
msg2:'賱丕 賷賲賰賳 鬲丨賲賷賱 丕賱氐賵乇 廿賱丕 亘鬲賳爻賷賯 JPG 兀賵 PNG',
selectFile:'丨丿丿 丕賱賲賱賮',
msg3:'賷賲賰賳 鬲丨賲賷賱 賲賱賮丕鬲 jpg/png 賮賯胤 賵賷噩亘 兀賱丕 賷鬲噩丕賵夭 丨噩賲賴丕 5 賲賷睾丕亘丕賷鬲',
+ commonProcess:'鏅�氬伐搴�',
+ laminatingProcess:'鍚堢墖宸ュ簭',
},
machine:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 848953a..83739d2 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -873,6 +873,8 @@
msg2:'Upload picture can only be JPG or PNG format!',
selectFile:'Selecting file',
msg3:'Only jpg/png files can be uploaded and the size does not exceed 5 MB',
+ commonProcess:'鏅�氬伐搴�',
+ laminatingProcess:'鍚堢墖宸ュ簭',
},
machine:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 52e2909..719fbac 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -873,6 +873,8 @@
msg2:'涓婁紶澶村儚鍥剧墖鍙兘鏄� JPG鎴栬�匬NG 鏍煎紡!',
selectFile:'閫夊彇鏂囦欢',
msg3:'鍙兘涓婁紶jpg/png鏂囦欢,涓斾笉瓒呰繃5m',
+ commonProcess:'鏅�氬伐搴�',
+ laminatingProcess:'鍚堢墖宸ュ簭',
},
machine:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 3ff8f6a..0125091 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -873,6 +873,8 @@
msg2:'涓婁紶鍥剧墖鍙兘鏄� JPG鎴栬�匬NG 鏍煎紡!',
selectFile:'閫夊彇鏂囦欢',
msg3:'鍙兘涓婁紶jpg/png鏂囦欢,涓斾笉瓒呰繃5m',
+ commonProcess:'鏅�氬伐搴�',
+ laminatingProcess:'鍚堢墖宸ュ簭',
},
machine:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
index cc85ddf..6951b52 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
@@ -222,7 +222,11 @@
<el-row>
<el-col :span="4">{{ $t('orderBasicData.alias') }}:</el-col>
<el-col :span="12">
- <el-input v-model="basic.nickname"/>
+ <el-input v-if="basic.basicType.length>0 && basic.basicType[1]!=='process'" v-model="basic.nickname"/>
+ <el-select v-model="basic.nickname" v-else>
+ <el-option :label="$t('orderBasicData.commonProcess')" value="" />
+ <el-option :label="$t('orderBasicData.laminatingProcess')" value="laminating" />
+ </el-select>
</el-col>
</el-row>
<el-row v-if="basic.basicType.length!==0 && basic.basicType[1]==='icon'" >
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
index 92af08d..f933326 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -24,7 +24,7 @@
List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr, String process, String reportType);
- List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess);
+ List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess, String laminating);
List<Map<String,String>> SelectProcessMp();
@@ -95,5 +95,7 @@
List<Map<String,String>> getSelectProcessDuoqu();
- List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess);
+ List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess, String laminating);
+
+ String getProcessLaminating(String process);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index fa93989..cfb5e27 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -81,6 +81,8 @@
public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process, String reportType) {
Map<String, Object> map = new HashMap<>();
+ //鑾峰彇鎶ュ伐宸ュ簭鏄惁涓哄鍚堝伐绋�
+ String laminating = reportingWorkMapper.getProcessLaminating(process);
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr,technologyStr);
@@ -142,9 +144,10 @@
if (retrievedData!=null){
Integer reviewedState = retrievedData.getReviewedState();
//鏍规嵁瀹℃牳鐘舵�佹煡璇㈡湭瀹℃牳鏁版嵁
+ System.out.println(laminating);
if (reviewedState==1){//宸插鏍�
//涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
- List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess);
+ List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating);
if(process.equals("涓┖")){
String orderId = processIdStr.substring(0,10);
details.forEach( detail -> {
@@ -161,7 +164,7 @@
map.put("Detail",details );
}else {
//涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
- List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess);
+ List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
if(process.equals("涓┖")){
String orderId = processIdStr.substring(0,10);
details.forEach( detail -> {
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 75ffa13..3a7c802 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -255,7 +255,7 @@
WHERE
fc.process_id = #{processIdStr}
- <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰' and process != '鎵撹兌鍜岀矘妗�' ">
+ <if test="laminating != 'laminating'">
AND POSITION(fc.technology_number in #{technologyStr})
</if>
AND odpd.process = #{process}
@@ -993,11 +993,15 @@
on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
WHERE
fc.process_id = #{processIdStr}
- <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰' and process != '鎵撹兌鍜岀矘妗�' ">
+ <if test="laminating != 'laminating' ">
AND POSITION(fc.technology_number in #{technologyStr})
</if>
AND odpd.process = #{process}
and rws.reviewed_state=0
order by fc.order_number
</select>
+
+ <select id="getProcessLaminating">
+ select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0