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/OTMSController.java

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
 import java.awt.*;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -82,18 +83,33 @@ public class OTMSController {
 
     @PostMapping(value = "/addTmstruckReceiptResult")
     public synchronized RESTfulResult addTmstruckReceiptResult(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
+        //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
+        //第一张和第二张必填
         files.add(request.getFile("file0"));
         files.add(request.getFile("file1"));
+        //第三张选填
         if (request.getFile("file2")!=null){
             files.add(request.getFile("file2"));
         }
+        //追加的三张，num=6则取到file3,4,5
+        for(int i=3;i<num;i++){
+            if(request.getFile("file"+i)!=null){
+                files.add(request.getFile("file"+i));
+            }
+        }
+        //上传图片,追加的三张图片放在fourFiles里
+        List<String> fourFiles=new ArrayList<>();
         Map<String,Object> mapValue=new HashMap<>();
         for (int i=0;i<files.size();i++){
             MultipartFile file=files.get(i);
             String url = imageFileUtils.updateFile(file);
             mapValue.put("url"+i,url);
+            if(i>=3) {
+                fourFiles.add(url);
+            }
         }
+        mapValue.put("fourFiles",fourFiles);
         return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
     }
 
@@ -180,4 +196,9 @@ public class OTMSController {
         return map;
     }
 
+    @GetMapping("/getCurrentLocation")
+    public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception{
+        return otmsFeign.getCurrentLocation(capcityNumber);
+    }
+
 }

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

@@ -1,8 +1,7 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.QmsTruckFeign;
+import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -21,7 +20,7 @@ import java.util.Map;
 public class QMSController extends BaseRESTfulController {
 
     @Autowired
-    private QmsTruckFeign qmsTruckFeign;
+    private QmsFeign qmsFeign;
 
     @ApiOperation(value="触发电子围栏-->新增排队实绩")
     @ApiImplicitParams({
@@ -29,17 +28,16 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/addQueueResult")
     public Map<String, Object> addQueueResult(String vno){
-        return qmsTruckFeign.addQueueResult(vno);
+        return qmsFeign.addQueueResult(vno);
     }
 
-
     @ApiOperation(value="指令接收-->新增排队链表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/addQueueList")
     public Map<String, Object> addQueueList(String resultId){
-        return qmsTruckFeign.addQueueList(resultId);
+        return qmsFeign.addQueueList(resultId);
     }
 
     @ApiOperation(value="指令接收")
@@ -58,7 +56,7 @@ public class QMSController extends BaseRESTfulController {
                                             Integer queueType,
                                             String con
     ){
-        return qmsTruckFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
+        return qmsFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
     }
 
 
@@ -77,7 +75,7 @@ public class QMSController extends BaseRESTfulController {
                                              Integer pageSize,
                                              String con
     ){
-        return qmsTruckFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+        return qmsFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
 
@@ -98,35 +96,9 @@ public class QMSController extends BaseRESTfulController {
                                                      String capacityNumber,
                                                      Integer isSpelling
     ){
-        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
-    }
-
-
-    @ApiOperation(value="查询进厂排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllQueueMes")
-    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer gatepostId,
-                                              String con
-    ){
-        return qmsTruckFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
-    }
-
-    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
-    @PostMapping("/changeQueue")
-    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.changeQueue(mapValue);
+        return qmsFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
     }
 
-
     @ApiOperation(value="查询排队转移")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -142,17 +114,7 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-
-
-    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueCancel")
-    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueCancel(mapValue);
+        return qmsFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="查询排队取消")
@@ -170,26 +132,25 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+        return qmsFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
-    @ApiOperation(value="通过Id查询排队取消实绩")
+    @ApiOperation(value="修改排队取消实绩：时间、原因")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
-    @PostMapping("/getQueueCancelByResultId/{resultId}")
-    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
-        return qmsTruckFeign.getQueueCancelByResultId(resultId);
+    @PostMapping("/updateQueueCancel")
+    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.updateQueueCancel(mapValue);
     }
 
-
-    @ApiOperation(value="修改排队取消实绩：时间、原因")
+    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
-    @PostMapping("/updateQueueCancel")
-    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsTruckFeign.updateQueueCancel(mapValue);
+    @PostMapping("/queueCancel")
+    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueCancel(mapValue);
     }
 
 
@@ -199,7 +160,7 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/queueCutInLine")
     public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueCutInLine(mapValue);
+        return qmsFeign.queueCutInLine(mapValue);
     }
 
 
@@ -218,16 +179,7 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="排队结束-->修改deleted = 1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueEndByPDA")
-    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueEnd(mapValue);
+        return qmsFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="查询排队结束")
@@ -245,29 +197,9 @@ public class QMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  String con
     ){
-        return qmsTruckFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="汽车监控")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/capacityMonitor")
-    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer gridType,
-                                               String con
-    ){
-        return qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
+        return qmsFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
-
     @ApiOperation(value="链表监控")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -281,123 +213,207 @@ public class QMSController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           String con
-    ){return qmsTruckFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
-    @PostMapping("/getQueueStatusList")
-    public Map<String, Object> getQueueStatusList(){
-        return qmsTruckFeign.getQueueStatusList();
+                                           Integer isSpelling
+    ){return qmsFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,isSpelling);
     }
 
     @ApiOperation(value="通过车牌号查询司机接单")
     @PostMapping("/getOrderReceive/{capacityNumber}")
     public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
-        return qmsTruckFeign.getOrderReceive(capacityNumber);
+        return qmsFeign.getOrderReceive(capacityNumber);
     }
 
     @ApiOperation(value="通过车牌号取消排队")
     @PostMapping("/cancelQueue")
     public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue){
-        return qmsTruckFeign.cancelQueue(mapValue);
+        return qmsFeign.cancelQueue(mapValue);
     }
 
-    @ApiOperation(value="查询执行中订单")
+    @ApiOperation(value="钢材科允许进厂")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
     })
-    @PostMapping("/getAllExecutionOrder")
-    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                    Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    Integer orderType,
-                                                    Integer status,
-                                                    String con
-    ){
-        return qmsTruckFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
+    @PostMapping("/allowEnFactory")
+    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.allowEnFactory(mapValue);
     }
 
-    @ApiOperation(value="查询某一个门岗的排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
-    })
-    @PostMapping("/getListQueueMes")
-    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.getListQueueMes(mapValue);
+    @ApiOperation(value="APP端司机查看排队信息")
+    @GetMapping("getQueueResultByTotalId")
+    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
+        return  qmsFeign.getQueueResultByTotalId(resultTotalId);
     }
 
 
-    @ApiOperation(value="查询仓库排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueApply")
-    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer platformId,
-                                                      String con
-    ){return qmsTruckFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-    @ApiOperation(value="查询仓库排队转移")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueChange")
-    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-
-                                                       String con
-    ){return qmsTruckFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    @ApiOperation(value="单拼链表查看详情")
+    @PostMapping("/getListMonitorMes")
+    public Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.getListMonitorMes(mapValue);
     }
 
-
-    @ApiOperation(value="查询仓库排队结束")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueEndMes")
-    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       String con
-    ){return qmsTruckFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    @ApiOperation(value="多拼链表查看详情")
+    @PostMapping("/getSpellingListMonitorMes")
+    public Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.getSpellingListMonitorMes(mapValue);
     }
 
 
-    @ApiOperation(value="钢材科允许进厂")
+    @ApiOperation(value="排队结束-->修改deleted = 1")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
-    @PostMapping("/allowEnFactory")
-    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.allowEnFactory(mapValue);
+    @PostMapping("/queueEndByPDA")
+    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueEnd(mapValue);
     }
 
-    @ApiOperation(value="APP端司机查看排队信息")
-    @GetMapping("getQueueResultByTotalId")
-    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
-        return  qmsTruckFeign.getQueueResultByTotalId(resultTotalId);
-    }
 
+//    @ApiOperation(value="查询进厂排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllQueueMes")
+//    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                              Integer apiId,
+//                                              Integer pageNum,
+//                                              Integer pageSize,
+//                                              Integer gatepostId,
+//                                              String con
+//    ){
+//        return qmsFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
+//    }
+
+//    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
+//    @PostMapping("/changeQueue")
+//    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return qmsFeign.changeQueue(mapValue);
+//    }
+
+
+
+
+//    @ApiOperation(value="通过Id查询排队取消实绩")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getQueueCancelByResultId/{resultId}")
+//    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
+//        return qmsFeign.getQueueCancelByResultId(resultId);
+//    }
+
+
+
+//    @ApiOperation(value="汽车监控")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/capacityMonitor")
+//    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                               Integer apiId,
+//                                               Integer pageNum,
+//                                               Integer pageSize,
+//                                               Integer gridType,
+//                                               String con
+//    ){
+//        return qmsFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
+//    }
+
+
+
+
+//    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
+//    @PostMapping("/getQueueStatusList")
+//    public Map<String, Object> getQueueStatusList(){
+//        return qmsFeign.getQueueStatusList();
+//    }
+
+
+
+//    @ApiOperation(value="查询执行中订单")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllExecutionOrder")
+//    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                    Integer apiId,
+//                                                    Integer pageNum,
+//                                                    Integer pageSize,
+//                                                    Integer orderType,
+//                                                    Integer status,
+//                                                    String con
+//    ){
+//        return qmsFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
+//    }
+
+//    @ApiOperation(value="查询某一个门岗的排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getListQueueMes")
+//    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return qmsFeign.getListQueueMes(mapValue);
+//    }
+
+
+//    @ApiOperation(value="查询仓库排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueApply")
+//    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                      Integer apiId,
+//                                                      Integer pageNum,
+//                                                      Integer pageSize,
+//                                                      Integer platformId,
+//                                                      String con
+//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+//    @ApiOperation(value="查询仓库排队转移")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueChange")
+//    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                       Integer apiId,
+//                                                       Integer pageNum,
+//                                                       Integer pageSize,
+//
+//                                                       String con
+//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+
+
+//    @ApiOperation(value="查询仓库排队结束")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueEndMes")
+//    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                       Integer apiId,
+//                                                       Integer pageNum,
+//                                                       Integer pageSize,
+//                                                       String con
+//    ){return qmsFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
 
 }

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.QMSFeign;
-import com.steerinfo.dil.feign.QmsTruckFeign;
+import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -29,7 +28,7 @@ public class WMSController extends BaseRESTfulController {
     @Autowired
     WMSFeign wmsFeign;
     @Autowired
-    QMSFeign qmsFeign;
+    QmsFeign qmsFeign;
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({

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/OtmsFeign.java

@@ -4,10 +4,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.HashMap;
@@ -108,4 +105,6 @@ public interface OtmsFeign {
                                          @RequestParam String startTime,
                                          @RequestParam String endTime
     );
+    @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
+    public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
 }

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

@@ -1,20 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @author luobang
- * @create 2021-10-13 9:09
- */
-@FeignClient(value = "DAL-TRICK-QMS-DEV",url = "${openfeign.OMSFeign.url}")
-public interface QMSFeign {
-    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
-    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
-                                     @RequestParam int size);
-}

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

@@ -0,0 +1,210 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/1 17:19
+ */
+
+@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
+public interface QmsFeign {
+
+    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
+    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
+                                     @RequestParam int size);
+
+    /*
+    QmsQueueResultController /  QmsQueueListController
+     */
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
+     Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
+     Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
+     Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("queueType") Integer queueType,
+                                            @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
+     Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
+     Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize,
+                                                     @RequestParam("locationId") Integer locationId,
+                                                     @RequestParam("capacityNumber")String capacityNumber,
+                                                     @RequestParam("isSpelling")Integer isSpelling
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
+     Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
+     Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
+     Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
+     Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
+     Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
+     Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
+    Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
+     Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
+     Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("isSpelling")Integer isSpelling
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
+     Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
+     Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
+    Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
+    Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListMonitorMes")
+    Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/getSpellingListMonitorMes")
+    Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
+//     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                              @RequestParam("apiId") Integer apiId,
+//                                              @RequestParam("pageNum") Integer pageNum,
+//                                              @RequestParam("pageSize") Integer pageSize,
+//                                              @RequestParam("gatepostId") Integer gatepostId,
+//                                              @RequestParam("con")String con
+//    );
+
+    
+//    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
+//     Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
+//
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
+//     Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
+
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
+//     Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                               @RequestParam("apiId") Integer apiId,
+//                                               @RequestParam("pageNum") Integer pageNum,
+//                                               @RequestParam("pageSize") Integer pageSize,
+//                                               @RequestParam("gridType") Integer gridType,
+//                                               @RequestParam("con")String con
+//    );
+    
+
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
+//     Map<String, Object> getQueueStatusList();
+
+
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
+//     Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                    @RequestParam("apiId") Integer apiId,
+//                                                    @RequestParam("pageNum") Integer pageNum,
+//                                                    @RequestParam("pageSize") Integer pageSize,
+//                                                    @RequestParam("orderType")Integer orderType,
+//                                                    @RequestParam("status")Integer status,
+//                                                    @RequestParam("con")String con
+//    );
+
+
+//
+//    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
+//    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
+//    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                @RequestParam("apiId") Integer apiId,
+//                                                @RequestParam("pageNum") Integer pageNum,
+//                                                @RequestParam("pageSize") Integer pageSize,
+//                                                @RequestParam("con")String con
+//    );
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
+//    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                @RequestParam("apiId") Integer apiId,
+//                                                @RequestParam("pageNum") Integer pageNum,
+//                                                @RequestParam("pageSize") Integer pageSize,
+//                                                @RequestParam("con")String con
+//    );
+
+}

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

@@ -1,200 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/1 17:19
- */
-
-@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
-public interface QmsTruckFeign {
-
-    /*
-    QmsQueueResultController /  QmsQueueListController
-     */
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
-    public Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
-    public Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
-    public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("apiId") Integer apiId,
-                                            @RequestParam("pageNum") Integer pageNum,
-                                            @RequestParam("pageSize") Integer pageSize,
-                                            @RequestParam("queueType") Integer queueType,
-                                            @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
-    public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             @RequestParam("apiId") Integer apiId,
-                                             @RequestParam("pageNum") Integer pageNum,
-                                             @RequestParam("pageSize") Integer pageSize,
-                                             @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
-    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("gatepostId") Integer gatepostId,
-                                              @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
-    public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     @RequestParam("apiId") Integer apiId,
-                                                     @RequestParam("pageNum") Integer pageNum,
-                                                     @RequestParam("pageSize") Integer pageSize,
-                                                     @RequestParam("locationId") Integer locationId,
-                                                     @RequestParam("capacityNumber")String capacityNumber,
-                                                     @RequestParam("isSpelling")Integer isSpelling
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
-    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
-    public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
-    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
-    public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
-    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
-    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
-    public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
-    public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
-    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
-    public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 @RequestParam("apiId") Integer apiId,
-                                                 @RequestParam("pageNum") Integer pageNum,
-                                                 @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
-    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("gridType") Integer gridType,
-                                               @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
-    public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("con")String con
-    );
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
-    public Map<String, Object> getQueueStatusList();
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
-    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
-    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
-    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                    @RequestParam("apiId") Integer apiId,
-                                                    @RequestParam("pageNum") Integer pageNum,
-                                                    @RequestParam("pageSize") Integer pageSize,
-                                                    @RequestParam("orderType")Integer orderType,
-                                                    @RequestParam("status")Integer status,
-                                                    @RequestParam("con")String con
-    );
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
-    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
-    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("con")String con
-    );
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
-    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
-    Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
-
-    @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
-    Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
-}

src/main/resources/application-dev.yml

@@ -40,7 +40,7 @@ openfeign:
 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
 
 server:

src/main/resources/application-prod.yml

@@ -37,7 +37,7 @@ openfeign:
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.33.166:8038}
+    url: ${OTMSFEIGN_URL:localhost:8038}
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image

src/main/resources/bootstrap.yml

@@ -12,6 +12,7 @@ spring:
   mvc:
     static-path-pattern:
 
+
 #eureka设置
 eureka:
   client:
@@ -21,7 +22,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
@@ -872,7 +872,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialCode" desc
+            order by "materialCode" ASC
         </if>
     </select>
 
@@ -964,7 +964,7 @@
         SELECT RW.WAREHOUSE_ID   "id",
                RW.WAREHOUSE_NAME "value"
         FROM RMS_WAREHOUSE RW
-        WHERE RW.WAREHOUSE_TYPE_ID = 1
+        WHERE RW.WAREHOUSE_TYPE_ID = 9
     </select>
 
     <select id="getShipNameMesByLike" resultType="java.util.Map" parameterType="java.util.Map">