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 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=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 Date: Mon, 30 Mar 2026 09:33:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0erp=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=8Csql=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erpdata/mapper/ErpMesRbPacturnrecordMapper.xml | 10 ++++++---- .../springblade/erpdata/mapper/ErpMesRbPkMapper.xml | 11 ++++++----- .../erpdata/mapper/ErpMesRbPurtosoMapper.xml | 11 ++++++----- .../erpdata/mapper/ErpMesRbSjsoMapper.xml | 10 ++++++---- .../erpdata/mapper/ErpMesRbSodelrecwxMapper.xml | 11 ++++++----- .../erpdata/mapper/ErpMesRbSodelreczgMapper.xml | 12 +++++++----- .../springblade/erpdata/mapper/ErpMesRbWoMapper.xml | 11 ++++++----- .../erpdata/mapper/ErpMesRbWxpromotionMapper.xml | 10 ++++++---- .../erpdata/service/impl/ErpMesRbWoServiceImpl.java | 4 ++-- 9 files changed, 51 insertions(+), 39 deletions(-) diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml index 7f48e3db..a8f00819 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml @@ -39,12 +39,14 @@ diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml index b7f274fd..8cf2e1a1 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml @@ -7,14 +7,15 @@ diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml index d382ddae..95f9df08 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml @@ -6,14 +6,15 @@ SELECT * FROM dba_mgr.v_mes_rb_sodelrecwx WHERE is_deleted = 0 SELECT * FROM v_mes_rb_sodelreczg WHERE is_deleted = 0 - + SELECT + COALESCE( + TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'), + #{selectTime} + ) as newlevdateMax FROM dba_mgr.v_mes_rb_sodelreczg a - a.newlevdate = ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS') + a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS') - ORDER BY a.newlevdate DESC; diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml index a9df05cd..b430fa53 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml @@ -37,13 +37,15 @@ a.newlevdate > v_select_time-1 / 24 / 6*/ diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index a2f4f81b..3b412001 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -172,7 +172,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldPlan.setDominantDept(mesRbWo.getPrtmdept()); yieldPlan.setPrimaryCraft(mesRbWo.getProcessline()); yieldPlan.setProductLine(mesRbWo.getProdline()); - yieldPlan.setPlanType(12001L);//赋值默认值12001 + yieldPlan.setPlanType(Long.valueOf(YieldPlanEnum.PLAN_TYPE_1.getCode()));//赋值默认值12001 if(mesRbWo.getProcesslinedesc().contains("封接") ||"LX08-05-028,LX08-05-030,LX08-05-031".contains(mesRbWo.getProcessline())){ yieldPlan.setPlanType(12002L); @@ -341,7 +341,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setPkUsername(mesRbPacturnrecord.getRecname()); yieldOrder.setPkDate(mesRbPacturnrecord.getWoreqdat()); // List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno()); -// yieldOrder.setYieldType(12001); + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); // if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ // yieldOrder.setYieldType(12002); // }