|
|
@ -277,7 +277,7 @@ public class ConsumablesMgrService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 申请耗材 |
|
|
|
* 预定耗材 |
|
|
|
* @param projId 项目索引 |
|
|
|
* @return 耗材组 |
|
|
|
*/ |
|
|
@ -287,13 +287,13 @@ public class ConsumablesMgrService { |
|
|
|
int reserveNum = cState.reactionPlateGroup[group.off].reserveNum; |
|
|
|
int num = cState.reactionPlateGroup[group.off].num; |
|
|
|
priSetConsumableGroupNum(group, num, reserveNum + 1); |
|
|
|
Integer pos = AppConstant.CONSUMABLE_NUM - num; |
|
|
|
Integer pos = AppConstant.CONSUMABLE_NUM - num + reserveNum; |
|
|
|
return new ConsumableInfo(priGetLotId(group), group, pos); |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
//预定耗材 |
|
|
|
//归还预定耗材 |
|
|
|
synchronized public void bakReserveConsumable(ConsumableInfo consumableInfo) { |
|
|
|
Integer reserveNum = cState.reactionPlateGroup[consumableInfo.group.off].reserveNum - 1; |
|
|
|
Integer num = cState.reactionPlateGroup[consumableInfo.group.off].num; |
|
|
@ -301,7 +301,7 @@ public class ConsumablesMgrService { |
|
|
|
} |
|
|
|
|
|
|
|
//使用耗材 |
|
|
|
synchronized public void removeReserveConsumable(ConsumableInfo consumableInfo) { |
|
|
|
synchronized public void useReserveConsumable(ConsumableInfo consumableInfo) { |
|
|
|
int reserveNum = cState.reactionPlateGroup[consumableInfo.group.off].reserveNum - 1; |
|
|
|
int num = cState.reactionPlateGroup[consumableInfo.group.off].num - 1; |
|
|
|
priSetConsumableGroupNum(consumableInfo.getGroup(), num, reserveNum); |
|
|
|