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 6541b9fb..db7f5a27 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,6 +46,4 @@ 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 a52ab6a6..54579480 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,8 +26,4 @@ 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 aaffeae1..782113e3 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,6 +50,4 @@ 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 e93c4bb8..5c1ed396 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,9 +70,4 @@ 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/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java index 834948ad..504dbc56 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,11 +312,8 @@ 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.selectByQuotaTypeAndThickness(1,h1); - List materialQuotaList2 = materialQuotaService.selectByQuotaTypeAndThickness(1,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)); if(CollectionUtils.isEmpty(materialQuotaList1)){ log.info("镀层物料需求计算,镀金局部镀、镀层厚度"+h1+"未匹配到物料定额"); //将订单状态标记为数据异常,记录异常原因,并退出