From a96fc8e5df4d5a431d838557f515dfb5c5c689ae Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Wed, 24 Jun 2026 11:03:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=9B=9E=E6=98=BE=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/controller/PlanAssignSteerController.java | 4 ++-- .../springblade/desk/basic/excel/PlanAssignSteerExcel.java | 2 +- .../springblade/desk/basic/mapper/PlanAssignSteerMapper.xml | 2 +- .../springblade/desk/quality/mapper/InspectionTaskMapper.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java index fa0a3e11f..d4b72eae7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java @@ -230,8 +230,8 @@ public class PlanAssignSteerController extends BladeController { if(StringUtils.isEmpty(excel.getOemName()) && excel.getOemId() != null){ excel.setOemName(excel.getOemId().toString()); } - if(StringUtils.isEmpty(excel.getDsPartName()) && excel.getDsPart() != null){ - excel.setDsPartName(excel.getDsPart().toString()); + if(StringUtils.isEmpty(excel.getDsPartCode()) && excel.getDsPart() != null){ + excel.setDsPartCode(excel.getDsPart().toString()); } if(StringUtils.isEmpty(excel.getPlatingName()) && excel.getPlatingId() != null){ excel.setPlatingName(excel.getPlatingId().toString()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java index ead6d8d4a..1a590d06a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java @@ -49,7 +49,7 @@ public class PlanAssignSteerExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("零件") - private String dsPartName; + private String dsPartCode; /** * 分派比例(%) */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml index ba166d0fd..4d8ead96a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml @@ -26,7 +26,7 @@ ( SELECT a.*, b.oc_name as oem_name, - c.part_name as ds_part_name, + c.part_code as ds_part_code, d.ca_name as plating_name FROM BS_PLAN_ASSIGN_STEER a LEFT JOIN BS_OEM b on a.oem_id = b.id diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index 1a49b2e88..c788ef10e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -222,7 +222,7 @@ AND wp.NEXT_WP_ID = #{q.nextProcessId} - AND wo.WO_ID = #{q.woCode} + AND wo.WO_CODE = #{q.woCode} AND wo.PART_CODE = #{q.partCode}