|
@@ -913,6 +913,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
//通过订单ID查询信息
|
|
//通过订单ID查询信息
|
|
Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
|
|
Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
|
|
|
|
+ String capacityNumber = omstruckOrderMapper.getCapacityNumberByCapacityId(DataChange.dataToBigDecimal(orderMessage.get("capacityId")));
|
|
|
|
+ map.put("capacityNumber",capacityNumber);
|
|
int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
|
|
int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
|
|
if((Integer) map.get("orderReceiveStatus") == 1) {
|
|
if((Integer) map.get("orderReceiveStatus") == 1) {
|
|
List<Integer> orderIdList = omstruckOrderMapper.getReceiveOrderIdListByCapacityNum((String) map.get("capacityNumber"));
|
|
List<Integer> orderIdList = omstruckOrderMapper.getReceiveOrderIdListByCapacityNum((String) map.get("capacityNumber"));
|
|
@@ -947,7 +949,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
if (orderType==19){
|
|
if (orderType==19){
|
|
Map<String,Object> sporadicMap=new HashMap<>();
|
|
Map<String,Object> sporadicMap=new HashMap<>();
|
|
sporadicMap.put("orderNumber",orderMessage.get("orderNumber"));
|
|
sporadicMap.put("orderNumber",orderMessage.get("orderNumber"));
|
|
- String capacityNumber = omstruckOrderMapper.getCapacityNumberByCapacityId(DataChange.dataToBigDecimal(orderMessage.get("capacityId")));
|
|
|
|
sporadicMap.put("capacityNumber",capacityNumber);
|
|
sporadicMap.put("capacityNumber",capacityNumber);
|
|
//是否发送空委托标志
|
|
//是否发送空委托标志
|
|
sporadicMap.put("firstMC",1);
|
|
sporadicMap.put("firstMC",1);
|