From ef07d3d1f313804734adeeea3438f06500745471 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Wed, 13 May 2026 13:02:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/basic/mapper/MaterialQuotaMapper.java | 2 ++ .../springblade/desk/basic/mapper/MaterialQuotaMapper.xml | 4 ++++ .../desk/basic/service/IMaterialQuotaService.java | 2 ++ .../desk/basic/service/impl/MaterialQuotaServiceImpl.java | 5 +++++ .../org/springblade/desk/order/mapper/YieldOrderMapper.xml | 2 +- .../order/service/impl/PlateGoodsRecordServiceImpl.java | 7 +++++-- 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java index db7f5a27..6541b9fb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java @@ -46,4 +46,6 @@ public interface MaterialQuotaMapper extends BaseMapper { * @return */ MaterialQuota queryMaterialQuota(@Param("thickness") BigDecimal thickness, @Param("dsProcessId") Long dsProcessId); + + List selectByQuotaTypeAndThickness(@Param("quotaType") int quotaType,@Param("thickness") Double thickness); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml index 54579480..a52ab6a6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml @@ -26,4 +26,8 @@ resultType="org.springblade.desk.basic.pojo.entity.MaterialQuota"> SELECT * FROM BS_MATERIAL_QUOTA WHERE THICKNESS=#{thickness} AND PROCESS_ABILITY_ID=#{dsProcessId} AND ROWNUM = 1 + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java index 782113e3..aaffeae1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java @@ -50,4 +50,6 @@ public interface IMaterialQuotaService extends BaseService { * @return */ MaterialQuota queryMaterialQuota(BigDecimal thickness, Long dsProcessId); + + List selectByQuotaTypeAndThickness(int quotaType, Double thickness); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java index 5c1ed396..e93c4bb8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java @@ -70,4 +70,9 @@ public class MaterialQuotaServiceImpl extends BaseServiceImpl selectByQuotaTypeAndThickness(int quotaType, Double thickness) { + return baseMapper.selectByQuotaTypeAndThickness(quotaType,thickness); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index 49598522..171a2c32 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -149,6 +149,6 @@ - update MJMES.PR_WORK_ORDER set PLATE_SINGLE_QUOTA = #{plateSingleQuota} where WO_ID = #{woId}; + update MJMES.PR_WORK_ORDER set PLATE_SINGLE_QUOTA = #{plateSingleQuota} where WO_ID = #{woId} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java index 504dbc56..834948ad 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java @@ -312,8 +312,11 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl materialQuotaList1 = materialQuotaService.list(Wrappers.lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h1)); - List materialQuotaList2 = materialQuotaService.list(Wrappers.lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h2)); +// List materialQuotaList1 = materialQuotaService.list(Wrappers.lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h1)); +// List materialQuotaList2 = materialQuotaService.list(Wrappers.lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h2)); + List materialQuotaList1 = materialQuotaService.selectByQuotaTypeAndThickness(1,h1); + List materialQuotaList2 = materialQuotaService.selectByQuotaTypeAndThickness(1,h2); + if(CollectionUtils.isEmpty(materialQuotaList1)){ log.info("镀层物料需求计算，镀金局部镀、镀层厚度"+h1+"未匹配到物料定额"); //将订单状态标记为数据异常，记录异常原因，并退出