'销售'

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -2405,17 +2405,17 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "销售钢材统计报表")
     @PostMapping("/getSaleSteelReport")
     public Map<String,Object> getSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
-                                                 Integer apiId,
                                                  String startTime,
                                                  String endTime,
                                                  String carrierSsoId,
                                                  String receiveName,
                                                  String materialName,
                                                  String specification,
-                                                 String remark){
+                                                 String remark,
+                                                 String saler){
         if(map==null){
             map=new HashMap<>();
         }
-        return tmsTruckFeign.getSaleSteelReport(map,apiId,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark);
+        return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,saler);
     }
 }

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -875,4 +875,11 @@ public class UniversalController extends BaseRESTfulController {
         return success(universalMapper.getQueueCount());
     }
 
+    @ApiModelProperty(value = "下拉下单客户的历史使用过的地址")
+    @PostMapping("/getReceiverAllPlaceUsed")
+    public RESTfulResult getReceiverAllPlaceUsed(@RequestParam Integer receiveId) {
+        List<Map<String, Object>> list = universalMapper.getReceiverAllPlaceUsed(receiveId);
+        return success(list);
+    }
+
 }

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -705,14 +705,14 @@ public interface TmsTruckFeign {
 
     @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReport")
     Map<String, Object> getSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
-                                           @RequestParam("apiId")Integer apiId,
                                            @RequestParam("startTime")String startTime,
                                            @RequestParam("endTime")String endTime,
                                            @RequestParam("carrierSsoId")String carrierSsoId,
                                            @RequestParam("receiveName")String receiveName,
                                            @RequestParam("materialName")String materialName,
                                            @RequestParam("specification")String specification,
-                                           @RequestParam("remark")String remark);
+                                           @RequestParam("remark")String remark,
+                                           @RequestParam("saler") String saler);
 }
 
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -205,5 +205,6 @@ public interface UniversalMapper {
     int updateDriverTel(Map<String, Object> map);
 
     int getQueueCount();
-
+    // 下拉下单客户的历史使用过的地址
+    List<Map<String, Object>> getReceiverAllPlaceUsed(Integer receiveId);
 }

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -444,7 +444,8 @@
         select
             RC.CARRIER_ID "carrierId",
             RC.CARRIER_NAME "value",
-            RC.CARRIER_NAME "carrierName"
+            RC.CARRIER_NAME "carrierName",
+            RC.CARRIER_ABBREVIATION "value1"
         from RMS_CARRIER RC
         where
             instr(RC.CARRIER_NAME, #{index}) > 0 and rownum < 10
@@ -1034,4 +1035,19 @@
         SET OO.DRIVER_TEL = #{driverTel}
         WHERE OO.ORDER_ID = #{orderId}
     </update>
+
+    <select id="getReceiverAllPlaceUsed" parameterType="java.lang.Integer" resultType="java.util.Map" >
+        SELECT RRP.PLACE_ID   AS "placeId",
+               RRP.ADDRESS_ID AS "addressId",
+               RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN AS "address",
+               RRP.ADDRESS_DELIVERY_ADDRESS AS "place"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_RECEIVE_PLACE RRP
+                           ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRP.PLACE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRP.ADDRESS_ID = RRA.ADDRESS_ID
+        WHERE ASO.RECEIVE_ID = #{receiveId}
+    </select>
 </mapper>