修改查询

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java

@@ -46,4 +46,6 @@ public interface MaterialQuotaMapper extends BaseMapper<MaterialQuota> {
 	 * @return
 	 */
 	MaterialQuota queryMaterialQuota(@Param("thickness") BigDecimal thickness, @Param("dsProcessId") Long dsProcessId);
+
+    List<MaterialQuota> selectByQuotaTypeAndThickness(@Param("quotaType") int quotaType,@Param("thickness") Double thickness);
 }

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
     </select>
+    <select id="selectByQuotaTypeAndThickness"
+            resultType="org.springblade.desk.basic.pojo.entity.MaterialQuota">
+        select * from BS_MATERIAL_QUOTA where IS_DELETED = 0 and QUOTA_TYPE = #{quotaType} and THICKNESS = #{thickness}
+    </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java

@@ -50,4 +50,6 @@ public interface IMaterialQuotaService extends BaseService<MaterialQuota> {
 	 * @return
 	 */
 	MaterialQuota queryMaterialQuota(BigDecimal thickness, Long dsProcessId);
+
+    List<MaterialQuota> selectByQuotaTypeAndThickness(int quotaType, Double thickness);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java

@@ -70,4 +70,9 @@ public class MaterialQuotaServiceImpl extends BaseServiceImpl<MaterialQuotaMappe
 	public	MaterialQuota queryMaterialQuota(BigDecimal thickness, Long dsProcessId){
 		return baseMapper.queryMaterialQuota(thickness,dsProcessId);
 	}
+
+	@Override
+	public List<MaterialQuota> selectByQuotaTypeAndThickness(int quotaType, Double thickness) {
+		return baseMapper.selectByQuotaTypeAndThickness(quotaType,thickness);
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -149,6 +149,6 @@
     </select>
 
     <update id="updateOldMesPrWorkOrder">
-        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}
     </update>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java

@@ -312,8 +312,11 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 				if(h2 == null){
 					h2 = Double.valueOf(DictCache.getKey("thickness","h2"));
 				}
-				List<MaterialQuota> materialQuotaList1 = materialQuotaService.list(Wrappers.<MaterialQuota>lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h1));
-				List<MaterialQuota> materialQuotaList2 = materialQuotaService.list(Wrappers.<MaterialQuota>lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h2));
+//				List<MaterialQuota> materialQuotaList1 = materialQuotaService.list(Wrappers.<MaterialQuota>lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h1));
+//				List<MaterialQuota> materialQuotaList2 = materialQuotaService.list(Wrappers.<MaterialQuota>lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h2));
+				List<MaterialQuota> materialQuotaList1 = materialQuotaService.selectByQuotaTypeAndThickness(1,h1);
+				List<MaterialQuota> materialQuotaList2 = materialQuotaService.selectByQuotaTypeAndThickness(1,h2);
+
 				if(CollectionUtils.isEmpty(materialQuotaList1)){
 					log.info("镀层物料需求计算，镀金局部镀、镀层厚度"+h1+"未匹配到物料定额");
 					//将订单状态标记为数据异常，记录异常原因，并退出