From e769b3058b3f4af215f1d07b162c63f7eaec783f Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <Jin980303>
Date: Wed, 31 Dec 2025 16:24:49 +0800
Subject: [PATCH] no message

---
 .../origen/receiving/maintainASNPage.xml      |   7 +-
 .../WEB-INF/classes/dataSourceContext.xml     | 109 +++++++++---------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml
index c6e5a95..966d937 100644
--- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml
@@ -24,7 +24,8 @@
                 <date id="asn.orderDate" title="asn.orderDate" row="6" span="1" readOnly="false" required="false" reserve="true" forceOverride="false" inVisible="true" showTime="false" manualEditable="false" defaultCurrentDate="true"/>
                 <dateRanger id="receive.date" title="asn.receivedDate" row="4" span="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="receive.beginDate" toDate="receive.endDate"/>
                 <text id="asn.userName" title="asn.userName" row="5" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
-                 <checkbox id="ordersAll" title="ordersAll" row="5" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
+                <textArea id="asn.description" title="organization.description" row="6" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" rows="3" cols="50"/>
+                <checkbox id="ordersAll" title="ordersAll" row="7" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[SELECT asn.id,
@@ -54,7 +55,9 @@
  /~order.endDate: AND asn.orderDate <= {order.endDate} ~/
  /~receive.beginDate: AND asn.receivedDate >= {receive.beginDate} ~/
  /~receive.endDate: AND asn.receivedDate <= {receive.endDate} ~/
- /~asn.userName: AND asn.userName LIKE {asn.userName} ~/  order by asn.id desc]]></datasource>
+ /~asn.userName: AND asn.userName LIKE {asn.userName} ~/  
+ /~asn.description: AND asn.description LIKE {asn.description} ~/  
+ order by asn.id desc]]></datasource>
         <columns>
             <column id="asn.id" title="asn.id" visible="false"/>
             <column id="asn.company.name" width="200" title="asn.company" visible="true" horizonAlign="left"/>
diff --git a/src/webapp/WEB-INF/classes/dataSourceContext.xml b/src/webapp/WEB-INF/classes/dataSourceContext.xml
index a035ed8..a5c029e 100644
--- a/src/webapp/WEB-INF/classes/dataSourceContext.xml
+++ b/src/webapp/WEB-INF/classes/dataSourceContext.xml
@@ -3,63 +3,60 @@
         "-//SPRING//DTD BEAN//EN"
         "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<!-- Copyright (c) 2001-2005 dev Information Technology Co.,Ltd. All Rights 
-	Reserved. This software is the confidential and proprietary information of 
-	dev Information Technology Co.,Ltd. ("Confidential Information"). You shall 
-	not disclose such Confidential Information and shall use it only in accordance 
-	with the terms of the license agreement you entered into with dev. dev MAKES 
-	NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE, EITHER 
-	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. dev 
-	SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, 
-	MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. -->
-<!-- $Id: dataSourceContext.xml,v 1.9 2009/03/11 03:37:58 heming.liu Exp 
-	$ -->
+<!--
+  Copyright (c) 2001-2005 dev Information Technology Co.,Ltd. All Rights Reserved.
+
+  This software is the confidential and proprietary information of dev
+  Information Technology Co.,Ltd. ("Confidential Information").  You shall not
+  disclose such Confidential Information and shall use it only in
+  accordance with the terms of the license agreement you entered into
+  with dev.
+
+  dev MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF THE
+  SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+  PURPOSE, OR NON-INFRINGEMENT. dev SHALL NOT BE LIABLE FOR ANY DAMAGES
+  SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+  THIS SOFTWARE OR ITS DERIVATIVES.
+-->
+<!-- $Id: dataSourceContext.xml,v 1.9 2009/03/11 03:37:58 heming.liu Exp $ -->
 
 <beans>
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
-		destroy-method="close">
-
-		<!-- <property name="driverClassName"> -->
-		<!-- <value>oracle.jdbc.OracleDriver</value> -->
-		<!-- </property> -->
-		<!-- <property name="url"> -->
-		<!-- <value>jdbc:oracle:thin:@106.15.180.250:1521:orcl</value> -->
-		<!-- <value>jdbc:oracle:thin:@47.100.54.81:1521:orcl</value> -->
-		<!-- <value>jdbc:oracle:thin:@localhost:1521:orcl</value> -->
-		<!-- </property> -->
-		<!-- <property name="username"> -->
-		<!-- <value>demo</value> -->
-		<!-- </property> -->
-		<!-- <property name="password"> -->
-		<!-- <value>demo</value> -->
-		<!-- </property> -->
-		<!-- <property name="maxActive"> -->
-		<!-- <value>200</value> -->
-		<!-- </property> -->
+    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        
+<!--      	<property name="driverClassName"> -->
+<!--             <value>oracle.jdbc.OracleDriver</value> -->
+<!--         </property> -->
+<!--        <property name="url"> -->
+<!--            <value>jdbc:oracle:thin:@106.15.180.250:1521:orcl</value> -->
+<!--  				<value>jdbc:oracle:thin:@47.100.54.81:1521:orcl</value> -->
+<!-- 			<value>jdbc:oracle:thin:@localhost:1521:orcl</value> -->
+<!--         </property> -->
+<!--         <property name="username"> -->
+<!--             <value>demo</value> -->
+<!--         </property> -->
+<!--         <property name="password"> -->
+<!--             <value>demo</value> -->
+<!--         </property> -->
+<!--         <property name="maxActive"> -->
+<!--             <value>200</value> -->
+<!--         </property> -->
 		<property name="driverClassName">
-			<value>com.mysql.jdbc.Driver</value>
-		</property>
-		<property name="url">
-<!-- 			<value>jdbc:mysql://47.100.54.81:3306/jrwms?useUnicode=true&amp;characterEncoding=utf8&amp;serverTimezone=UTC&amp;useSSL=false&amp;autoReconnect=true&amp;failOverReadOnly=false</value> -->
-			<value>jdbc:mysql://139.196.165.224:53306/jrwms?useUnicode=true&amp;characterEncoding=utf8&amp;serverTimezone=UTC&amp;useSSL=false&amp;useOldAliasMetadataBehavior=true&amp;autoReconnect=true&amp;failOverReadOnly=false</value>
-		</property>
-		<property name="username">
-			<value>root</value>
-		</property>
-		<property name="password">
-<!-- 			<value>MYSQL@123</value> -->
-			<value>Youchain@56</value>
-<!-- 				<value>root</value> -->
-		</property>
-		<property name="maxActive">
-			<value>0</value>
-		</property>
-		<property name="maxIdle">
-			<value>0</value>
-		</property>
-		<property name="maxWait">
-			<value>-1</value>
-		</property>
-	</bean>
+            <value>com.mysql.jdbc.Driver</value>
+        </property>
+        <property name="url">
+<!--             <value>jdbc:mysql://localhost:3306/cqtms</value> -->
+		<value>jdbc:mysql://139.196.165.224:53306/jrwms?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=utf-8&amp;useSSL=false</value>
+<!-- 	<value>jdbc:mysql://localhost:3306/springbootdb?useUnicode=true&amp;characterEncoding=utf8&useSSL=true</value> -->
+        </property>
+        <property name="username">
+            <value>root</value>
+        </property>
+        <property name="password">
+            <value>Youchain@56</value>
+        </property>
+        <property name="maxActive">
+            <value>20</value>
+        </property>
+    </bean>
 </beans>
\ No newline at end of file