|
@@ -863,7 +863,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
|
|
temp.setResultWagonNo(wagonNo);
|
|
temp.setResultWagonNo(wagonNo);
|
|
temp.setPurchaseOrderNo(purchaseNo);
|
|
temp.setPurchaseOrderNo(purchaseNo);
|
|
temp.setOutbountId(new BigDecimal(resultId));
|
|
temp.setOutbountId(new BigDecimal(resultId));
|
|
- if (map1.get("wagonWeight")==null) {
|
|
|
|
|
|
+ if (!isAssembly || map1.get("wagonWeight")==null) {
|
|
temp.setResultBillableTonnage(DataChange.dataToBigDecimal(calculateWagonWeight(wagonNo)));
|
|
temp.setResultBillableTonnage(DataChange.dataToBigDecimal(calculateWagonWeight(wagonNo)));
|
|
}else {
|
|
}else {
|
|
temp.setResultBillableTonnage(DataChange.dataToBigDecimal(map1.get("wagonWeight")));
|
|
temp.setResultBillableTonnage(DataChange.dataToBigDecimal(map1.get("wagonWeight")));
|