From 897c6437c5c0066195f84b3920c62b7a045071ab Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Tue, 20 Aug 2024 17:19:54 +0800
Subject: [PATCH] no message

---
 .../origen/receiving/asnOneReceivePage.xml    |   8 +-
 .../origen/receiving/asnOneReceivePage.xml    | 180 ------------------
 .../WEB-INF/classes/dataSourceContext.xml     |  44 -----
 3 files changed, 5 insertions(+), 227 deletions(-)
 delete mode 100644 target/jjwms/WEB-INF/classes/config/origen/receiving/asnOneReceivePage.xml
 delete mode 100644 target/jjwms/WEB-INF/classes/dataSourceContext.xml

diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/asnOneReceivePage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/asnOneReceivePage.xml
index 7e5bc08..2a7f3da 100644
--- a/src/webapp/WEB-INF/classes/config/origen/receiving/asnOneReceivePage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/receiving/asnOneReceivePage.xml
@@ -37,9 +37,11 @@
                 from LocStatusView lv  
                 left join lv.loc loc  
  where loc.code like :param
- and loc.disabled = false and loc.type in ('TRANSIT','STORAGE')
- and (loc.mixItem=true  or lv.loc_status='空') and (loc.id in(select  l.dock.id from LocationRegistration l where l.asn.id={asn.id}) or 0=(select  nvl(max(l.dock.id),0) from LocationRegistration l where l.asn.id={asn.id}))
- and loc.warehouse = #{SESSION_WAREHOUSE} order by loc.code]]></hql>
+ and loc.disabled = false 
+ and loc.type in ('TRANSIT','STORAGE')
+ and (loc.mixItem=true  or lv.loc_status='空')
+ and (loc.id in(select  l.dock.id from LocationRegistration l where l.asn.id={asn.id}) or 0=(select  nvl(max(l.dock.id),0) from LocationRegistration l where l.asn.id={asn.id}))
+ order by loc.code]]></hql>
             </remote>
             <remote id="asnDetail.asn.worker1.id" title="asnOneReceivePage.worker" row="20" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="3" percentSignPosition="both" displayedTableHead="序号,编码,名称">
                 <hql><![CDATA[select w.id, w.code, w.name from Worker w
diff --git a/target/jjwms/WEB-INF/classes/config/origen/receiving/asnOneReceivePage.xml b/target/jjwms/WEB-INF/classes/config/origen/receiving/asnOneReceivePage.xml
deleted file mode 100644
index 7e5bc08..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/receiving/asnOneReceivePage.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <editPage id="asnOneReceivePage" title="asnOneReivePage" entityClass="com.dev.swms.server.model.receiving.ASNDetail" width="670" height="350">
-        <initListeners>
-			<initListener id="asnDetail.item.id" rowDataIndex="12" newEnabled="false" editEnabled="true"/>
-			<initListener id="itemId" rowDataIndex="12" newEnabled="false" editEnabled="true"/>
-			<initListener id="expectedQuantity" managerName="asnManager" methodName="getExpectedQuantityByDetail" newEnabled="true" editEnabled="true"/>
-            <initListener id="receiveQty" managerName="asnManager" methodName="getPuQty" newEnabled="true" editEnabled="true"/>
-<!--             <initListener id="asnDetail.lotInfo" managerName="itemManager" methodName="getLotRuleTackersByPageMap" newEnabled="false" editEnabled="true"/> -->
-        </initListeners>
-        <inputUIs>
-           	<hidden id="asnDetail.item.id" reserve="false"/>
-           	<hidden id="asnDetail.asn.id" reserve="false"/>
-           	<hidden id="itemId" reserve="false"/>
-            <hidden id="asnDetail.id" reserve="false"/>
-			<hidden id="asnDetail.item.lotRule.id" reserve="false"/>
-			<hidden id="asnDetail.item.lotRule.lotRuleComponent.trackPropC2" reserve="false"/>
-			<hidden id="asnDetail.item.company.lotRule.lotRuleComponent.trackPropC2" reserve="false"/>
-			<text id="asnDetail.item.code" title="item.code" row="1" col="1" readOnly="true" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="true" isPrecision="true"/>
-            <text id="asnDetail.item.name" title="item.name" row="1" col="2" readOnly="true" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="true" isPrecision="true"/>
-            <text id="expectedQuantity" title="oneReceivePage.expectedQuantity" row="1" col="3" readOnly="true" required="false" reserve="false" forceOverride="false" inVisible="false"  trimSpace="true" isPrecision="true"/>
-<!-- 			<complex id="asnDetail.lotInfo" title="asnDetail.lotInfo" row="10" col="1" span="2" type="lotInfo"/> -->
-			<text id="asnDetail.lotInfo.propC1" title="asnDetail.lotInfo.propC1" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false"  trimSpace="true" isPrecision="true"/>
-			<text id="asnDetail.lotInfo.propC4" title="asnDetail.lotInfo.propC4" row="3" col="2" readOnly="true" required="false" reserve="false" forceOverride="false" inVisible="false"  trimSpace="true" isPrecision="true"/>
-			<date id="asnDetail.lotInfo.propD1" title="asnDetail.lotInfo.propD1" row="3" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" customFormat="yyyy-MM-dd" defaultCurrentDate="false"/>
-			<text id="asnDetail.lotInfo.propC5" title="item.itemCode" row="4" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false"  trimSpace="true" isPrecision="true"/>
-			<numberText id="receiveQty" title="asn.receiveQty" defaultValue="0" row="4" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   />
-            <date id="asnDetail.lotInfo.propD2" title="asnDetail.lotInfo.propD2" row="4" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" customFormat="yyyy-MM-dd" defaultCurrentDate="false"/>
-            <numberText id="case.qty" title="case.qty" defaultValue="1" row="17" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   />
-            <numberText id="lp.qty" title="lp.qty" row="17" defaultValue="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   />
-            <text id="asnDetail.lotInfo.propC6" title="PO#" row="17" col="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false"  trimSpace="true" isPrecision="true"/>
-            
-            <numberText id="volume" title="volume" defaultValue="0" row="20" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   />
-            <remote id="asnDetail.dock.id" title="asnOneReivePage.revLocation" row="20" col="1" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" percentSignPosition="both" displayColumn="2" displayedTableHead="序号,库位编码,库位名称">
-                <hql><![CDATA[select loc.id, loc.code, loc.name 
-                from LocStatusView lv  
-                left join lv.loc loc  
- where loc.code like :param
- and loc.disabled = false and loc.type in ('TRANSIT','STORAGE')
- and (loc.mixItem=true  or lv.loc_status='空') and (loc.id in(select  l.dock.id from LocationRegistration l where l.asn.id={asn.id}) or 0=(select  nvl(max(l.dock.id),0) from LocationRegistration l where l.asn.id={asn.id}))
- and loc.warehouse = #{SESSION_WAREHOUSE} order by loc.code]]></hql>
-            </remote>
-            <remote id="asnDetail.asn.worker1.id" title="asnOneReceivePage.worker" row="20" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="3" percentSignPosition="both" displayedTableHead="序号,编码,名称">
-                <hql><![CDATA[select w.id, w.code, w.name from Worker w
- where w.code like :param and w.disabled=false
- and w.warehouse.id = #{SESSION_WAREHOUSE_ID}
- ]]></hql>
-            </remote>
-            
-            <date id="receiveDate" title="asnOneReceivePage.oneReceivePage.receiveDate" row="22" col="1" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" customFormat="yyyy-MM-dd" defaultCurrentDate="true"/>
-<!--             <text id="qualityCode" title="qualityCode" row="25" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/> -->
-            <list id="qualityCode" title="qualityCode" row="22" col="2" span="1"  width="120" readOnly="false" required="true" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
- c.name,
- c.name
- FROM CommonCode c 
- WHERE c.disabled=0 and c.codeType='货品状态' 
- ]]></hql>		
- 					<eventListeners>
-              			<eventListener id="cc" refreshUI="true"/>
-               	 	</eventListeners>
-                </list>
-            <numberText id="qty13" title="qty13" row="22" col="3" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <text id="cc" title="linshiConsignorName" row="5" col="5" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true"/>
-            <text id="lpCode" title="lpCode" row="24" col="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" isPrecision="false"/>
-            
-            <numberText id="length" title="length" defaultValue="0" row="23" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true"   />
-            <numberText id="width" title="width" defaultValue="0" row="23" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true"   />
-            <numberText id="height" title="height" row="23" defaultValue="0" col="3" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true"   />
-            <numberText id="qty1" title="qty1" row="25" col="1" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--              <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty2" title="qty2" row="25" col="2" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty3" title="qty3" row="25" col="3" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty4" title="qty4" row="26" col="1" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty5" title="qty5" row="26" col="2" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--            <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-           </numberText>
-            <numberText id="qty6" title="qty6" row="26" col="3" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty7" title="qty7" row="27" col="1" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty8" title="qty8" row="27" col="2" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty9" title="qty9" row="27" col="3" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty10" title="qty10" row="28" col="1" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty11" title="qty11" row="28" col="2" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-            <numberText id="qty12" title="qty12" row="28" col="3" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"   >
-<!--             <visibleExpression><![CDATA[ ${cc} =='不良品' ||${qualityCode} =='不良品' ]]></visibleExpression> -->
-            </numberText>
-             <text id="des" title="description" row="30" col="3" span="3" width="550" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
-        </inputUIs>
-        <buttons>
-            <commit id="receive" title="receive" enableType="none" invisible="false" confirmMessage="oneReceivePage.confirm.receive">
-                <mappings>
-                    <mapping id="asn.id" className="long"/>
-                    <mapping id="asnDetail.id" className="long"/>
-                    <mapping id="asnDetail.lotInfo" className="com.dev.swms.server.model.base.LotInfo">
-                        <entries>
-                            <entry front="asnDetail.lotInfo.propC1" end="propC1"/>
-                            <entry front="asnDetail.lotInfo.propC2" end="propC2"/>
-                            <entry front="asnDetail.lotInfo.propC3" end="propC3"/>
-                            <entry front="asnDetail.lotInfo.propC4" end="propC4"/>
-                            <entry front="asnDetail.lotInfo.propC5" end="propC5"/>
-                            <entry front="asnDetail.lotInfo.propC6" end="propC6"/>
-                            <entry front="asnDetail.lotInfo.propC7" end="propC7"/>
-                            <entry front="asnDetail.lotInfo.propC8" end="propC8"/>
-                            <entry front="asnDetail.lotInfo.propC9" end="propC9"/>
-                            <entry front="asnDetail.lotInfo.propN1" end="propN1"/>
-                            <entry front="asnDetail.lotInfo.propN2" end="propN2"/>
-                            <entry front="asnDetail.lotInfo.propN3" end="propN3"/>
-                            <entry front="asnDetail.lotInfo.propD1" end="propD1"/>
-                            <entry front="asnDetail.lotInfo.propD2" end="propD2"/>
-                            <entry front="asnDetail.lotInfo.propD3" end="propD3"/>
-                            <entry front="asnDetail.lotInfo.propL1" end="propL1"/>
-                            <entry front="asnDetail.lotInfo.propL2" end="propL2"/>
-                            <entry front="asnDetail.lotInfo.propL3" end="propL3"/>
-                        </entries>
-                    </mapping>
-                    <mapping id="receiveQty" className="double"/>
-                    <mapping id="case.qty" className="long"/>
-                    <mapping id="lp.qty" className="long"/>
-                    <mapping id="receiveDate" className="date"/>
-                    <mapping id="qualityCode" className="string"/>
-                    <mapping id="lpCode" className="string"/>
-                    <mapping id="asnDetail.dock.id" className="long"/>
-                    <mapping id="asnDetail.asn.worker1.id" className="long"/>
-                    <mapping id="asnDetail" className="com.dev.swms.server.model.receiving.ASNDetail"/>
-                    <mapping id="qty1" className="double"/>
-                    <mapping id="qty2" className="double"/>
-                    <mapping id="qty3" className="double"/>
-                    <mapping id="qty4" className="double"/>
-                    <mapping id="qty5" className="double"/>
-                    <mapping id="qty6" className="double"/>
-                    <mapping id="qty7" className="double"/>
-                    <mapping id="qty8" className="double"/>
-                    <mapping id="qty9" className="double"/>
-                    <mapping id="qty10" className="double"/>
-                    <mapping id="qty11" className="double"/>
-                    <mapping id="qty12" className="double"/>
-                    <mapping id="qty13" className="double"/>
-                    <mapping id="width" className="double"/>
-                    <mapping id="length" className="double"/>
-                    <mapping id="height" className="double"/>
-                    <mapping id="des" className="string"/>
-                    <mapping id="volume" className="double"/>
-                    <mapping id="asnDetail.lotInfo.propC5" className="string"/>
-                    <mapping id="asnDetail.lotInfo.propC6" className="string"/>
-                </mappings>
-                <actions>
-                    <action managerName="asnManager" methodName="confirmReceiving" parameter="asn.id,asnDetail.id,asnDetail.lotInfo,receiveQty,
-                    				case.qty,lp.qty,receiveDate,qualityCode,lpCode,asnDetail.asn.worker1.id,asnDetail.dock.id,asnDetail,
-                    				qty1,qty2,qty3,qty4,qty5,qty6,qty7,qty8,qty9,qty10,qty11,qty12,qty13,length,width,height,des,volume,asnDetail.lotInfo.propC5,asnDetail.lotInfo.propC6"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
-                    <forward name="closeWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-        </buttons>
-    </editPage>
-</pages>
diff --git a/target/jjwms/WEB-INF/classes/dataSourceContext.xml b/target/jjwms/WEB-INF/classes/dataSourceContext.xml
deleted file mode 100644
index ea8acf7..0000000
--- a/target/jjwms/WEB-INF/classes/dataSourceContext.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC
-        "-//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.11 2010/06/01 09:25:32 peng.lei 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:@47.117.118.155:1521:orcl</value>
-<!-- 			 <value>jdbc:oracle:thin:@47.100.181.252:1521:orcl</value> -->
-        </property>
-        <property name="username">
-            <value>jjwl</value>
-        </property>
-        <property name="password">
-            <value>jjwl</value>
-        </property>
-        <property name="maxActive">
-            <value>200</value>
-        </property>  
-       </bean>
-</beans>
\ No newline at end of file