Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1955,4 +1955,10 @@ public class AMScontroller{
         return amsFeign.updateCapacityNumberInFactory(mapValue);
     }
 
+    @ApiModelProperty(value = "展示下发给承运商的车序号和物资")
+    @PostMapping("/getCarrierTruckNoAndMaterialList")
+    public Map<String,Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String,Object> map) {
+        return amsFeign.getCarrierTruckNoAndMaterialList(map);
+    }
+
 }

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

@@ -2412,17 +2412,20 @@ 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 capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 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,capacityNo,carrierName,consigneeName,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/AmsFeign.java

@@ -1709,4 +1709,8 @@ public interface AmsFeign {
     // 修改厂内未装货车辆的运单车牌号
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateCapacityNumberInFactory")
     Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue);
+
+    // 展示下发给承运商的车序号和物资
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getCarrierTruckNoAndMaterialList")
+    Map<String, Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String, Object> map);
 }

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

@@ -705,14 +705,18 @@ 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("capacityNo") String capacityNo,
+                                           @RequestParam("carrierName") String carrierName,
+                                           @RequestParam("consigneeName") String consigneeName,
+                                           @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

@@ -25,13 +25,13 @@ openfeign:
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.161:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:

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
@@ -693,18 +694,15 @@
     <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">
         select *
         from (
-                 select 		DBI.BATCH_INFACOTRY_ID        "batchId",
+                 select 		DB.BATCH_ID       "batchId",
                                DB.RESULT_FOREIGN_SHIP_NAME      "foreignShipName",
-                               DBI.INFACTORY_SHIP_NAME				"infactoryShipName",
-                               CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"' || DBI.INFACTORY_SHIP_NAME) "value"
+                               CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME) "value"
                  from DIL_BATCH DB
-                          left join DIL_BATCH_INFACOTRY DBI
-                                    on DB.BATCH_ID=DBI.BATCH_ID
                           left join RMS_MATERIAL RM
                                     on RM.MATERIAL_ID = DB.MATERIAL_ID
                           join AMS_PURCHASE_ORDER APO
                                on APO.BATCH_ID = DB.BATCH_ID
-                 where DB.RESULT_FOREIGN_SHIP_NAME is not null and DBI.INFACTORY_SHIP_NAME is not null
+                 where DB.RESULT_FOREIGN_SHIP_NAME is not null
              )
         where instr("value", #{index}) > 0
 
@@ -1034,4 +1032,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>