|
@@ -3,15 +3,13 @@ package com.steerinfo.dil.service.impl;
|
|
import com.alibaba.druid.support.json.JSONUtils;
|
|
import com.alibaba.druid.support.json.JSONUtils;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
-import com.steerinfo.dil.feign.JoinFeign;
|
|
|
|
-import com.steerinfo.dil.feign.OtmsFeign;
|
|
|
|
-import com.steerinfo.dil.feign.RmsFeign;
|
|
|
|
-import com.steerinfo.dil.feign.TmsTruckFeign;
|
|
|
|
|
|
+import com.steerinfo.dil.feign.*;
|
|
import com.steerinfo.dil.mapper.*;
|
|
import com.steerinfo.dil.mapper.*;
|
|
import com.steerinfo.dil.model.*;
|
|
import com.steerinfo.dil.model.*;
|
|
import com.steerinfo.dil.service.IAmsSaleOrderService;
|
|
import com.steerinfo.dil.service.IAmsSaleOrderService;
|
|
import com.steerinfo.dil.util.*;
|
|
import com.steerinfo.dil.util.*;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
+import org.apache.poi.ss.formula.functions.T;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -109,6 +107,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
@Autowired
|
|
@Autowired
|
|
EASCapacityTestUtil easCapacityTestUtil;
|
|
EASCapacityTestUtil easCapacityTestUtil;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ BmstruckFeign bmstruckFeign;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public List<Map<String, Object>> getSaleOrderInfo(Map<String, Object> map) {
|
|
public List<Map<String, Object>> getSaleOrderInfo(Map<String, Object> map) {
|
|
return amsSaleOrderMapper.getSaleOrderInfo(map);
|
|
return amsSaleOrderMapper.getSaleOrderInfo(map);
|
|
@@ -1686,6 +1687,17 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
amsSaleOrderMaterial.setSaleShippingAddressId((BigDecimal) placeIdList.get(0).get("placeId"));
|
|
amsSaleOrderMaterial.setSaleShippingAddressId((BigDecimal) placeIdList.get(0).get("placeId"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ try{
|
|
|
|
+ //修改单价
|
|
|
|
+ Map<String,Object> data=new HashMap<>();
|
|
|
|
+ List<Map<String,Object>> mapList = new ArrayList<>();
|
|
|
|
+ mapValue.put("priceId",DataChange.dataToBigDecimal(amsSaleOrderMaterialMapper.getPriceByPlace(addressid2)));
|
|
|
|
+ mapList.add(mapValue);
|
|
|
|
+ data.put("mapList",mapList);
|
|
|
|
+ bmstruckFeign.updateBatchDetailsOrder(data);
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
String addressids="";
|
|
String addressids="";
|
|
addressids =addressid1+","+addressid2;
|
|
addressids =addressid1+","+addressid2;
|
|
amsSaleOrderMaterial.setShippingAddressIds(addressids);
|
|
amsSaleOrderMaterial.setShippingAddressIds(addressids);
|