From c93255dce19956208a1a8524a1f02f5421d046ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Sun, 29 Mar 2026 16:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/produce/controller/PdaLoadController.java | 3 ++- .../springblade/desk/produce/mapper/MacToolUseMapper.xml | 2 +- .../org/springblade/desk/produce/mapper/WorkPlanMapper.xml | 6 +++--- .../desk/produce/service/impl/PlateAroundServiceImpl.java | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java index fa70bca0..f58991b9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java @@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; @@ -37,7 +38,7 @@ public class PdaLoadController { @ApiOperationSupport(order = 1) @Operation(summary = "根据流程卡号数据", description = "传入cardNo") public R loadBindData(@PathVariable String cardNo) { - return R.data(pdaLoadService.loadBindData(1297L, cardNo)); + return R.data(pdaLoadService.loadBindData(AuthUtil.getUserId(), cardNo)); } @GetMapping(value = "/getBsRackSetByCode/{rsCode}") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml index c778576b..c3fe0bcc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml @@ -49,7 +49,7 @@ INNER JOIN MES_work_plan b ON a.WP_ID = b.ID INNER JOIN MES_WORK_ORDER c ON b.WO_ID = c.ID INNER JOIN MES_YIELD_ORDER d ON c.YO_ID = d.ID - INNER JOIN DS_PART_BASICS f ON d.part_code = f.part_code + INNER JOIN DS_PART f ON d.part_code = f.part_code WHERE a.MTN_CODE IN ( SELECT a.MTN_CODE FROM MES_MAC_TOOL_USE a LEFT JOIN MES_EQUIPMENT b ON a.EQUIPMENT_CARD = b.ID WHERE a.WP_ID = #{id} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index a25ac852..324964f1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -81,7 +81,7 @@ inner join MES_WORK_PLAN b on a.WP_ID = b.ID inner join MES_WORK_ORDER c on b.WO_ID = c.ID inner join MES_YIELD_ORDER d on c.YO_ID = d.ID - inner join DS_PART_BASICS f on d.PART_CODE = f.PART_CODE + inner join DS_PART f on d.PART_CODE = f.PART_CODE where a.MTN_CODE in ( select a.MTN_CODE from MES_MAC_TOOL_USE a left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID @@ -106,7 +106,7 @@ inner join MES_WORK_PLAN b on a.WP_ID = b.ID inner join MES_WORK_ORDER c on b.WO_ID = c.ID inner join MES_YIELD_ORDER d on c.YO_ID = d.ID - inner join DS_PART_BASICS f on d.PART_CODE = f.PART_CODE + inner join DS_PART f on d.PART_CODE = f.PART_CODE where a.MTN_CODE in ( select a.MTN_CODE from MES_MAC_TOOL_USE a left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID @@ -207,7 +207,7 @@ inner join MES_WORK_PLAN b on a.WP_ID = b.ID inner join MES_WORK_ORDER c on b.WO_ID = c.ID inner join MES_YIELD_ORDER d on c.YO_ID = d.ID - inner join DS_PART_BASICS f on d.part_code = f.part_code + inner join DS_PART f on d.part_code = f.part_code where a.MTN_CODE in( select a.MTN_CODE from MES_MAC_TOOL_USE a left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java index 6c18aab4..ae31cb43 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java @@ -305,7 +305,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl