修改下websocket的名称为dws，避免和erp冲突

conf/application-ddWebOne.xml

@@ -39,7 +39,7 @@
             <property name="bookEndYear" value="2030"/>
             <property name="bookSplitKind" value="1"/>
 
-            <property name="webSocketServerName" value="aws"/>
+            <property name="webSocketServerName" value="dws"/>
 
             <!--分厂维护服务地址-->
             <property name="erpDataMain.url" value="http://192.168.1.24:8080/apis"/>
@@ -107,7 +107,7 @@
             <service value="com.dderp.webcore.rest.PlatformRest"/>
             <service value="com.dderp.webcore.rest.StoreRest"/>
             <service value="com.dderp.webcore.rest.flycat.ExpressOutRest"/>
-            <websocket value="com.dderp.webcore.websocket.ERPWebSocket" name="aws" groups="DELIVER_SERVICE_REMOTE"/>
+            <websocket value="com.dderp.webcore.websocket.ERPWebSocket" name="dws" groups="DELIVER_SERVICE_REMOTE"/>
         </rest>
 
         <servlets autoload="false">
@@ -181,9 +181,9 @@
 
             <service value="com.dderp.common.api.OpLogService" groups="DELIVER_SERVICE_REMOTE"/>
 
-            <service name="aws" value="com.sweetfish.source.CacheMemorySource" groups="DELIVER_SERVICE_REMOTE">
+            <service name="dws" value="com.sweetfish.source.CacheMemorySource" groups="DELIVER_SERVICE_REMOTE">
             </service>
-            <service name="aws" value="com.sweetfish.service.WebSocketNodeService" groups="DELIVER_SERVICE_REMOTE"/>
+            <service name="dws" value="com.sweetfish.service.WebSocketNodeService" groups="DELIVER_SERVICE_REMOTE"/>
 
             <service value="com.dderp.business.service.SupplierInitImpl" groups="DELIVER_SERVICE_REMOTE">
                 <master value="true"/>

conf/script/1000/orderSearch/BE_ERP_BusinessOrder_Search.groovy

@@ -117,7 +117,7 @@ class BE_ERP_BusinessOrder_Search implements BusinessExecutor<ProcessSearchOptio
         }
     }
 
-    def readOrderOptions(BusinessOrder sendOrder, String dataSourceId, long supplierCode,
+    def readOrderOptions(BusinessOrder businessOrder, String dataSourceId, long supplierCode,
                          ReadOrderOption... options) {
         if ((options != null) && (options.length > 0)) {
             //防止搞坏事，options传重复数据过来，先去重

ddWebCore/src/main/java/com/dderp/webcore/websocket/ERPWebSocket.java

@@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
  *
  * @author jlutt
  */
-@RestWebSocket(name = "aws", catalog = "ws", comment = "长链接服务", single = false, anyuser = true)
+@RestWebSocket(name = "dws", catalog = "ws", comment = "长链接服务", single = false, anyuser = true)
 public class ERPWebSocket extends WebSocket<String, Object> {
 
     private class WebSocketUser {