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

hs_err_pid23976.log

@@ -0,0 +1,197 @@
+#
+# There is insufficient memory for the Java Runtime Environment to continue.
+# Native memory allocation (mmap) failed to map 266338304 bytes for Failed to commit area from 0x0000000702e00000 to 0x0000000712c00000 of length 266338304.
+# Possible reasons:
+#   The system is out of physical RAM or swap space
+#   The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
+# Possible solutions:
+#   Reduce memory load on the system
+#   Increase physical memory or swap space
+#   Check if swap backing store is full
+#   Decrease Java heap size (-Xmx/-Xms)
+#   Decrease number of Java threads
+#   Decrease Java thread stack sizes (-Xss)
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
+# This output file may be truncated or incomplete.
+#
+#  Out of Memory Error (./src/hotspot/os/windows/os_windows.cpp:3301), pid=23976, tid=16908
+#
+# JRE version:  (11.0.10+9) (build )
+# Java VM: Dynamic Code Evolution 64-Bit Server VM (11.0.10+9-b1341.35, mixed mode, sharing, tiered, compressed oops, g1 gc, windows-amd64)
+# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
+#
+
+---------------  S U M M A R Y ------------
+
+Command Line: org.jetbrains.git4idea.http.GitAskPassApp Username for 'https://git.steerinfo.com': 
+
+Host: 11th Gen Intel(R) Core(TM) i5-11400H @ 2.70GHz, 12 cores, 15G,  Windows 10 , 64 bit Build 19041 (10.0.19041.1645)
+Time: Fri Apr 22 19:55:20 2022 Öйú±ê׼ʱ¼ä elapsed time: 0.019301 seconds (0d 0h 0m 0s)
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x0000027ea854d800):  JavaThread "Unknown thread" [_thread_in_vm, id=16908, stack(0x0000009fbdb00000,0x0000009fbdc00000)]
+
+Stack: [0x0000009fbdb00000,0x0000009fbdc00000]
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V  [jvm.dll+0x5f84fa]
+V  [jvm.dll+0x77e085]
+V  [jvm.dll+0x77f5dd]
+V  [jvm.dll+0x77fc93]
+V  [jvm.dll+0x2457e8]
+V  [jvm.dll+0x5f58f4]
+V  [jvm.dll+0x5ea975]
+V  [jvm.dll+0x30228b]
+V  [jvm.dll+0x3021fa]
+V  [jvm.dll+0x3020d2]
+V  [jvm.dll+0x306fb6]
+V  [jvm.dll+0x34f843]
+V  [jvm.dll+0x34ff46]
+V  [jvm.dll+0x34f943]
+V  [jvm.dll+0x2dbcb8]
+V  [jvm.dll+0x2dce57]
+V  [jvm.dll+0x75c4d7]
+V  [jvm.dll+0x75dd6c]
+V  [jvm.dll+0x35cdb9]
+V  [jvm.dll+0x73fc9e]
+V  [jvm.dll+0x3c5663]
+V  [jvm.dll+0x3c7a21]
+C  [jli.dll+0x5373]
+C  [ucrtbase.dll+0x21bb2]
+C  [KERNEL32.DLL+0x17034]
+C  [ntdll.dll+0x52651]
+
+
+---------------  P R O C E S S  ---------------
+
+Threads class SMR info:
+_java_thread_list=0x0000027ea6aeac70, length=0, elements={
+}
+
+Java Threads: ( => current thread )
+
+Other Threads:
+  0x0000027ea8563000 GCTaskThread "GC Thread#0" [stack: 0x0000009fbdc00000,0x0000009fbdd00000] [id=2204]
+  0x0000027ea85c2000 ConcurrentGCThread "G1 Main Marker" [stack: 0x0000009fbdd00000,0x0000009fbde00000] [id=16756]
+  0x0000027ea85c3800 ConcurrentGCThread "G1 Conc#0" [stack: 0x0000009fbde00000,0x0000009fbdf00000] [id=21296]
+
+[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffc2656c437]
+
+VM state:not at safepoint (not fully initialized)
+
+VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
+[0x0000027ea8548fa0] Heap_lock - owner thread: 0x0000027ea854d800
+
+Heap address: 0x0000000702e00000, size: 4050 MB, Compressed Oops mode: Non-zero based: 0x0000000702e00000
+Narrow klass base: 0x0000000000000000, Narrow klass shift: 0
+
+GC Heap History (0 events):
+No events
+
+Deoptimization events (0 events):
+No events
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (0 events):
+No events
+
+Events (1 events):
+Event: 0.009 Loaded shared library D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\zip.dll
+
+
+Dynamic libraries:
+0x00007ff6b8540000 - 0x00007ff6b854a000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\java.exe
+0x00007ffc8d630000 - 0x00007ffc8d825000 	C:\Windows\SYSTEM32\ntdll.dll
+0x00007ffc8bc10000 - 0x00007ffc8bcce000 	C:\Windows\System32\KERNEL32.DLL
+0x00007ffc8aeb0000 - 0x00007ffc8b178000 	C:\Windows\System32\KERNELBASE.dll
+0x00007ffc8b220000 - 0x00007ffc8b320000 	C:\Windows\System32\ucrtbase.dll
+0x00007ffc74400000 - 0x00007ffc74419000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\jli.dll
+0x00007ffc74420000 - 0x00007ffc74437000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\VCRUNTIME140.dll
+0x00007ffc8c100000 - 0x00007ffc8c2a0000 	C:\Windows\System32\USER32.dll
+0x00007ffc8b320000 - 0x00007ffc8b342000 	C:\Windows\System32\win32u.dll
+0x00007ffc8d240000 - 0x00007ffc8d26a000 	C:\Windows\System32\GDI32.dll
+0x00007ffc8b3c0000 - 0x00007ffc8b4cb000 	C:\Windows\System32\gdi32full.dll
+0x00007ffc759b0000 - 0x00007ffc75c4a000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
+0x00007ffc8b180000 - 0x00007ffc8b21d000 	C:\Windows\System32\msvcp_win.dll
+0x00007ffc8b690000 - 0x00007ffc8b72e000 	C:\Windows\System32\msvcrt.dll
+0x00007ffc8d0e0000 - 0x00007ffc8d110000 	C:\Windows\System32\IMM32.DLL
+0x00007ffc46d40000 - 0x00007ffc46ddd000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\msvcp140.dll
+0x00007ffc26280000 - 0x00007ffc26dcf000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\server\jvm.dll
+0x00007ffc8d030000 - 0x00007ffc8d0de000 	C:\Windows\System32\ADVAPI32.dll
+0x00007ffc8c2a0000 - 0x00007ffc8c33c000 	C:\Windows\System32\sechost.dll
+0x00007ffc8d270000 - 0x00007ffc8d395000 	C:\Windows\System32\RPCRT4.dll
+0x00007ffc8cde0000 - 0x00007ffc8cde8000 	C:\Windows\System32\PSAPI.DLL
+0x00007ffc835f0000 - 0x00007ffc835fa000 	C:\Windows\SYSTEM32\VERSION.dll
+0x00007ffc6b570000 - 0x00007ffc6b579000 	C:\Windows\SYSTEM32\WSOCK32.dll
+0x00007ffc83230000 - 0x00007ffc83257000 	C:\Windows\SYSTEM32\WINMM.dll
+0x00007ffc8cf30000 - 0x00007ffc8cf9b000 	C:\Windows\System32\WS2_32.dll
+0x00007ffc88c50000 - 0x00007ffc88c62000 	C:\Windows\SYSTEM32\kernel.appcore.dll
+0x00007ffc86b70000 - 0x00007ffc86b81000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\verify.dll
+0x00007ffc7dd80000 - 0x00007ffc7df64000 	C:\Windows\SYSTEM32\DBGHELP.DLL
+0x00007ffc73080000 - 0x00007ffc730ac000 	C:\Windows\SYSTEM32\dbgcore.DLL
+0x00007ffc8b600000 - 0x00007ffc8b682000 	C:\Windows\System32\bcryptPrimitives.dll
+0x00007ffc861f0000 - 0x00007ffc86219000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\java.dll
+0x00007ffc86bb0000 - 0x00007ffc86bbb000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\jimage.dll
+0x00007ffc85320000 - 0x00007ffc85338000 	D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\zip.dll
+
+dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
+symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin;C:\Windows\SYSTEM32;C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e;D:\Code\JetBrains\IntelliJ IDEA 2021.1\jbr\bin\server
+
+VM Arguments:
+java_command: org.jetbrains.git4idea.http.GitAskPassApp Username for 'https://git.steerinfo.com': 
+java_class_path (initial): D:/Code/JetBrains/IntelliJ IDEA 2021.1/plugins/git4idea/lib/git4idea-rt.jar;D:/Code/JetBrains/IntelliJ IDEA 2021.1/lib/xmlrpc-2.0.1.jar;D:/Code/JetBrains/IntelliJ IDEA 2021.1/lib/commons-codec-1.15.jar
+Launcher Type: SUN_STANDARD
+
+[Global flags]
+     intx CICompilerCount                          = 4                                         {product} {ergonomic}
+     uint ConcGCThreads                            = 3                                         {product} {ergonomic}
+     uint G1ConcRefinementThreads                  = 10                                        {product} {ergonomic}
+   size_t G1HeapRegionSize                         = 1048576                                   {product} {ergonomic}
+    uintx GCDrainStackTargetSize                   = 64                                        {product} {ergonomic}
+   size_t InitialHeapSize                          = 266338304                                 {product} {ergonomic}
+   size_t MarkStackSize                            = 4194304                                   {product} {ergonomic}
+   size_t MaxHeapSize                              = 4246732800                                {product} {ergonomic}
+   size_t MinHeapDeltaBytes                        = 1048576                                   {product} {ergonomic}
+    uintx NonNMethodCodeHeapSize                   = 5836300                                {pd product} {ergonomic}
+    uintx NonProfiledCodeHeapSize                  = 122910970                              {pd product} {ergonomic}
+    uintx ProfiledCodeHeapSize                     = 122910970                              {pd product} {ergonomic}
+    uintx ReservedCodeCacheSize                    = 251658240                              {pd product} {ergonomic}
+     bool SegmentedCodeCache                       = true                                      {product} {ergonomic}
+     bool UseCompressedClassPointers               = true                                 {lp64_product} {ergonomic}
+     bool UseCompressedOops                        = true                                 {lp64_product} {ergonomic}
+     bool UseG1GC                                  = true                                      {product} {ergonomic}
+     bool UseLargePagesIndividualAllocation        = false                                  {pd product} {ergonomic}
+
+Logging:
+Log output configuration:
+ #0: stdout all=warning uptime,level,tags
+ #1: stderr all=off uptime,level,tags
+
+Environment Variables:
+JAVA_HOME=D:\Code\Java\jdk1.8.0_144
+PATH=D:\Code\Git\mingw64\libexec\git-core;D:\Code\Git\mingw64\libexec\git-core;D:\Code\Git\mingw64\bin;D:\Code\Git\usr\bin;C:\Users\liyunguang\bin;D:\Code\Oracle\WINDOWS.X64_193000_db_home\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;D:\Code\Java\jdk1.8.0_144\bin;D:\Code\apache-maven-3.6.0\bin;D:\Code\erl10.5\bin;D:\Code\RabbitMQServer\rabbitmq_server-3.8.1\sbin;D:\Code\Git\cmd;D:\Code\TortoiseGit\bin;D:\Code\nodejs;C:\Program Files\MySQL\MySQL Shell 8.0\bin;C:\Users\liyunguang\AppData\Local\Microsoft\WindowsApps;D:\Code\IDE\IntelliJ IDEA 2019.3.1\bin;D:\Code\Microsoft VS Code\bin;C:\Users\liyunguang\AppData\Roaming\npm
+USERNAME=liyunguang
+DISPLAY=:0.0
+LC_ALL=en_US.UTF-8
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 141 Stepping 1, GenuineIntel
+
+
+
+---------------  S Y S T E M  ---------------
+
+OS: Windows 10 , 64 bit Build 19041 (10.0.19041.1645)
+OS uptime: 0 days 11:21 hours
+
+CPU:total 12 (initial active 12) (6 cores per cpu, 2 threads per core) family 6 model 141 stepping 1 microcode 0x34, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2, adx, evex, sha, fma
+
+Memory: 4k page, system-wide physical 16193M (4455M free)
+TotalPageFile size 28994M (AvailPageFile size 102M)
+current process WorkingSet (physical memory assigned to process): 10M, peak: 10M
+current process commit charge ("private bytes"): 64M, peak: 318M
+
+vm_info: Dynamic Code Evolution 64-Bit Server VM (11.0.10+9-b1341.35) for windows-amd64 JRE (11.0.10+9-b1341.35), built on Mar 31 2021 02:11:12 by "" with MS VC++ 14.0 (VS2015)
+
+END.

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

@@ -341,7 +341,8 @@ public class AMScontroller{
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId,
-                                              String con,String sendCompId) {
+                                              String con,
+                                                    String sendCompId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
@@ -1418,11 +1419,12 @@ public class AMScontroller{
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  String consigneeSsoId) {
+                                                  String consigneeSsoId,
+                                                  @RequestParam(required = false) String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1431,11 +1433,12 @@ public class AMScontroller{
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
-                                               @RequestParam(required = false) String consigneeSsoId){
+                                               @RequestParam(required = false) String consigneeSsoId,
+                                               @RequestParam(required = false) String con){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")

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

@@ -585,11 +585,14 @@ public class BMSController extends BaseRESTfulController {
                                                            String carrierSsoId,
                                                            Integer detailStatus,
                                                            Integer orderType,
-                                                           String userId) {
+                                                           String userId,
+                                                           String startTime,
+                                                           String endTime) {
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
-        return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId);
+        return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
+                 endTime);
     }
 
 }

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

@@ -302,14 +302,22 @@ public class OMSController {
                                             Integer apiId,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                            @RequestParam String carrierSsoId,
-                                                   Integer shipperId
+                                            @RequestParam Integer saleOrderId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId,shipperId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderStatus, con,saleOrderId);
+    }
+    @PostMapping("/getDriverInfoForSale1")
+    public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String numberPlate,
+                                                   @RequestParam Integer saleOrderId
+    )
+    {
+        return omsFeign.getDriverInfoForSale1(mapValue==null?new HashMap<>():mapValue,orderStatus, con,numberPlate,saleOrderId);
     }
 
 

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

@@ -193,6 +193,19 @@ public class OTMSController {
             String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultReceiveNotePhoto").toString());
             map.put("resultReceiveNotePhoto",resultSignedNotePhoto);
         }
+        //追加的图片
+        if(map.containsKey("otherPhoto1") && map.get("otherPhoto1")!=null){
+            String resultSignedNotePhoto =(String) imageFileUtils.downloadFile(map.get("otherPhoto1").toString());
+            map.put("otherPhoto1",resultSignedNotePhoto);
+        }
+        if(map.containsKey("otherPhoto2") && map.get("otherPhoto2") !=null){
+            String resultSignedNotePhoto =(String) imageFileUtils.downloadFile(map.get("otherPhoto2").toString());
+            map.put("otherPhoto2",resultSignedNotePhoto);
+        }
+        if(map.containsKey("otherPhoto3") && map.get("otherPhoto3") !=null){
+            String resultSignedNotePhoto =(String) imageFileUtils.downloadFile(map.get("otherPhoto3").toString());
+            map.put("otherPhoto3",resultSignedNotePhoto);
+        }
         return map;
     }
 
@@ -201,4 +214,13 @@ public class OTMSController {
         return otmsFeign.getCurrentLocation(capcityNumber);
     }
 
+    //在途订单列表
+    @PostMapping("/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                   @RequestParam(required = true,defaultValue = "479",name = "apiId")Integer apiId,
+                                                   @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                   @RequestParam(required = false,name = "pageSize")Integer pageSize){
+        return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
 }

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

@@ -1955,9 +1955,10 @@ public class TMSController extends BaseRESTfulController {
                                           String endTime,
                                           String carrierSsoId,
                                                 Integer orderType,
-                                                Integer shipperId
+                                                Integer shipperId,
+                                                String receiveName
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName);
     }
 
     @ApiOperation(value="查询销售统计报表筛选过后的总净重")
@@ -2021,6 +2022,17 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+    @ApiOperation(value="")
+    @PostMapping("/getLoaderForResultDetail")
+    public Map<String, Object> getLoaderForResultDetail(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String startTime,
+                                               String endTime,
+                                               String con) {
+        return tmsTruckFeign.getLoaderForResultDetail(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime,con);
+    }
 
 
     @PostMapping("/sendMeasureCommission")
@@ -2122,6 +2134,19 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value="拼装车内转统计报表")
+    @PostMapping("/getInwardReportForAssemble")
+    public Map<String, Object> getInwardReportForAssemble(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 String startTime,
+                                                 String endTime
+    ){
+        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
     @ApiOperation("保卫部随机抽查车牌号")
     @PostMapping("/getCapacityByDefend")
     public Map<String,Object> getCapacityByDefend(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 
+import com.steerinfo.dil.feign.OtmsFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,26 +15,27 @@ import java.util.Map;
 @RequestMapping("apis")
 public class ZhongJiaoXingLuContoller {
 
-    private TmsTruckFeign tmsTruckFeign;
+    @Autowired
+    private OtmsFeign otmsFeign;
 
     //偏离预警回调示例
     @PostMapping("/abnormalLineWarn")
     public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        tmsTruckFeign.abnormalLineWarn(data);
+        otmsFeign.abnormalLineWarn(data);
 
         return "success";
     }
     //停车预警回调示例
     @PostMapping("/parkWarn")
     public String parkWarn(@RequestParam(value = "data") String data) throws Exception {
-        tmsTruckFeign.parkWarn(data);
+        otmsFeign.parkWarn(data);
         return "success";
     }
     //离线预警回调示例
     @PostMapping("/offLineWarn")
     public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
 
-        tmsTruckFeign.offLineWarn(data);
+        otmsFeign.offLineWarn(data);
         return "success";
     }
 

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

@@ -281,10 +281,11 @@ public interface AmsFeign {
      */
     @PostMapping(value = "/api/v1/ams/amspurchaseorders/getPurchaseOrderList")
     Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId, @RequestParam String con,
-                                       @RequestParam String sendCompId
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con,
+                                       @RequestParam("sendCompId") String sendCompId
                                              );
 
 
@@ -1350,7 +1351,8 @@ public interface AmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
-                                           @RequestParam(required = false) String consigneeSsoId);
+                                           @RequestParam(required = false) String consigneeSsoId,
+                                           @RequestParam(required = false) String con);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1361,7 +1363,8 @@ public interface AmsFeign {
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
-                                               @RequestParam(required = false) String consigneeSsoId);
+                                               @RequestParam(required = false) String consigneeSsoId,
+                                               @RequestParam(required = false) String con);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -242,5 +242,7 @@ public interface BmstruckFeign {
                                                     @RequestParam("carrierSsoId") String carrierSsoId,
                                                     @RequestParam("detailStatus") Integer detailStatus,
                                                     @RequestParam("orderType") Integer orderType,
-                                                    @RequestParam("userId") String userId);
+                                                    @RequestParam("userId") String userId,
+                                                    @RequestParam("startTime")String startTime,
+                                                    @RequestParam("endTime")String endTime);
 }

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

@@ -134,11 +134,18 @@ public interface OmsFeign {
                                             @RequestParam("apiId")      Integer apiId,
                                             @RequestParam("pageNum")    Integer pageNum,
                                             @RequestParam("pageSize")   Integer pageSize,
-                                            @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
-                                            @RequestParam("carrierSsoId")  String carrierSsoId,
-                                            @RequestParam("shipperId") Integer shipperId
+                                            @RequestParam("saleOrderId") Integer saleOrderId
+    );
+
+
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale1")
+    Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("orderStatus")Integer orderStatus,
+                                            @RequestParam("con")        String con,
+                                            @RequestParam("numberPlate")  String numberPlate,
+                                            @RequestParam("saleOrderId") Integer saleOrderId
     );
 
     /**

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

@@ -17,6 +17,13 @@ public interface OtmsFeign {
                                                     @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
                                                     @RequestParam(required = false,name = "pageNum")Integer pageNum,
                                                     @RequestParam(required = false,name = "pageSize")Integer pageSize);
+
+    //在途订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
     //已完成订单列表
     @PostMapping("/api/v1/otms/pathDisplay/getFinishTruckOrderInfo")
     public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
@@ -107,4 +114,11 @@ public interface OtmsFeign {
     );
     @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
+
+    @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+    @PostMapping("/api/v1/otms/pathDisplay/parkWarn")
+    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+    @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
 }

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

@@ -392,7 +392,8 @@ public interface TmsTruckFeign {
                                          @RequestParam("endTime")   String endTime,
                                       @RequestParam("carrierSsoId")   String carrierSsoId,
                                          @RequestParam("orderType") Integer orderType,
-                                         @RequestParam("shipperId") Integer shipperId
+                                         @RequestParam("shipperId") Integer shipperId,
+                                         @RequestParam("receiveName") String receiveName
     );
 
     @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
@@ -478,6 +479,17 @@ public interface TmsTruckFeign {
                                    @RequestParam String startTime,
                                    @RequestParam String endTime);
 
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderForResultDetail")
+    Map<String, Object> getLoaderForResultDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam("apiId") Integer apiId,
+                                   @RequestParam("pageNum") Integer pageNum,
+                                   @RequestParam("pageSize") Integer pageSize,
+                                   @RequestParam("startTime") String startTime,
+                                   @RequestParam("endTime") String endTime,
+                                                 @RequestParam("con") String con);
+
     @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
     Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer apiId,
@@ -514,6 +526,15 @@ public interface TmsTruckFeign {
                                      @RequestParam String endTime);
 
 
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReportForAssemble")
+    Map<String, Object> getInwardReportForAssemble(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+
     @PostMapping("api/v1/truckTms/statisticalReport/getCapacityByDefend")
     Map<String, Object> getCapacityByDefend(@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer apiId,

src/main/resources/application-dev.yml

@@ -23,6 +23,7 @@ openfeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    #url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -37,9 +38,9 @@ openfeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.33.162:8038}
+    #url: ${OTMSFEIGN_URL:localhost:8038}
 piction:
-  #path: /usr/share/nginx/html/image
-  #path: /test/data/nginx/html/image
+  #path: C:\Users\24390\Desktop\work\a
   #path: D:\Code\work\jpg
   path: /shared
 

src/main/resources/application-prod.yml

@@ -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/bootstrap.yml

@@ -1,6 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
+    #include: ${SPRING_PROFILES:dev}
     include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
@@ -12,6 +13,7 @@ spring:
   mvc:
     static-path-pattern:
 
+
 #eureka设置
 eureka:
   client:
@@ -21,7 +23,6 @@ eureka:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-
 genxml:
   pth: com/agit
 cache:

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

@@ -165,7 +165,7 @@
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
             <if test="index != null">
-                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
+                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0 or  instr(RC.INSERT_UPDATE_REMARK, #{index})>0)
             </if>
             <if test="con != null">
                 and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
@@ -870,7 +870,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialCode" desc
+            order by "materialCode" ASC
         </if>
     </select>