|
@@ -518,6 +518,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
|
|
map.put("isClean",map2.get("isClean"));
|
|
map.put("isClean",map2.get("isClean"));
|
|
map.put("resultMaterialNumber",map2.get("resultTonnage"));
|
|
map.put("resultMaterialNumber",map2.get("resultTonnage"));
|
|
map.put("batchId", map2.get("batchId"));
|
|
map.put("batchId", map2.get("batchId"));
|
|
|
|
+ map.put("resultLoadingDate",map2.get("resultLoadingDate"));
|
|
//通过港口名称查找港口id
|
|
//通过港口名称查找港口id
|
|
BigDecimal portId = tmstrainLoadingResultMapper.getPortIdByPortName((String) map2.get("portName"));
|
|
BigDecimal portId = tmstrainLoadingResultMapper.getPortIdByPortName((String) map2.get("portName"));
|
|
map.put("portId", portId);
|
|
map.put("portId", portId);
|
|
@@ -796,8 +797,16 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
|
|
int wagonWeight=0;
|
|
int wagonWeight=0;
|
|
BigDecimal batchId = null;
|
|
BigDecimal batchId = null;
|
|
TmstrainLoadingTemp temp=new TmstrainLoadingTemp();
|
|
TmstrainLoadingTemp temp=new TmstrainLoadingTemp();
|
|
|
|
+ String userId = (String) map.get("userId");
|
|
|
|
+ String userName = null;
|
|
|
|
+ if(userId != null) {
|
|
|
|
+ userName = tmstrainLoadingResultMapper.selectUserName(userId);
|
|
|
|
+ }
|
|
temp.setDeleted(new BigDecimal(0));
|
|
temp.setDeleted(new BigDecimal(0));
|
|
temp.setInsertTime(new Date());
|
|
temp.setInsertTime(new Date());
|
|
|
|
+ if(userName != null) {
|
|
|
|
+ temp.setInsertUsername(userName);
|
|
|
|
+ }
|
|
BigDecimal resultType =DataChange.dataToBigDecimal(map.get("resultType"));
|
|
BigDecimal resultType =DataChange.dataToBigDecimal(map.get("resultType"));
|
|
List<Map<String,Object>> wagonList =(List<Map<String, Object>>) map.get("wagonList");
|
|
List<Map<String,Object>> wagonList =(List<Map<String, Object>>) map.get("wagonList");
|
|
//增加是否拼装
|
|
//增加是否拼装
|