|
@@ -17,10 +17,7 @@ import javax.xml.crypto.Data;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
-import java.util.Date;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
* AmsSaleOrder服务实现:
|
|
* AmsSaleOrder服务实现:
|
|
@@ -449,6 +446,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
head.replace("forwarder","自提");
|
|
head.replace("forwarder","自提");
|
|
}
|
|
}
|
|
List<Map<String,Object>> entries = omstruckOrderMapper.findEntriesByOrderId(saleOrderMaterialId);
|
|
List<Map<String,Object>> entries = omstruckOrderMapper.findEntriesByOrderId(saleOrderMaterialId);
|
|
|
|
+ //遍历数组 en
|
|
Map<String,Object> input = new HashMap<>();
|
|
Map<String,Object> input = new HashMap<>();
|
|
input.put("entries",entries);
|
|
input.put("entries",entries);
|
|
input.put("head",head);
|
|
input.put("head",head);
|
|
@@ -456,6 +454,22 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public Map<String, Object> findCarNumberByOrderList(List<Map<String, Object>> mapList) {
|
|
|
|
+ List<Map<String,Object>> entries = new ArrayList<>();
|
|
|
|
+ //遍历车序号数组,获取车序号ID
|
|
|
|
+ for(Map<String,Object> map : mapList){
|
|
|
|
+ BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
|
|
|
|
+ //根据车序号ID去查询车牌号、承运商以及分录ID
|
|
|
|
+ Map<String,Object> head = omstruckOrderMapper.finCarAndCarrierAndEntries(saleOrderMaterialId);
|
|
|
|
+ entries.add(head);
|
|
|
|
+ }
|
|
|
|
+ Map<String,Object> input = new HashMap<>();
|
|
|
|
+ input.put("entries",entries);
|
|
|
|
+ return input;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
//添加内转钢材到异地库
|
|
//添加内转钢材到异地库
|
|
@@ -826,4 +840,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
result = omstrainOrderMapper.updateByPrimaryKeySelective(omstrainOrder);
|
|
result = omstrainOrderMapper.updateByPrimaryKeySelective(omstrainOrder);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|