|
|
|
@ -299,7 +299,9 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
//镀层厚度
|
|
|
|
//镀层厚度
|
|
|
|
h1=CoatingThickness.getThickness().doubleValue(); |
|
|
|
// 镀层厚度
|
|
|
|
|
|
|
|
BigDecimal exactThickness = CoatingThickness.getThickness(); |
|
|
|
|
|
|
|
h1 = exactThickness.setScale(2, RoundingMode.HALF_UP).doubleValue(); |
|
|
|
} |
|
|
|
} |
|
|
|
double demand = 0; |
|
|
|
double demand = 0; |
|
|
|
//零件有镀金标识 && { 订单面积>工艺能力对应【局部镀订单面积】 || 订单质量等级为【局部镀】} --局部镀
|
|
|
|
//零件有镀金标识 && { 订单面积>工艺能力对应【局部镀订单面积】 || 订单质量等级为【局部镀】} --局部镀
|
|
|
|
@ -312,8 +314,8 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor |
|
|
|
if(h2 == null){ |
|
|
|
if(h2 == null){ |
|
|
|
h2 = Double.valueOf(DictCache.getKey("thickness","h2")); |
|
|
|
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> materialQuotaList1 = materialQuotaService.list(Wrappers.<MaterialQuota>lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,String.valueOf(h1))); |
|
|
|
List<MaterialQuota> materialQuotaList2 = materialQuotaService.list(Wrappers.<MaterialQuota>lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,h2)); |
|
|
|
List<MaterialQuota> materialQuotaList2 = materialQuotaService.list(Wrappers.<MaterialQuota>lambdaQuery().eq(MaterialQuota::getQuotaType,1).eq(MaterialQuota::getThickness,String.valueOf(h2))); |
|
|
|
if(CollectionUtils.isEmpty(materialQuotaList1)){ |
|
|
|
if(CollectionUtils.isEmpty(materialQuotaList1)){ |
|
|
|
log.info("镀层物料需求计算,镀金局部镀、镀层厚度"+h1+"未匹配到物料定额"); |
|
|
|
log.info("镀层物料需求计算,镀金局部镀、镀层厚度"+h1+"未匹配到物料定额"); |
|
|
|
//将订单状态标记为数据异常,记录异常原因,并退出
|
|
|
|
//将订单状态标记为数据异常,记录异常原因,并退出
|
|
|
|
|