修改面积计算

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

@@ -187,7 +187,8 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 		//生产数量
 		Double ypQty=yieldOrder.getYpQty();
 		//计算单批面积（d㎡）
-		Double singleArea=ypArea*ypQty*100;
+//		Double singleArea=ypArea*ypQty*100;
+		Double singleArea=ypArea*ypQty;
 		//大批量/小批量标志
 		int batchFlag=0;//大批量1；小批量0
 		//判断是否是大批量
@@ -379,6 +380,8 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 				yieldOrder.setQuota1(quota);
 				yieldOrder.setPlateThickness1(h1);
 				yieldOrder.setGoodsDemand(BigDecimal.valueOf(demand));
+				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode());
+				yieldOrder.setValidationMomo("");
 			}
 			yieldOrderMapper.updateById(yieldOrder);
 		}else{
@@ -393,7 +396,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 	 * @param yieldOrder
 	 */
 	public void updateYieldOrder(YieldOrder yieldOrder){
-		yieldOrder.setStatus(YieldOrderEnum.STATUS_EXCEPTION.getCode());
+//		yieldOrder.setStatus(YieldOrderEnum.STATUS_EXCEPTION.getCode());
 		yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_MATERIAL.getCode());
 		yieldOrderMapper.updateById(yieldOrder);
 	}