|
@@ -3014,6 +3014,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
|
|
|
actualModel.setTareTime(tareNoModel.getCreateTime());
|
|
actualModel.setTareTime(tareNoModel.getCreateTime());
|
|
|
actualModel.setTareManNo(tareNoModel.getCreateManNo());
|
|
actualModel.setTareManNo(tareNoModel.getCreateManNo());
|
|
|
actualModel.setTareManName(tareNoModel.getCreateManName());
|
|
actualModel.setTareManName(tareNoModel.getCreateManName());
|
|
|
|
|
+ actualModel.setNetWeight(actualModel.getGrossWeight().subtract(tareNoModel.getMeterWeight()));
|
|
|
if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
|
|
if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
|
|
|
actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
|
|
actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
|
|
|
actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
|
|
actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
|
|
@@ -3054,6 +3055,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
|
|
|
actualModel.setTareTime(tareNoModel.getCreateTime());
|
|
actualModel.setTareTime(tareNoModel.getCreateTime());
|
|
|
actualModel.setTareManNo(tareNoModel.getCreateManNo());
|
|
actualModel.setTareManNo(tareNoModel.getCreateManNo());
|
|
|
actualModel.setTareManName(tareNoModel.getCreateManName());
|
|
actualModel.setTareManName(tareNoModel.getCreateManName());
|
|
|
|
|
+ actualModel.setNetWeight(actualModel.getGrossWeight().subtract(tareNoModel.getMeterWeight()));
|
|
|
if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
|
|
if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
|
|
|
actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
|
|
actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
|
|
|
actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
|
|
actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
|