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

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

@@ -2408,4 +2408,21 @@ public class TMSController extends BaseRESTfulController {
         System.out.println(map);
         return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName);
     }
+
+    @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){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleSteelReport(map,apiId,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark);
+    }
 }

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

@@ -869,4 +869,10 @@ public class UniversalController extends BaseRESTfulController {
     public RESTfulResult updateDriverTel(@RequestBody Map<String,Object> map){
         return success(universalMapper.updateDriverTel(map));
     }
+
+    @GetMapping("/getQueueCount")
+    public RESTfulResult getQueueCount(){
+        return success(universalMapper.getQueueCount());
+    }
+
 }

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

@@ -702,6 +702,17 @@ public interface TmsTruckFeign {
                                                 @RequestParam("orgCode")String orgCode,
                                                 @RequestParam("isPage")String isPage,
                                                 @RequestParam("index")String index);
+
+    @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);
 }
 
 

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

@@ -203,4 +203,7 @@ public interface UniversalMapper {
     int updateSaleOrderStatusById(BigDecimal saleOrderId);
     // 修改司机电话
     int updateDriverTel(Map<String, Object> map);
+
+    int getQueueCount();
+
 }

src/main/resources/application-prod.yml

@@ -9,9 +9,9 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost: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:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:

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

@@ -1018,6 +1018,16 @@
         from RMS_CONSIGNEE RC
         WHERE RC.CONSIGNEE_SSO_ID = #{userId}
     </select>
+    <select id="getQueueCount" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM (SELECT QQL.LIST_ID "soleP"
+              FROM QMS_QUEUE_LIST QQL
+              WHERE QQL.ENTRY_SURE_TIME is null
+              union all
+              SELECT QQSL.SPELLING_RESULT_ID "soleP"
+              from QMS_QUEUE_SPELLING_LIST QQSL
+              WHERE QQSL.ENTRY_SURE_TIME is null)
+    </select>
 
     <update id="updateDriverTel" parameterType="java.util.Map">
         UPDATE OMSTRUCK_ORDER OO