From 37e306ea9422fdfa48519e090333ef2157267466 Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期四, 04 九月 2025 17:50:22 +0800
Subject: [PATCH] 提交 解决工程管理不显示的问题
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue | 3 ++-
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 19 ++++++++++++++-----
north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java | 2 ++
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue | 5 +----
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue | 1 -
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 3 ++-
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizeCompute.vue | 9 +++++++++
7 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
index ef227c4..e68f9c8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
@@ -72,7 +72,7 @@
{field: 'effectiveCuttingRate', width: 100, title: '鏈夋晥鍒囪鐜�',},
{field: 'residueGlassCuttingRate', width: 100, title: '灏剧墖鍒囪鐜�',},
{field: 'amountOfOriginalGlassUsage1', width: 100, title: '鍘熸枡浣跨敤鏁�',},
- {field: 'averageCuttingRate1', width: 100, title: '骞冲潎鍒囪鐜�',},
+ // {field: 'averageCuttingRate1', width: 100, title: '骞冲潎鍒囪鐜�',},
{field: 'notes', width: 50, title: '澶囨敞',},
{field: 'creator', width: 100, title: '鍒涘缓浜�',},
{field: 'createTime', width: 100, title: '鍒涘缓鏃堕棿',},
@@ -383,9 +383,6 @@
ElMessage.warning('璇烽�夋嫨瑕佹煡鐪嬬殑宸ョ▼');
return;
}
-
- localStorage.setItem('projectNo', row.projectNumber);
- console.log("projectNo:", row.projectNumber);
try {
await router.push({
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizeCompute.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizeCompute.vue
index ebbd06f..687e082 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizeCompute.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizeCompute.vue
@@ -79,6 +79,15 @@
// 鏇存柊 store 鏁版嵁
if (result.layouts && result.layouts.length > 0) {
orderInfo.optimizeData.optimalResults = {
+ projectNo: result.projectNo,
+ glassThickness: result.glassThickness,
+ glassType: result.glassType,
+ totalQuantity: result.totalQuantity,
+ glassTotalQuantity: result.glassTotalQuantity,
+ glassTotalArea: result.glassTotalArea,
+ avgCutRate: result.avgCutRate,
+ lastCutRate: result.lastCutRate,
+ validCutRate: result.validCutRate,
layouts: result.layouts
};
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue
index 3251a99..80de7a3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue
@@ -10,7 +10,7 @@
const {t} = useI18n()
const userStore = useUserInfoStore()
-const username = userStore.user.userName
+const username = userStore.user.userId
let rowClickIndex = ref(null)
let props = defineProps({
@@ -70,6 +70,7 @@
onMounted(() => {
+ console.log(userStore.user);
getProjectId();
selectGlassType();
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
index d5e8506..f1a12fd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
@@ -249,7 +249,6 @@
const checkAutoRedirectToOptimize = () => {
// 妫�鏌ヨ矾鐢变腑鏄惁鏈夎嚜鍔ㄨ烦杞爣璇�
if (route.query.redirect === 'optimizeControl') {
- // 寤惰繜涓�娈垫椂闂寸‘淇濋〉闈㈠姞杞藉畬鎴愬悗鍐嶈烦杞�
setTimeout(() => {
const projectNo = route.params.projectNo || localStorage.getItem('currentProjectNo');
if (projectNo) {
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
index 92defbc..6502aa7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
@@ -213,4 +213,6 @@
void deleteOffcutDetails(String processId);
void addUpdateOffcut(Map<String, Object> detail, String processId, String glassType, String glassThickness);
+
+ void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index 8fa0fe5..377f98d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -348,7 +348,8 @@
}
glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId);
}
- glassOptimizeMapper.updateProjectOptimizeStateMp(projectId,1);
+
+ glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults);
return true;
} catch (Exception e) {
e.printStackTrace();
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index ea8cf33..288f536 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -767,11 +767,11 @@
`p`.`frist_stock_qty` AS `Amount of original glass usage 1`,
concat(`p`.`frist_cut_pct`, ' %') AS `Average cutting rate 1`,
`p`.`remark` AS `Notes`,
- `a`.`name` AS `Creator`,
+ `u`.`user_name` AS `Creator`,
`p`.`create_time` AS `Create time`,
`p`.`update_time` AS `Modify time`
from pp.optimize_project as p
- left join pp.optimize_admin as a on p.creater = a.Id
+ left join erp_user_info.user as u on p.creater = u.login_name
where (`p`.`state` > 0)
# and (tempering_state>0 or optimize_state>0)
and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
@@ -1108,14 +1108,14 @@
<update id="updateProjectMp">
update pp.optimize_project set project_name=#{projectNmae},glass_total=#{sumQuantity},glass_total_area= #{sumArea},
- type=#{type},process_qty=#{processIdCount},process_cards=#{processId} where project_no=#{projectId}
+ type=#{type},process_qty=#{processIdCount},process_cards=#{processId},creater = #{userName} where project_no=#{projectId}
</update>
<insert id="addProjectMp">
insert into pp.optimize_project (project_no, project_name, order_glass_type, order_glass_thickness,glass_type, glass_thickness,
- glass_total,glass_total_area,type,state,process_qty,process_cards)
+ glass_total,glass_total_area,type,state,process_qty,process_cards,creater )
values (#{projectId}, #{projectNmae}, #{glassType}, #{glassThickness}, #{glassType}, #{glassThickness},#{sumQuantity}, #{sumArea},
- #{type},1,#{processIdCount},#{processId})
+ #{type},1,#{processIdCount},#{processId},#{userName})
</insert>
@@ -1528,6 +1528,15 @@
WHERE
project_no = #{processId} AND polys_id = #{detail.polySort}
</update>
+ <update id="updateProjectOptimize">
+ update pp.optimize_project as p
+ set p.optimize_state = #{states},
+ p.avg_cut_pct = #{optimalResults.avgCutRate},
+ p.valid_cut_pct = #{optimalResults.validCutRate},
+ p.last_cut_pct = #{optimalResults.lastCutRate},
+ p.raw_stock_qty = #{optimalResults.totalQuantity}
+ where p.project_no = #{projectId}
+ </update>
<select id="simulatedTypesettingUsingOpt">
SELECT
--
Gitblit v1.8.0