|
@@ -690,17 +690,20 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
|
|
|
}
|
|
|
wagonWeight += calculateWagonWeight(wagonNo);
|
|
|
map.put("resultTonnage",wagonWeight);
|
|
|
- // insert TrainLoadingTemp
|
|
|
- temp.setResultId(tmstrainLoadingTempMapper.selectMaxId());
|
|
|
- temp.setResultWagonNo(wagonNo);
|
|
|
- temp.setPurchaseOrderNo(purchaseNo);
|
|
|
- temp.setResultBillableTonnage(DataChange.dataToBigDecimal(calculateWagonWeight(wagonNo)));
|
|
|
- //如果订单类型为采购进口矿火运(万州港---达州 || 万州港--老区轨道衡) 添加总车皮标重传输给港存库
|
|
|
}
|
|
|
if(resultType.intValue() == 1){
|
|
|
i = addOutWarehouse(map);
|
|
|
- temp.setOutbountId(new BigDecimal(i));
|
|
|
- tmstrainLoadingTempMapper.insertSelective(temp);
|
|
|
+ for (Map<String,Object> map1:wagonList) {
|
|
|
+ String wagonNo =(String) map1.get("wagonNo");
|
|
|
+ //根据采购订单号查找批次
|
|
|
+ String purchaseNo =(String) map.get("purchaseNo");
|
|
|
+ temp.setResultId(tmstrainLoadingTempMapper.selectMaxId());
|
|
|
+ temp.setResultWagonNo(wagonNo);
|
|
|
+ temp.setPurchaseOrderNo(purchaseNo);
|
|
|
+ temp.setOutbountId(new BigDecimal(i));
|
|
|
+ temp.setResultBillableTonnage(DataChange.dataToBigDecimal(calculateWagonWeight(wagonNo)));
|
|
|
+ tmstrainLoadingTempMapper.insertSelective(temp);
|
|
|
+ }
|
|
|
}
|
|
|
return i;
|
|
|
}
|