|
@@ -257,6 +257,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
if (contractManagementInfo!=null){
|
|
|
overNeight=inOutWarehouseTask.getWeight()*(contractManagementInfo.getOverShort()/100);
|
|
|
}
|
|
|
+ //移库可超出百分之8
|
|
|
+ else {
|
|
|
+ overNeight=inOutWarehouseTask.getWeight()*0.08f;
|
|
|
+ }
|
|
|
inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getNetWeight());
|
|
|
if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()+overNeight){
|
|
|
throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
|
|
@@ -285,6 +289,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
if (contractManagementInfo!=null){
|
|
|
overNeight=inOutWarehouseTask.getWeight()*(contractManagementInfo.getOverShort()/100);
|
|
|
}
|
|
|
+ //移库可超出百分之8
|
|
|
+ else {
|
|
|
+ overNeight=inOutWarehouseTask.getWeight()*0.08f;
|
|
|
+ }
|
|
|
inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getNetWeight());
|
|
|
if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()+overNeight){
|
|
|
throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
|