liyg 2 роки тому
батько
коміт
3dfa9e06a2

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/TmstrainLoadingResultServiceImpl.java

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